Remove next_call garbage.. It didn't really do much more than obfuscate things. InspI...

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

diff --git a/src/xline.cpp b/src/xline.cpp
index 7a1b4a8aa9fcf2cd966a7fdbef4ac210450b9928..4f93248259df3f5378f1f7abec9e25758c436694 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "xline.h"
 
@@ -109,9 +107,9 @@ IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)
                n.second = ident_and_host.substr(x + 1,ident_and_host.length());
                n.first = ident_and_host.substr(0, x);
                if (!n.first.length())
-                       n.first = "*";
+                       n.first.assign("*");
                if (!n.second.length())
-                       n.second = "*";
+                       n.second.assign("*");
        }
        else
        {
@@ -127,7 +125,8 @@ bool XLineManager::add_gline(long duration, const char* source,const char* reaso
 {
        IdentHostPair ih = IdentSplit(hostmask);
 
-       bool ret = del_gline(hostmask);
+       if (del_gline(hostmask, true))
+               return false;
 
        GLine* item = new GLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
 
@@ -141,7 +140,7 @@ bool XLineManager::add_gline(long duration, const char* source,const char* reaso
                pglines.push_back(item);
        }
 
-       return !ret;
+       return true;
 }
 
 // adds an e:line (exception to bans)
@@ -150,7 +149,8 @@ bool XLineManager::add_eline(long duration, const char* source, const char* reas
 {
        IdentHostPair ih = IdentSplit(hostmask);
 
-       bool ret = del_eline(hostmask);
+       if (del_eline(hostmask, true))
+               return false;
 
        ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
 
@@ -163,14 +163,16 @@ bool XLineManager::add_eline(long duration, const char* source, const char* reas
        {
                pelines.push_back(item);
        }
-       return !ret;
+       return true;
 }
 
 // adds a q:line
 
 bool XLineManager::add_qline(long duration, const char* source, const char* reason, const char* nickname)
 {
-       bool ret = del_qline(nickname);
+       if (del_qline(nickname, true))
+               return false;
+
        QLine* item = new QLine(ServerInstance->Time(), duration, source, reason, nickname);
 
        if (duration)
@@ -182,15 +184,13 @@ bool XLineManager::add_qline(long duration, const char* source, const char* reas
        {
                pqlines.push_back(item);
        }
-       return !ret;
+       return true;
 }
 
 // adds a z:line
 
 bool XLineManager::add_zline(long duration, const char* source, const char* reason, const char* ipaddr)
 {
-       bool ret = del_zline(ipaddr);
-
        if (strchr(ipaddr,'@'))
        {
                while (*ipaddr != '@')
@@ -198,6 +198,9 @@ bool XLineManager::add_zline(long duration, const char* source, const char* reas
                ipaddr++;
        }
 
+       if (del_zline(ipaddr, true))
+               return false;
+
        ZLine* item = new ZLine(ServerInstance->Time(), duration, source, reason, ipaddr);
 
        if (duration)
@@ -209,7 +212,7 @@ bool XLineManager::add_zline(long duration, const char* source, const char* reas
        {
                pzlines.push_back(item);
        }
-       return !ret;
+       return true;
 }
 
 // adds a k:line
@@ -218,7 +221,8 @@ bool XLineManager::add_kline(long duration, const char* source, const char* reas
 {
        IdentHostPair ih = IdentSplit(hostmask);
 
-       bool ret = del_kline(hostmask);
+       if (del_kline(hostmask, true))
+               return false;
 
        KLine* item = new KLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
 
@@ -231,20 +235,23 @@ bool XLineManager::add_kline(long duration, const char* source, const char* reas
        {
                pklines.push_back(item);
        }
-       return !ret;
+       return true;
 }
 
 // deletes a g:line, returns true if the line existed and was removed
 
-bool XLineManager::del_gline(const char* hostmask)
+bool XLineManager::del_gline(const char* hostmask, bool simulate)
 {
        IdentHostPair ih = IdentSplit(hostmask);
        for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
        {
                if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
                {
-                       delete *i;
-                       glines.erase(i);
+                       if (!simulate)
+                       {
+                               delete *i;
+                               glines.erase(i);
+                       }
                        return true;
                }
        }
@@ -252,8 +259,11 @@ bool XLineManager::del_gline(const char* hostmask)
        {
                if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
                {
-                       delete *i;
-                       pglines.erase(i);
+                       if (!simulate)
+                       {
+                               delete *i;
+                               pglines.erase(i);
+                       }
                        return true;
                }
        }
@@ -262,15 +272,18 @@ bool XLineManager::del_gline(const char* hostmask)
 
 // deletes a e:line, returns true if the line existed and was removed
 
-bool XLineManager::del_eline(const char* hostmask)
+bool XLineManager::del_eline(const char* hostmask, bool simulate)
 {
        IdentHostPair ih = IdentSplit(hostmask);
        for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
        {
                if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
                {
-                       delete *i;
-                       elines.erase(i);
+                       if (!simulate)
+                       {
+                               delete *i;
+                               elines.erase(i);
+                       }
                        return true;
                }
        }
@@ -278,8 +291,11 @@ bool XLineManager::del_eline(const char* hostmask)
        {
                if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
                {
-                       delete *i;
-                       pelines.erase(i);
+                       if (!simulate)
+                       {
+                               delete *i;
+                               pelines.erase(i);
+                       }
                        return true;
                }
        }
@@ -288,14 +304,17 @@ bool XLineManager::del_eline(const char* hostmask)
 
 // deletes a q:line, returns true if the line existed and was removed
 
-bool XLineManager::del_qline(const char* nickname)
+bool XLineManager::del_qline(const char* nickname, bool simulate)
 {
        for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
        {
                if (!strcasecmp(nickname,(*i)->nick))
                {
-                       delete *i;
-                       qlines.erase(i);
+                       if (!simulate)
+                       {
+                               delete *i;
+                               qlines.erase(i);
+                       }
                        return true;
                }
        }
@@ -303,8 +322,11 @@ bool XLineManager::del_qline(const char* nickname)
        {
                if (!strcasecmp(nickname,(*i)->nick))
                {
-                       delete *i;
-                       pqlines.erase(i);
+                       if (!simulate)
+                       {
+                               delete *i;
+                               pqlines.erase(i);
+                       }
                        return true;
                }
        }
@@ -313,14 +335,17 @@ bool XLineManager::del_qline(const char* nickname)
 
 // deletes a z:line, returns true if the line existed and was removed
 
-bool XLineManager::del_zline(const char* ipaddr)
+bool XLineManager::del_zline(const char* ipaddr, bool simulate)
 {
        for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
        {
                if (!strcasecmp(ipaddr,(*i)->ipaddr))
                {
-                       delete *i;
-                       zlines.erase(i);
+                       if (!simulate)
+                       {
+                               delete *i;
+                               zlines.erase(i);
+                       }
                        return true;
                }
        }
@@ -328,8 +353,11 @@ bool XLineManager::del_zline(const char* ipaddr)
        {
                if (!strcasecmp(ipaddr,(*i)->ipaddr))
                {
-                       delete *i;
-                       pzlines.erase(i);
+                       if (!simulate)
+                       {
+                               delete *i;
+                               pzlines.erase(i);
+                       }
                        return true;
                }
        }
@@ -338,15 +366,18 @@ bool XLineManager::del_zline(const char* ipaddr)
 
 // deletes a k:line, returns true if the line existed and was removed
 
-bool XLineManager::del_kline(const char* hostmask)
+bool XLineManager::del_kline(const char* hostmask, bool simulate)
 {
        IdentHostPair ih = IdentSplit(hostmask);
        for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
        {
                if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
                {
-                       delete *i;
-                       klines.erase(i);
+                       if (!simulate)
+                       {
+                               delete *i;
+                               klines.erase(i);
+                       }
                        return true;
                }
        }
@@ -354,8 +385,11 @@ bool XLineManager::del_kline(const char* hostmask)
        {
                if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
                {
-                       delete *i;
-                       pklines.erase(i);
+                       if (!simulate)
+                       {
+                               delete *i;
+                               pklines.erase(i);
+                       }
                        return true;
                }
        }
@@ -382,7 +416,7 @@ QLine* XLineManager::matches_qline(const char* nick, bool permonly)
 
 // returns a pointer to the reason if a host matches a gline, NULL if it didnt match
 
-GLine* XLineManager::matches_gline(userrec* user, bool permonly)
+GLine* XLineManager::matches_gline(User* user, bool permonly)
 {
        if ((glines.empty()) && (pglines.empty()))
                return NULL;
@@ -412,7 +446,7 @@ GLine* XLineManager::matches_gline(userrec* user, bool permonly)
        return NULL;
 }
 
-ELine* XLineManager::matches_exception(userrec* user, bool permonly)
+ELine* XLineManager::matches_exception(User* user, bool permonly)
 {
        if ((elines.empty()) && (pelines.empty()))
                return NULL;
@@ -553,7 +587,7 @@ ZLine* XLineManager::matches_zline(const char* ipaddr, bool permonly)
 
 // returns a pointer to the reason if a host matches a kline, NULL if it didnt match
 
-KLine* XLineManager::matches_kline(userrec* user, bool permonly)
+KLine* XLineManager::matches_kline(User* user, bool permonly)
 {
        if ((klines.empty()) && (pklines.empty()))
                return NULL;
@@ -671,9 +705,9 @@ void XLineManager::apply_lines(const int What)
                        return;
 
                XLine* check = NULL;
-               for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+               for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
                {
-                       userrec* u = (userrec*)(*u2);
+                       User* u = (User*)(*u2);
 
                        if (elines.size() || pelines.size())
                                if (matches_exception(u))
@@ -687,9 +721,9 @@ void XLineManager::apply_lines(const int What)
                                        if (*ServerInstance->Config->MoronBanner)
                                                u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
                                        if (ServerInstance->Config->HideBans)
-                                               ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason);
+                                               User::QuitUser(ServerInstance, u, "G-Lined", reason);
                                        else
-                                               ServerInstance->GlobalCulls.AddItem(u, reason);
+                                               User::QuitUser(ServerInstance, u, reason);
                                }
                        }
 
@@ -701,9 +735,9 @@ void XLineManager::apply_lines(const int What)
                                        if (*ServerInstance->Config->MoronBanner)
                                                u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
                                        if (ServerInstance->Config->HideBans)
-                                               ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason);
+                                               User::QuitUser(ServerInstance, u, "K-Lined", reason);
                                        else
-                                               ServerInstance->GlobalCulls.AddItem(u, reason);
+                                               User::QuitUser(ServerInstance, u, reason);
                                }
                        }
 
@@ -715,9 +749,9 @@ void XLineManager::apply_lines(const int What)
                                        if (*ServerInstance->Config->MoronBanner)
                                                u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
                                        if (ServerInstance->Config->HideBans)
-                                               ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason);
+                                               User::QuitUser(ServerInstance, u, "Q-Lined", reason);
                                        else
-                                               ServerInstance->GlobalCulls.AddItem(u, reason);
+                                               User::QuitUser(ServerInstance, u, reason);
                                }
                        }
 
@@ -729,9 +763,9 @@ void XLineManager::apply_lines(const int What)
                                        if (*ServerInstance->Config->MoronBanner)
                                                u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
                                        if (ServerInstance->Config->HideBans)
-                                               ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason);
+                                               User::QuitUser(ServerInstance, u, "Z-Lined", reason);
                                        else
-                                               ServerInstance->GlobalCulls.AddItem(u, reason);
+                                               User::QuitUser(ServerInstance, u, reason);
                                }
                        }
                }
@@ -745,9 +779,9 @@ void XLineManager::apply_lines(const int What)
                        return;
 
                XLine* check = NULL;
-               for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+               for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
                {
-                       userrec* u = (userrec*)(*u2);
+                       User* u = (User*)(*u2);
 
                        if (elines.size() || pelines.size())
                        {
@@ -763,9 +797,9 @@ void XLineManager::apply_lines(const int What)
                                        if (*ServerInstance->Config->MoronBanner)
                                                u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
                                        if (ServerInstance->Config->HideBans)
-                                               ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason);
+                                               User::QuitUser(ServerInstance, u, "G-Lined", reason);
                                        else
-                                               ServerInstance->GlobalCulls.AddItem(u, reason);
+                                               User::QuitUser(ServerInstance, u, reason);
                                }
                        }
                        if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))
@@ -776,9 +810,9 @@ void XLineManager::apply_lines(const int What)
                                        if (*ServerInstance->Config->MoronBanner)
                                                u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
                                        if (ServerInstance->Config->HideBans)
-                                               ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason);
+                                               User::QuitUser(ServerInstance, u, "K-Lined", reason);
                                        else
