Fix quietbans and hidesplits etc, cull list's sending a seperate quit message to...

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

diff --git a/src/xline.cpp b/src/xline.cpp
index 7ce6c3f0a5fecad261271ec273420cfc7c96a822..1e2e415cde1a2995eb44726e42dc08f8a4e008ff 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -158,7 +158,13 @@ bool XLineManager::AddLine(XLine* line, User* user)
                return false;
 
        /*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/
-       pending_lines.push_back(line);
+       XLineFactory* xlf = GetFactory(line->type);
+       if (!xlf)
+               return false;
+
+       if (xlf->AutoApplyToUserList(line))
+               pending_lines.push_back(line);
+
        lookup_lines[line->type][line->Displayable()] = line;
        line->OnAdd();
 
@@ -385,6 +391,18 @@ XLineManager::~XLineManager()
        delete KFact;
        delete QFact;
        delete ZFact;
+
+       // Delete all existing XLines
+       for (XLineContainer::iterator i = lookup_lines.begin(); i != lookup_lines.end(); i++)
+       {
+               for (XLineLookup::iterator j = i->second.begin(); j != i->second.end(); j++)
+               {
+                       delete j->second;
+               }
+               i->second.clear();
+       }
+       lookup_lines.clear();
+       
 }
 
 void XLine::Apply(User* u)
@@ -402,10 +420,11 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
        snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason);
        if (*ServerInstance->Config->MoronBanner)
                u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+
        if (ServerInstance->Config->HideBans)
-               User::QuitUser(ServerInstance, u, line + "-Lined", sreason);
+               ServerInstance->Users->QuitUser(u, line + "-Lined", sreason);
        else
-               User::QuitUser(ServerInstance, u, sreason);
+               ServerInstance->Users->QuitUser(u, sreason);
 
 
        if (bancache)