X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=6e0f4c68669e0c967889417508223b6be0f38a03;hb=5abd3b1cc5fba26486d71c6a415fae797388ddf3;hp=a6ed3406d28bbe62f79167b3a86d484258b293b1;hpb=d2a71fd3447c8bac65cc26077e2b9fc3fb0b28a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index a6ed3406d..6e0f4c686 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -261,15 +261,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 	if (IS_LOCAL(user) && !override)
 	{
 		// Checking MyClass exists because we *may* get here with NULL, not 100% sure.
-		if (user->MyClass && user->MyClass->GetMaxChans())
-		{
-			if (user->chans.size() >= user->MyClass->GetMaxChans())
-			{
-				user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
-				return NULL;
-			}
-		}
-		else
+		if (user->MyClass && user->MyClass->maxchans)
 		{
 			if (user->HasPrivPermission("channels/high-join-limit"))
 			{
@@ -281,7 +273,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 			}
 			else
 			{
-				if (user->chans.size() >= Instance->Config->MaxChans)
+				if (user->chans.size() >= user->MyClass->maxchans)
 				{
 					user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
 					return NULL;
@@ -413,10 +405,10 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 		Ptr->SetDefaultModes();
 	}
 
-	return Channel::ForceChan(Instance, Ptr, user, privs, bursting);
+	return Channel::ForceChan(Instance, Ptr, user, privs, bursting, created_by_local);
 }
 
-Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting)
+Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting, bool created)
 {
 	std::string nick = user->nick;
 	bool silent = false;
@@ -456,7 +448,7 @@ Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const
 		}
 	}
 
-	FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, bursting, silent));
+	FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, bursting, silent, created));
 
 	if (!silent)
 		Ptr->WriteChannel(user,"JOIN :%s",Ptr->name.c_str());
@@ -595,52 +587,11 @@ long Channel::PartUser(User *user, std::string &reason)
 
 long Channel::ServerKickUser(User* user, const char* reason, const char* servername)
 {
-	bool silent = false;
-
-	if (!user || !reason)
-		return this->GetUserCounter();
-
-	if (IS_LOCAL(user))
-	{
-		if (!this->HasUser(user))
-		{
-			/* Not on channel */
-			return this->GetUserCounter();
-		}
-	}
-
 	if (servername == NULL || *ServerInstance->Config->HideWhoisServer)
 		servername = ServerInstance->Config->ServerName;
 
-	FOREACH_MOD(I_OnUserKick,OnUserKick(NULL, user, this, reason, silent));
-
-	UCListIter i = user->chans.find(this);
-	if (i != user->chans.end())
-	{
-		if (!silent)
-			this->WriteChannelWithServ(servername, "KICK %s %s :%s", this->name.c_str(), user->nick.c_str(), reason);
-
-		user->chans.erase(i);
-		this->RemoveAllPrefixes(user);
-	}
-
-	if (!this->DelUser(user))
-	{
-		chan_hash::iterator iter = ServerInstance->chanlist->find(this->name);
-		/* kill the record */
-		if (iter != ServerInstance->chanlist->end())
-		{
-			int MOD_RESULT = 0;
-			FOREACH_RESULT_I(ServerInstance,I_OnChannelPreDelete, OnChannelPreDelete(this));
-			if (MOD_RESULT == 1)
-				return 1; // delete halted by module
-			FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
-			ServerInstance->chanlist->erase(iter);
-		}
-		return 0;
-	}
-
-	return this->GetUserCounter();
+	ServerInstance->FakeClient->server = servername;
+	return this->KickUser(ServerInstance->FakeClient, user, reason);
 }
 
 long Channel::KickUser(User *src, User *user, const char* reason)