Move whowas containers into whowas class to avoid all cpp files including cmd_whowas...

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index ff763dfd725d806fbb5d523b031bc22cb0e8b6f0..b19054b0ddd562c20ebfe1dc1942de8c1c021bb3 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -2,96 +2,98 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include "inspircd_util.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
 #include "cull_list.h"
 
-CullItem::CullItem(userrec* u, std::string r)
+/*
+ * In current implementation of CullList, this isn't used. It did odd things with a lot of sockets.
+ */
+bool CullList::IsValid(userrec* user)
+{
+       time_t esignon = 0;
+       std::map<userrec*,time_t>::iterator es = exempt.find(user);
+       if (es != exempt.end())
+               esignon = es->second;
+
+       for (user_hash::iterator u = ServerInstance->clientlist->begin(); u != ServerInstance->clientlist->end(); u++)
+       {
+               if (user == u->second)
+                       return (u->second->signon == esignon);
+       }
+       return false;
+}
+
+CullItem::CullItem(userrec* u, std::string &r)
+{
+       this->user = u;
+       this->reason = r;
+}
+
+CullItem::CullItem(userrec* u, const char* r)
+{
+       this->user = u;
+       this->reason = r;
+}
+
+CullItem::~CullItem()
 {
-        this->user = u;
-        this->reason = r;
 }
 
 userrec* CullItem::GetUser()
 {
-        return this->user;
+       return this->user;
 }
 
-std::string CullItem::GetReason()
+std::string& CullItem::GetReason()
 {
-        return this->reason;
+       return this->reason;
 }
 
-CullList::CullList()
+CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 {
        list.clear();
-        exempt.clear();
+       exempt.clear();
 }
 
-void CullList::AddItem(userrec* user, std::string reason)
+void CullList::AddItem(userrec* user, std::string &reason)
 {
-       if (exempt.find(user) != exempt.end())
+       if (exempt.find(user) == exempt.end())
        {
-               CullItem item(user,reason);
-               list.push_back(item);
-               exempt[user] = 1;
+               CullItem item(user,reason);
+               list.push_back(item);
+               exempt[user] = user->signon;
+       }
+}
+
+void CullList::AddItem(userrec* user, const char* reason)
+{
+       if (exempt.find(user) == exempt.end())
+       {
+               CullItem item(user,reason);
+               list.push_back(item);
+               exempt[user] = user->signon;
        }
 }
 
 int CullList::Apply()
 {
-        int n = 0;
-        while (list.size())
-        {
-               std::vector<CullItem>::iterator a = list.begin();
-               userrec* u = a->GetUser();
-               std::string reason = a->GetReason();
-               kill_link(u,reason.c_str());
-               list.erase(list.begin());
-               n++;
-        }
-        return n;
+       int n = list.size();
+       while (list.size())
+       {
+               std::vector<CullItem>::iterator a = list.begin();
+
+               userrec::QuitUser(ServerInstance, a->GetUser(), a->GetReason().c_str());
+               list.erase(list.begin());
+       }
+       return n;
 }