-                                               ServerInstance->GlobalCulls.AddItem(u, reason);
+                                               User::QuitUser(ServerInstance, u, reason);
                                }
                        }
                        if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size()))
@@ -789,9 +823,9 @@ void XLineManager::apply_lines(const int What)
                                        if (*ServerInstance->Config->MoronBanner)
                                                u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
                                        if (ServerInstance->Config->HideBans)
-                                               ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason);
+                                               User::QuitUser(ServerInstance, u, "Q-Lined", reason);
                                        else
-                                               ServerInstance->GlobalCulls.AddItem(u, reason);
+                                               User::QuitUser(ServerInstance, u, reason);
                                }
                        }
                        if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))
@@ -802,16 +836,16 @@ void XLineManager::apply_lines(const int What)
                                        if (*ServerInstance->Config->MoronBanner)
                                                u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
                                        if (ServerInstance->Config->HideBans)
-                                               ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason);
+                                               User::QuitUser(ServerInstance, u, "Z-Lined", reason);
                                        else
-                                               ServerInstance->GlobalCulls.AddItem(u, reason);
+                                               User::QuitUser(ServerInstance, u, reason);
                                }
                        }
                }
        }
 }
 
-void XLineManager::stats_k(userrec* user, string_list &results)
+void XLineManager::stats_k(User* user, string_list &results)
 {
        std::string sn = ServerInstance->Config->ServerName;
        for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
@@ -820,7 +854,7 @@ void XLineManager::stats_k(userrec* user, string_list &results)
                results.push_back(sn+" 216 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
 }
 
-void XLineManager::stats_g(userrec* user, string_list &results)
+void XLineManager::stats_g(User* user, string_list &results)
 {
        std::string sn = ServerInstance->Config->ServerName;
        for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
@@ -829,7 +863,7 @@ void XLineManager::stats_g(userrec* user, string_list &results)
                results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
 }
 
-void XLineManager::stats_q(userrec* user, string_list &results)
+void XLineManager::stats_q(User* user, string_list &results)
 {
        std::string sn = ServerInstance->Config->ServerName;
        for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
@@ -838,7 +872,7 @@ void XLineManager::stats_q(userrec* user, string_list &results)
                results.push_back(sn+" 217 "+user->nick+" :"+(*i)->nick+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
 }
 
-void XLineManager::stats_z(userrec* user, string_list &results)
+void XLineManager::stats_z(User* user, string_list &results)
 {
        std::string sn = ServerInstance->Config->ServerName;
        for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
@@ -847,7 +881,7 @@ void XLineManager::stats_z(userrec* user, string_list &results)
                results.push_back(sn+" 223 "+user->nick+" :"+(*i)->ipaddr+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
 }
 
-void XLineManager::stats_e(userrec* user, string_list &results)
+void XLineManager::stats_e(User* user, string_list &results)
 {
        std::string sn = ServerInstance->Config->ServerName;
        for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)