Add support for blacklists and whitelists, just http password auth to go (the most...

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 8dd1f6ae142347b212cedcf401e34c717fca5972..db9d4978e262f644b8c33e5819f7a54502be368a 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -16,107 +16,43 @@
 #include "inspircd.h"
 #include "cull_list.h"
 
-CullItem::CullItem(User* u, std::string &r, const char* o_reason)
-{
-       this->user = u;
-       this->reason = r;
-       this->silent = false;
-       /* Seperate oper reason not set, use the user reason */
-       if (*o_reason)
-               this->oper_reason = o_reason;
-       else
-               this->oper_reason = r;
-}
-
-CullItem::CullItem(User* u, const char* r, const char* o_reason)
-{
-       this->user = u;
-       this->reason = r;
-       this->silent = false;
-       /* Seperate oper reason not set, use the user reason */
-       if (*o_reason)
-               this->oper_reason = o_reason;
-       else
-               this->oper_reason = r;
-}
-
-void CullItem::MakeSilent()
-{
-       this->silent = true;
-}
-
-bool CullItem::IsSilent()
-{
-       return this->silent;
-}
-
-CullItem::~CullItem()
-{
-}
-
-User* CullItem::GetUser()
-{
-       return this->user;
-}
-
-std::string& CullItem::GetReason()
-{
-       return this->reason;
-}
-
-std::string& CullItem::GetOperReason()
-{
-       return this->oper_reason;
-}
-
 CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 {
        list.clear();
-       exempt.clear();
 }
 
-void CullList::AddItem(User* user, std::string &reason, const char* o_reason)
+void CullList::AddItem(User* user)
 {
-       AddItem(user, reason.c_str(), o_reason);
-}
-
-
-void CullList::AddItem(User* user, const char* reason, const char* o_reason)
-{
-       if (exempt.find(user) == exempt.end())
+       if (user->quitting)
        {
-               CullItem item(user, reason, o_reason);
-               list.push_back(item);
-               exempt[user] = user;
+               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);
 }
 
 void CullList::MakeSilent(User* user)
 {
-       for (std::vector<CullItem>::iterator a = list.begin(); a != list.end(); ++a)
-       {
-               if (a->GetUser() == user)
-               {
-                       a->MakeSilent();
-                       break;
-               }
-       }
+       user->quietquit = true;
        return;
 }
 
 int CullList::Apply()
 {
        int n = list.size();
-       while (list.size())
+       int i = 0;
+
+       while (list.size() && i++ != 100)
        {
-               std::vector<CullItem>::iterator a = list.begin();
+               std::vector<User *>::iterator a = list.begin();
 
-               User *u = a->GetUser();
-               user_hash::iterator iter = ServerInstance->clientlist->find(u->nick);
-               std::map<User*, User*>::iterator exemptiter = exempt.find(u);
+               User *u = (*a);
+               user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->nick);
                const char* preset_reason = u->GetOperQuit();
-               std::string reason = a->GetReason();
-               std::string oper_reason = *preset_reason ? preset_reason : a->GetOperReason();
+               std::string reason = u->quitmsg;
+               std::string oper_reason = *preset_reason ? preset_reason : u->operquitmsg;
 
                if (reason.length() > MAXQUIT - 1)
                        reason.resize(MAXQUIT - 1);
@@ -124,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))
                {
@@ -144,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());
                                }
                        }
 
@@ -168,14 +104,14 @@ int CullList::Apply()
                {
                        if (IS_LOCAL(u))
                        {
-                               if (!a->IsSilent())
+                               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)) && (!a->IsSilent()))
+                               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());
                                }
@@ -183,21 +119,21 @@ 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);
-                       delete u;
+                       ServerInstance->Users->clientlist->erase(iter);
                }
 
+               delete u;
                list.erase(list.begin());
-               exempt.erase(exemptiter);
        }
+
        return n;
 }