Add newlines to the end :) (\n)

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

diff --git a/src/xline.cpp b/src/xline.cpp
index 7ce6c3f0a5fecad261271ec273420cfc7c96a822..47e12242053344ffe81d1000b51ac91b9fb869b8 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();
 
@@ -403,9 +409,9 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
        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)