X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fchannels.cpp;h=b0de06267ed7c1e81fbdbc5a1b5c16012acfeb04;hb=b3bcd98242b8764f52bcde3259d7bc0ef72f61e3;hp=5f0f545aec3da1f8923a0337e674207666191891;hpb=9b169c24b1c04123bca3a04d08f8519362b87df4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index 5f0f545ae..b0de06267 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -278,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;
 		}
@@ -298,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;
@@ -433,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++)