X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=b0de06267ed7c1e81fbdbc5a1b5c16012acfeb04;hb=b3bcd98242b8764f52bcde3259d7bc0ef72f61e3;hp=6b89883bd11b3b85441825d2c4cb01a8b5c5f294;hpb=83d884b8e9f668b8f6dd15b5ae3e3511599c3dd5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index 6b89883bd..b0de06267 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -20,7 +20,7 @@
 
 Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts) : ServerInstance(Instance)
 {
-	chan_hash::iterator findchan = ServerInstance->chanlist->find(name);
+	chan_hash::iterator findchan = ServerInstance->chanlist->find(cname);
 	if (findchan != Instance->chanlist->end())
 		throw CoreException("Cannot create duplicate channel " + cname);
 
@@ -184,6 +184,7 @@ CUList* Channel::GetVoicedUsers()
 
 void Channel::SetDefaultModes()
 {
+	ServerInstance->Logs->Log("CHANNELS", DEBUG, "SetDefaultModes %s", ServerInstance->Config->DefaultModes);
 	irc::spacesepstream list(ServerInstance->Config->DefaultModes);
 	std::string modeseq;
 	std::string parameter;
@@ -277,7 +278,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 		if (IS_LOCAL(user) && override == false)
 		{
 			MOD_RESULT = 0;
-			FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname,privs));
+			FOREACH_RESULT_I(Instance,I_OnUserPreJoin, OnUserPreJoin(user, NULL, cname, privs, key ? key : ""));
 			if (MOD_RESULT == 1)
 				return NULL;
 		}
@@ -297,7 +298,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 		if (IS_LOCAL(user) && override == false)
 		{
 			MOD_RESULT = 0;
-			FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname,privs));
+			FOREACH_RESULT_I(Instance,I_OnUserPreJoin, OnUserPreJoin(user, Ptr, cname, privs, key ? key : ""));
 			if (MOD_RESULT == 1)
 			{
 				return NULL;
@@ -357,7 +358,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 	}
 
 	/* As spotted by jilles, dont bother to set this on remote users */
-	if (IS_LOCAL(user) && Ptr->GetUserCounter() == 1)
+	if (IS_LOCAL(user) && Ptr->GetUserCounter() == 0)
 		Ptr->SetDefaultModes();
 
 	return Channel::ForceChan(Instance, Ptr, user, privs, bursting);
@@ -432,7 +433,10 @@ bool Channel::IsBanned(User* user)
 	char mask[MAXBUF];
 	int MOD_RESULT = 0;
 	FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, this));
-	if (!MOD_RESULT)
+
+	if (MOD_RESULT == -1)
+		return true;
+	else if (MOD_RESULT == 0)
 	{
 		snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString());
 		for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
@@ -523,7 +527,7 @@ long Channel::PartUser(User *user, const char* reason)
 	return this->GetUserCounter();
 }
 
-long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents)
+long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents, const char* servername)
 {
 	bool silent = false;
 
@@ -539,6 +543,9 @@ long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents)
 		}
 	}
 
+	if (servername == NULL || *ServerInstance->Config->HideWhoisServer)
+		servername = ServerInstance->Config->ServerName;
+
 	if (triggerevents)
 	{
 		FOREACH_MOD(I_OnUserKick,OnUserKick(NULL, user, this, reason, silent));
@@ -548,7 +555,7 @@ long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents)
 	if (i != user->chans.end())
 	{
 		if (!silent)
-			this->WriteChannelWithServ(ServerInstance->Config->ServerName, "KICK %s %s :%s", this->name, user->nick, reason);
+			this->WriteChannelWithServ(servername, "KICK %s %s :%s", this->name, user->nick, reason);
 
 		user->chans.erase(i);
 		this->RemoveAllPrefixes(user);