X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcull_list.cpp;h=db9d4978e262f644b8c33e5819f7a54502be368a;hb=8f7f74cf0f297e2b8476fc4c670515f8940580ea;hp=b3fd1c9e382f7eae279db9c2870c081a2eac72dd;hpb=dd98d56cabcd08a3d5207454e002b187af98d28a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index b3fd1c9e3..db9d4978e 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -25,7 +25,7 @@ void CullList::AddItem(User* user)
 {
 	if (user->quitting)
 	{
-		ServerInstance->Log(DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick);
+		ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick);
 		return;
 	}
 
@@ -51,7 +51,7 @@ int CullList::Apply()
 		User *u = (*a);
 		user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->nick);
 		const char* preset_reason = u->GetOperQuit();
-		std::string reason = u->operquitmsg;
+		std::string reason = u->quitmsg;
 		std::string oper_reason = *preset_reason ? preset_reason : u->operquitmsg;
 
 		if (reason.length() > MAXQUIT - 1)
@@ -80,15 +80,15 @@ int CullList::Apply()
 
 		if (IS_LOCAL(u))
 		{
-			if (ServerInstance->Config->GetIOHook(u->GetPort()))
+			if (u->io)
 			{
 				try
 				{
-					ServerInstance->Config->GetIOHook(u->GetPort())->OnRawSocketClose(u->GetFd());
+					u->io->OnRawSocketClose(u->GetFd());
 				}
 				catch (CoreException& modexcept)
 				{
-					ServerInstance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+					ServerInstance->Logs->Log("CULLLIST",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 				}
 			}