Wheeeeee

[user/henk/code/inspircd.git] / src / cull_list.cpp

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 365cca2319d9c2cdfb1c8e65b4a7158440955515..224591b6f82f5610f19439745781b41d47f4e722 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -24,8 +24,12 @@ 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);
                return;
+       }
 
+       user->quitting = true;
        list.push_back(user);
 }
 
@@ -45,7 +49,7 @@ int CullList::Apply()
                std::vector<User *>::iterator a = list.begin();
 
                User *u = (*a);
-               user_hash::iterator iter = ServerInstance->clientlist->find(u->nick);
+               user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->nick);
                const char* preset_reason = u->GetOperQuit();
                std::string reason = u->operquitmsg;
                std::string oper_reason = *preset_reason ? preset_reason : u->operquitmsg;
@@ -56,8 +60,8 @@ int CullList::Apply()
                        oper_reason.resize(MAXQUIT - 1);
 
                if (u->registered != REG_ALL)
-                       if (ServerInstance->unregistered_count)
-                               ServerInstance->unregistered_count--;
+                       if (ServerInstance->Users->unregistered_count)
+                               ServerInstance->Users->unregistered_count--;
 
                if (IS_LOCAL(u))
                {
@@ -84,7 +88,7 @@ int CullList::Apply()
                                }
                                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());
                                }
                        }
 
@@ -115,15 +119,15 @@ int CullList::Apply()
                        u->AddToWhoWas();
                }
 
-               if (iter != ServerInstance->clientlist->end())
+               if (iter != ServerInstance->Users->clientlist->end())
                {
                        if (IS_LOCAL(u))
                        {
-                               std::vector<User*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),u);
-                               if (x != ServerInstance->local_users.end())
-                                       ServerInstance->local_users.erase(x);
+                               std::vector<User*>::iterator x = find(ServerInstance->Users->local_users.begin(),ServerInstance->Users->local_users.end(),u);
+                               if (x != ServerInstance->Users->local_users.end())
+                                       ServerInstance->Users->local_users.erase(x);
                        }
-                       ServerInstance->clientlist->erase(iter);
+                       ServerInstance->Users->clientlist->erase(iter);
                }
 
                delete u;