Spotted problem: must clear out all prefixes attached to a user when they quit or...

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 1acdd4517ee0c8c80e96f1ab76e7087d0362a612..74e16e64ed4765fe71383aa97a421d55998b1bea 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -29,19 +29,15 @@ using namespace std;
 #include "modules.h"
 #include "dynamic.h"
 #include "wildcard.h"
-#include "message.h"
 #include "commands.h"
 #include "xline.h"
 #include "inspstring.h"
 #include "inspircd.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "typedefs.h"
 #include "cull_list.h"
 
-extern InspIRCd* ServerInstance;
-extern user_hash clientlist;
-
 /*
  * In current implementation of CullList, this isn't used. It did odd things with a lot of sockets.
  */
@@ -52,7 +48,7 @@ bool CullList::IsValid(userrec* user)
        if (es != exempt.end())
                esignon = es->second;
 
-       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+       for (user_hash::iterator u = ServerInstance->clientlist.begin(); u != ServerInstance->clientlist.end(); u++)
        {
                /*
                 * BUGFIX
@@ -100,7 +96,7 @@ std::string& CullItem::GetReason()
        return this->reason;
 }
 
-CullList::CullList()
+CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 {
        list.clear();
        exempt.clear();
@@ -133,7 +129,7 @@ int CullList::Apply()
        {
                std::vector<CullItem>::iterator a = list.begin();
 
-               kill_link(a->GetUser(), a->GetReason().c_str());
+               userrec::QuitUser(ServerInstance, a->GetUser(), a->GetReason().c_str());
                list.erase(list.begin());
        }
        return n;