Document <alias:stripcolor>

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

diff --git a/src/xline.cpp b/src/xline.cpp
index fbb4f0c8b47aeb6045e77b56f74e979c5b83378d..accffb8d0ebaf7ba0181f69b506ed3f2c2f59b86 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -446,9 +446,9 @@ void XLineManager::ExpireLine(ContainerIter container, LookupIter item, bool sil
 void XLineManager::ApplyLines()
 {
        const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
-       for (UserManager::LocalList::const_iterator j = list.begin(); j != list.end(); ++j)
+       for (UserManager::LocalList::const_iterator j = list.begin(); j != list.end(); )
        {
-               LocalUser* u = *j;
+               LocalUser* u = *j++;
 
                // Don't ban people who are exempt.
                if (u->exempt)
@@ -458,7 +458,14 @@ void XLineManager::ApplyLines()
                {
                        XLine *x = *i;
                        if (x->Matches(u))
+                       {
                                x->Apply(u);
+
+                               // If applying the X-line has killed the user then don't
+                               // apply any more lines to them.
+                               if (u->quitting)
+                                       break;
+                       }
                }
        }
 
@@ -560,7 +567,7 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
        if (bancache)
        {
                ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Adding positive hit (" + line + ") for " + u->GetIPString());
-               ServerInstance->BanCache.AddHit(u->GetIPString(), this->type, banReason, this->duration);
+               ServerInstance->BanCache.AddHit(u->GetIPString(), this->type, banReason, (this->duration > 0 ? (this->expiry - ServerInstance->Time()) : 0));
        }
 }