Move user quit logic out of cull list

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 365cca2319d9c2cdfb1c8e65b4a7158440955515..79c077ead4b4e077c3b0d53c21f4be1956424618 100644 (file)
--- 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.
@@ -11,125 +11,15 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDcull_list */
+/* $Core */
 
 #include "inspircd.h"
 #include "cull_list.h"
 
-CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
+void CullList::Apply()
 {
+       for(std::vector<classbase*>::iterator i = list.begin(); i != list.end(); i++)
+               delete *i;
        list.clear();
 }
 
-void CullList::AddItem(User* user)
-{
-       if (user->quitting)
-               return;
-
-       list.push_back(user);
-}
-
-void CullList::MakeSilent(User* user)
-{
-       user->quietquit = true;
-       return;
-}
-
-int CullList::Apply()
-{
-       int n = list.size();
-       int i = 0;
-
-       while (list.size() && i++ != 100)
-       {
-               std::vector<User *>::iterator a = list.begin();
-
-               User *u = (*a);
-               user_hash::iterator iter = ServerInstance->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;
-
-               if (reason.length() > MAXQUIT - 1)
-                       reason.resize(MAXQUIT - 1);
-               if (oper_reason.length() > MAXQUIT - 1)
-                       oper_reason.resize(MAXQUIT - 1);
-
-               if (u->registered != REG_ALL)
-                       if (ServerInstance->unregistered_count)
-                               ServerInstance->unregistered_count--;
-
-               if (IS_LOCAL(u))
-               {
-                       if ((!u->sendq.empty()) && (!(*u->GetWriteError())))
-                               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 (ServerInstance->Config->GetIOHook(u->GetPort()))
-                       {
-                               try
-                               {
-                                       ServerInstance->Config->GetIOHook(u->GetPort())->OnRawSocketClose(u->GetFd());
-                               }
-                               catch (CoreException& modexcept)
-                               {
-                                       ServerInstance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
-                               }
-                       }
-
-                       ServerInstance->SE->DelFd(u);
-                       u->CloseSocket();
-               }
-
-               /*
-                * this must come before the ServerInstance->SNO->WriteToSnoMaskso that it doesnt try to fill their buffer with anything
-                * if they were an oper with +sn +qQ.
-                */
-               if (u->registered == REG_ALL)
-               {
-                       if (IS_LOCAL(u))
-                       {
-                               if (!u->quietquit)
-                               {
-                                       ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",u->nick,u->ident,u->host,oper_reason.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,u->ident,u->host,oper_reason.c_str());
-                               }
-                       }
-                       u->AddToWhoWas();
-               }
-
-               if (iter != ServerInstance->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);
-                       }
-                       ServerInstance->clientlist->erase(iter);
-               }
-
-               delete u;
-               list.erase(list.begin());
-       }
-
-       return n;
-}
-