]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/xline.cpp
In the grand tradition of huge fucking commits:
[user/henk/code/inspircd.git] / src / xline.cpp
index 746ad6388668de8e708559801290060427a5cc2f..4f93248259df3f5378f1f7abec9e25758c436694 100644 (file)
@@ -2,26 +2,18 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include "inspircd.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "xline.h"
-#include "cull_list.h"
 
 /* Version two, now with optimized expiry!
  *
@@ -32,7 +24,7 @@ using namespace std;
  *     items, and the other list holds permanent items (ones which will expire).
  *     Items which are on the permanent list are NEVER checked at all by the
  *     expire_lines() function.
- * (2) The temporary xline lists are always kept in strict numerical order, keyed by 
+ * (2) The temporary xline lists are always kept in strict numerical order, keyed by
  *     current time + duration. This means that the line which is due to expire the
  *     soonest is always pointed at by vector::begin(), so a simple while loop can
  *     very efficiently, very quickly and above all SAFELY pick off the first few
@@ -46,9 +38,27 @@ bool InitXLine(ServerConfig* conf, const char* tag)
        return true;
 }
 
-bool DoneXLine(ServerConfig* conf, const char* tag)
+bool DoneZLine(ServerConfig* conf, const char* tag)
+{
+       conf->GetInstance()->XLines->apply_lines(APPLY_ZLINES|APPLY_PERM_ONLY);
+       return true;
+}
+
+bool DoneQLine(ServerConfig* conf, const char* tag)
+{
+       conf->GetInstance()->XLines->apply_lines(APPLY_QLINES|APPLY_PERM_ONLY);
+       return true;
+}
+
+bool DoneKLine(ServerConfig* conf, const char* tag)
+{
+       conf->GetInstance()->XLines->apply_lines(APPLY_KLINES|APPLY_PERM_ONLY);
+       return true;
+}
+
+bool DoneELine(ServerConfig* conf, const char* tag)
 {
-       conf->GetInstance()->XLines->apply_lines(APPLY_ALL);
+       /* Yes, this is supposed to do nothing, we dont 'apply' these */
        return true;
 }
 
@@ -56,9 +66,8 @@ bool DoZLine(ServerConfig* conf, const char* tag, char** entries, ValueList &val
 {
        const char* reason = values[0].GetString();
        const char* ipmask = values[1].GetString();
-       
+
        conf->GetInstance()->XLines->add_zline(0,"<Config>",reason,ipmask);
-       conf->GetInstance()->Log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
        return true;
 }
 
@@ -66,9 +75,8 @@ bool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &val
 {
        const char* reason = values[0].GetString();
        const char* nick = values[1].GetString();
-       
+
        conf->GetInstance()->XLines->add_qline(0,"<Config>",reason,nick);
-       conf->GetInstance()->Log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
        return true;
 }
 
@@ -76,9 +84,8 @@ bool DoKLine(ServerConfig* conf, const char* tag, char** entries, ValueList &val
 {
        const char* reason = values[0].GetString();
        const char* host = values[1].GetString();
-       
+
        conf->GetInstance()->XLines->add_kline(0,"<Config>",reason,host);
-       conf->GetInstance()->Log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
        return true;
 }
 
@@ -86,9 +93,8 @@ bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &val
 {
        const char* reason = values[0].GetString();
        const char* host = values[1].GetString();
-       
+
        conf->GetInstance()->XLines->add_eline(0,"<Config>",reason,host);
-       conf->GetInstance()->Log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
        return true;
 }
 
@@ -101,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
        {
@@ -119,10 +125,11 @@ 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());
-       
+
        if (duration)
        {
                glines.push_back(item);
@@ -132,8 +139,8 @@ 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)
@@ -142,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());
 
@@ -155,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)
@@ -174,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 != '@')
@@ -190,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)
@@ -201,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
@@ -210,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());
 
@@ -223,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;
                }
        }
@@ -244,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;
                }
        }
@@ -254,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;
                }
        }
@@ -270,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;
                }
        }
@@ -280,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;
                }
        }
@@ -295,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;
                }
        }
@@ -305,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;
                }
        }
@@ -320,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;
                }
        }
@@ -330,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;
                }
        }
@@ -346,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;
                }
        }
@@ -356,13 +398,16 @@ bool XLineManager::del_kline(const char* hostmask)
 
 // returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
 
