X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=07649ed819b173240c1563bb107e7273506295ec;hb=5d67a5fff127bf95bca69b436ef7f645f2fe3281;hp=db07c30ae1360a2921282c49ea95ed1aeccff179;hpb=6a869d0701bbfe3c7a5e370793adfda4b5b45c65;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index db07c30ae..07649ed81 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -18,18 +18,10 @@
 
 CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 {
-	list.clear();
 }
 
 void CullList::AddItem(User* user)
 {
-	if (user->quitting)
-	{
-		ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick.c_str());
-		return;
-	}
-
-	user->quitting = true;
 	list.push_back(user);
 }
 
@@ -39,23 +31,13 @@ void CullList::MakeSilent(User* user)
 	return;
 }
 
-int CullList::Apply()
+void CullList::Apply()
 {
-	int n = list.size();
-	int i = 0;
-
-	while (list.size() && i++ != 100)
+	for(std::vector<User *>::iterator a = list.begin(); a != list.end(); a++)
 	{
-		std::vector<User *>::iterator a = list.begin();
-
-		User *u = (*a);
-		user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->nick);
-		const std::string& preset_reason = u->GetOperQuit();
-		std::string reason;
-		std::string oper_reason;
-
-		reason.assign(u->quitmsg, 0, ServerInstance->Config->Limits.MaxQuit);
-		oper_reason.assign(preset_reason.empty() ? preset_reason : u->operquitmsg, 0, ServerInstance->Config->Limits.MaxQuit);
+		User *u = *a;
+		// user has been moved onto their UID; that's why this isn't find(u->nick)
+		user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->uuid);
 
 		if (u->registered != REG_ALL)
 			if (ServerInstance->Users->unregistered_count)
@@ -65,24 +47,12 @@ int CullList::Apply()
 		{
 			if (!u->sendq.empty())
 				u->FlushWriteBuf();
-		}
 
-		if (u->registered == REG_ALL)
-		{
-			FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(u, reason, oper_reason));
-			u->PurgeEmptyChannels();
-			u->WriteCommonQuit(reason, oper_reason);
-		}
-
-		FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(u));
-
-		if (IS_LOCAL(u))
-		{
-			if (u->io)
+			if (u->GetIOHook())
 			{
 				try
 				{
-					u->io->OnRawSocketClose(u->GetFd());
+					u->GetIOHook()->OnRawSocketClose(u->GetFd());
 				}
 				catch (CoreException& modexcept)
 				{
@@ -104,14 +74,14 @@ int CullList::Apply()
 			{
 				if (!u->quietquit)
 				{
-					ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]", u->nick.c_str(), u->ident.c_str(), u->host.c_str(), oper_reason.c_str());
+					ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]", u->nick.c_str(), u->ident.c_str(), u->host.c_str(), u->operquitmsg.c_str());
 				}
 			}
 			else
 			{
 				if ((!ServerInstance->SilentULine(u->server)) && (!u->quietquit))
 				{
-					ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]", u->server, u->nick.c_str(), u->ident.c_str(), u->host.c_str(), oper_reason.c_str());
+					ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]", u->server, u->nick.c_str(), u->ident.c_str(), u->host.c_str(), u->operquitmsg.c_str());
 				}
 			}
 			u->AddToWhoWas();
@@ -138,9 +108,7 @@ int CullList::Apply()
 		}
 
 		delete u;
-		list.erase(list.begin());
 	}
-
-	return n;
+	list.clear();
 }