Fix for parameters which contain a colon (which is not the first char in the string)

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

diff --git a/src/xline.cpp b/src/xline.cpp
index 215a270c59ea0f8c4ff551d3a417166dad8353ff..2fd36bff5142149bfa4ec830748ed9cddfb318a8 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -16,26 +16,11 @@
 
 using namespace std;
 
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include <string>
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
 #include "wildcard.h"
-#include "commands.h"
 #include "xline.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "configreader.h"
 #include "cull_list.h"
 
 /* Version two, now with optimized expiry!
@@ -73,7 +58,7 @@ bool DoZLine(ServerConfig* conf, const char* tag, char** entries, void** values,
        char* ipmask = (char*)values[1];
        
        conf->GetInstance()->XLines->add_zline(0,"<Config>",reason,ipmask);
-       ilog(conf->GetInstance(),DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
+       conf->GetInstance()->Log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
        return true;
 }
 
@@ -83,7 +68,7 @@ bool DoQLine(ServerConfig* conf, const char* tag, char** entries, void** values,
        char* nick = (char*)values[1];
        
        conf->GetInstance()->XLines->add_qline(0,"<Config>",reason,nick);
-       ilog(conf->GetInstance(),DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
+       conf->GetInstance()->Log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
        return true;
 }
 
@@ -93,7 +78,7 @@ bool DoKLine(ServerConfig* conf, const char* tag, char** entries, void** values,
        char* host = (char*)values[1];
        
        conf->GetInstance()->XLines->add_kline(0,"<Config>",reason,host);
-       ilog(conf->GetInstance(),DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
+       conf->GetInstance()->Log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
        return true;
 }
 
@@ -103,7 +88,7 @@ bool DoELine(ServerConfig* conf, const char* tag, char** entries, void** values,
        char* host = (char*)values[1];
        
        conf->GetInstance()->XLines->add_eline(0,"<Config>",reason,host);
-       ilog(conf->GetInstance(),DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
+       conf->GetInstance()->Log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
        return true;
 }
 
@@ -578,35 +563,35 @@ void XLineManager::expire_lines()
        while ((glines.size()) && (current > (glines.begin()->duration + glines.begin()->set_time)))
        {
                std::vector<GLine>::iterator i = glines.begin();
-               ServerInstance->WriteOpers("*** Expiring timed G-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
+               ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
                glines.erase(i);
        }
 
        while ((elines.size()) && (current > (elines.begin()->duration + elines.begin()->set_time)))
        {
                std::vector<ELine>::iterator i = elines.begin();
-               ServerInstance->WriteOpers("*** Expiring timed E-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
+               ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
                elines.erase(i);
        }
 
        while ((zlines.size()) && (current > (zlines.begin()->duration + zlines.begin()->set_time)))
        {
                std::vector<ZLine>::iterator i = zlines.begin();
-               ServerInstance->WriteOpers("*** Expiring timed Z-Line %s (set by %s %d seconds ago)",i->ipaddr,i->source,i->duration);
+               ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %d seconds ago)",i->ipaddr,i->source,i->duration);
                zlines.erase(i);
        }
 
        while ((klines.size()) && (current > (klines.begin()->duration + klines.begin()->set_time)))
        {
                std::vector<KLine>::iterator i = klines.begin();
-               ServerInstance->WriteOpers("*** Expiring timed K-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
+               ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
                klines.erase(i);
        }
 
        while ((qlines.size()) && (current > (qlines.begin()->duration + qlines.begin()->set_time)))
        {
                std::vector<QLine>::iterator i = qlines.begin();
-               ServerInstance->WriteOpers("*** Expiring timed Q-Line %s (set by %s %d seconds ago)",i->nick,i->source,i->duration);
+               ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",i->nick,i->source,i->duration);
                qlines.erase(i);
        }