-QLine* XLineManager::matches_qline(const char* nick)
+QLine* XLineManager::matches_qline(const char* nick, bool permonly)
 {
        if ((qlines.empty()) && (pqlines.empty()))
                return NULL;
-       for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
-               if (match(nick,(*i)->nick))
-                       return (*i);
+       if (!permonly)
+       {
+               for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
+                       if (match(nick,(*i)->nick))
+                               return (*i);
+       }
        for (std::vector<QLine*>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
                if (match(nick,(*i)->nick))
                        return (*i);
@@ -371,17 +416,20 @@ QLine* XLineManager::matches_qline(const char* nick)
 
 // returns a pointer to the reason if a host matches a gline, NULL if it didnt match
 
-GLine* XLineManager::matches_gline(userrec* user)
+GLine* XLineManager::matches_gline(User* user, bool permonly)
 {
        if ((glines.empty()) && (pglines.empty()))
                return NULL;
-       for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
+       if (!permonly)
        {
-               if ((match(user->ident,(*i)->identmask)))
+               for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
                {
-                       if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+                       if ((match(user->ident,(*i)->identmask)))
                        {
-                               return (*i);
+                               if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+                               {
+                                       return (*i);
+                               }
                        }
                }
        }
@@ -398,19 +446,22 @@ GLine* XLineManager::matches_gline(userrec* user)
        return NULL;
 }
 
-ELine* XLineManager::matches_exception(userrec* user)
-{                      
+ELine* XLineManager::matches_exception(User* user, bool permonly)
+{
        if ((elines.empty()) && (pelines.empty()))
                return NULL;
        char host2[MAXBUF];
        snprintf(host2,MAXBUF,"*@%s",user->host);
-       for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
+       if (!permonly)
        {
-               if ((match(user->ident,(*i)->identmask)))
+               for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
                {
-                       if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+                       if ((match(user->ident,(*i)->identmask)))
                        {
-                               return (*i);
+                               if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+                               {
+                                       return (*i);
+                               }
                        }
                }
        }
@@ -447,7 +498,7 @@ void XLineManager::gline_set_creation_time(const char* host, time_t create_time)
                        return;
                }
        }
-       return ;        
+       return ;
 }
 
 void XLineManager::eline_set_creation_time(const char* host, time_t create_time)
@@ -461,7 +512,7 @@ void XLineManager::eline_set_creation_time(const char* host, time_t create_time)
                        return;
                }
        }
-       for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)        
+       for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)
        {
                if (!strcasecmp(host,(*i)->hostmask))
                {
@@ -518,13 +569,16 @@ void XLineManager::zline_set_creation_time(const char* ip, time_t create_time)
 
 // returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match
 
-ZLine* XLineManager::matches_zline(const char* ipaddr)
+ZLine* XLineManager::matches_zline(const char* ipaddr, bool permonly)
 {
        if ((zlines.empty()) && (pzlines.empty()))
                return NULL;
-       for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
-               if (match(ipaddr,(*i)->ipaddr, true))
-                       return (*i);
+       if (!permonly)
+       {
+               for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
+                       if (match(ipaddr,(*i)->ipaddr, true))
+                               return (*i);
+       }
        for (std::vector<ZLine*>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
                if (match(ipaddr,(*i)->ipaddr, true))
                        return (*i);
@@ -533,17 +587,20 @@ ZLine* XLineManager::matches_zline(const char* ipaddr)
 
 // returns a pointer to the reason if a host matches a kline, NULL if it didnt match
 
-KLine* XLineManager::matches_kline(userrec* user)
+KLine* XLineManager::matches_kline(User* user, bool permonly)
 {
        if ((klines.empty()) && (pklines.empty()))
                return NULL;
-       for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
+       if (!permonly)
        {
-               if ((match(user->ident,(*i)->identmask)))
+               for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
                {
-                       if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+                       if ((match(user->ident,(*i)->identmask)))
                        {
-                               return (*i);
+                               if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+                               {
+                                       return (*i);
+                               }
                        }
                }
        }
@@ -630,70 +687,165 @@ void XLineManager::expire_lines()
                ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",(*i)->nick,(*i)->source,(*i)->duration);
                qlines.erase(i);
        }
-       
+
 }
 
 // applies lines, removing clients and changing nicks etc as applicable
 
 void XLineManager::apply_lines(const int What)
 {
-       char reason[MAXBUF];
-
-       if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) &&
-       (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))
+       if (!What)
                return;
 
-       CullList* Goners = new CullList(ServerInstance);
-       XLine* check = NULL;
-       for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+       if (What & APPLY_PERM_ONLY)
        {
-               userrec* u = (userrec*)(*u2);
+               char reason[MAXBUF];
 
-               if (elines.size() || pelines.size())
-               {
-                       // ignore people matching exempts
-                       if (matches_exception(u))
-                               continue;
-               }
-               if ((What & APPLY_GLINES) && (glines.size() || pglines.size()))
+               if ((!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))
+                       return;
+
+               XLine* check = NULL;
+               for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
                {
-                       if ((check = matches_gline(u)))
+                       User* u = (User*)(*u2);
+
+                       if (elines.size() || pelines.size())
+                               if (matches_exception(u))
+                                       continue;
+
+                       if ((What & APPLY_GLINES) && pglines.size())
                        {
-                               snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
-                               Goners->AddItem(u,reason);
+                               if ((check = matches_gline(u,true)))
+                               {
+                                       snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
+                                       if (*ServerInstance->Config->MoronBanner)
+                                               u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+                                       if (ServerInstance->Config->HideBans)
+                                               User::QuitUser(ServerInstance, u, "G-Lined", reason);
+                                       else
+                                               User::QuitUser(ServerInstance, u, reason);
+                               }
                        }
-               }
-               if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))
-               {
-                       if ((check = matches_kline(u)))
+
+                       if ((What & APPLY_KLINES) && pklines.size())
                        {
-                               snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
-                               Goners->AddItem(u,reason);
+                               if ((check = matches_kline(u,true)))
+                               {
+                                       snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
+                                       if (*ServerInstance->Config->MoronBanner)
+                                               u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+                                       if (ServerInstance->Config->HideBans)
+                                               User::QuitUser(ServerInstance, u, "K-Lined", reason);
+                                       else
+                                               User::QuitUser(ServerInstance, u, reason);
+                               }
                        }
-               }
-               if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size()))
-               {
-                       if ((check = matches_qline(u->nick)))
+
+                       if ((What & APPLY_QLINES) && pqlines.size())
+                       {
+                               if ((check = matches_qline(u->nick,true)))
+                               {
+                                       snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);
+                                       if (*ServerInstance->Config->MoronBanner)
+                                               u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+                                       if (ServerInstance->Config->HideBans)
+                                               User::QuitUser(ServerInstance, u, "Q-Lined", reason);
+                                       else
+                                               User::QuitUser(ServerInstance, u, reason);
+                               }
+                       }
+
+                       if ((What & APPLY_ZLINES) && pzlines.size())
                        {
-                               snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);
-                               Goners->AddItem(u,reason);
+                               if ((check = matches_zline(u->GetIPString(),true)))
+                               {
+                                       snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason);
+                                       if (*ServerInstance->Config->MoronBanner)
+                                               u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+                                       if (ServerInstance->Config->HideBans)
+                                               User::QuitUser(ServerInstance, u, "Z-Lined", reason);
+                                       else
+                                               User::QuitUser(ServerInstance, u, reason);
+                               }
                        }
                }
