X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=abefa8b5750fc8ec059aefd552597936acba40cf;hb=fd820825ac669c9cd8cc8b7a69ca855159b0d3cb;hp=ddbf6acae8e7d12980c3efeb8a5f69e2418d92d2;hpb=4501f0ec9ccff833e20a99ff90bd9b13a7d80fe2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index ddbf6acae..abefa8b57 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDcull_list */
+/* $Core */
 
 #include "inspircd.h"
 #include "cull_list.h"
@@ -23,13 +23,6 @@ CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 
 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);
 }
 
@@ -54,8 +47,8 @@ int CullList::Apply()
 		std::string reason;
 		std::string oper_reason;
 
-		reason.assign(u->quitmsg, 0, MAXQUIT - 1);
-		oper_reason.assign(preset_reason.empty() ? preset_reason : u->operquitmsg, 0, MAXQUIT - 1);
+		reason.assign(u->quitmsg, 0, ServerInstance->Config->Limits.MaxQuit);
+		oper_reason.assign(preset_reason.empty() ? preset_reason : u->operquitmsg, 0, ServerInstance->Config->Limits.MaxQuit);
 
 		if (u->registered != REG_ALL)
 			if (ServerInstance->Users->unregistered_count)
@@ -63,7 +56,7 @@ int CullList::Apply()
 
 		if (IS_LOCAL(u))
 		{
-			if ((!u->sendq.empty()) && (!(*u->GetWriteError())))
+			if (!u->sendq.empty())
 				u->FlushWriteBuf();
 		}
 
@@ -78,11 +71,11 @@ int CullList::Apply()
 
 		if (IS_LOCAL(u))
 		{
-			if (u->io)
+			if (u->GetIOHook())
 			{
 				try
 				{
-					u->io->OnRawSocketClose(u->GetFd());
+					u->GetIOHook()->OnRawSocketClose(u->GetFd());
 				}
 				catch (CoreException& modexcept)
 				{