-               if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))
+       }
+       else
+       {
+               char reason[MAXBUF];
+
+               if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) &&
+               (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))
+                       return;
+
+               XLine* check = NULL;
+               for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
                {
-                       if ((check = matches_zline(u->GetIPString())))
+                       User* u = (User*)(*u2);
+
+                       if (elines.size() || pelines.size())
                        {
-                               snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason);
-                               Goners->AddItem(u,reason);
+                               // ignore people matching exempts
+                               if (matches_exception(u))
+                                       continue;
+                       }
+                       if ((What & APPLY_GLINES) && (glines.size() || pglines.size()))
+                       {
+                               if ((check = matches_gline(u)))
+                               {
+                                       snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
+                                       if (*ServerInstance->Config->MoronBanner)
+                                               u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+                                       if (ServerInstance->Config->HideBans)
+                                               User::QuitUser(ServerInstance, u, "G-Lined", reason);
+                                       else
+                                               User::QuitUser(ServerInstance, u, reason);
+                               }
+                       }
+                       if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))
+                       {
+                               if ((check = matches_kline(u)))
+                               {
+                                       snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
+                                       if (*ServerInstance->Config->MoronBanner)
+                                               u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+                                       if (ServerInstance->Config->HideBans)
+                                               User::QuitUser(ServerInstance, u, "K-Lined", reason);
+                                       else
+                                               User::QuitUser(ServerInstance, u, reason);
+                               }
+                       }
+                       if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size()))
+                       {
+                               if ((check = matches_qline(u->nick)))
+                               {
+                                       snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);
+                                       if (*ServerInstance->Config->MoronBanner)
+                                               u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+                                       if (ServerInstance->Config->HideBans)
+                                               User::QuitUser(ServerInstance, u, "Q-Lined", reason);
+                                       else
+                                               User::QuitUser(ServerInstance, u, reason);
+                               }
+                       }
+                       if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))
+                       {
+                               if ((check = matches_zline(u->GetIPString())))
+                               {
+                                       snprintf(reason,MAXBUF,"Z-Lined: %s", check->reason);
+                                       if (*ServerInstance->Config->MoronBanner)
+                                               u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+                                       if (ServerInstance->Config->HideBans)
+                                               User::QuitUser(ServerInstance, u, "Z-Lined", reason);
+                                       else
+                                               User::QuitUser(ServerInstance, u, reason);
+                               }
                        }
                }
        }
-
-       Goners->Apply();
-       DELETE(Goners);
 }
 
-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++)
@@ -702,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++)
@@ -711,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++)
@@ -720,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++)
@@ -729,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++)