Grr

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8413 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/xline.h b/include/xline.h
index d51ef7f499fc0a61dc9078d233c1d4d3beba845a..db6b638629ebbaeae8d22c224697f0f324d59ff0 100644 (file)
--- a/include/xline.h
+++ b/include/xline.h
@@ -125,6 +125,8 @@ class CoreExport KLine : public XLine
 
        virtual bool Matches(User *u);
 
+       virtual void Apply(User* u);
+
        /** Ident mask
         */
        char* identmask;
@@ -163,6 +165,8 @@ class CoreExport GLine : public XLine
 
        virtual bool Matches(User *u);
 
+       virtual void Apply(User* u);
+
        /** Ident mask
         */
        char* identmask;
@@ -199,6 +203,8 @@ class CoreExport ELine : public XLine
 
        virtual bool Matches(User *u);
 
+       virtual void Apply(User* u);
+
        /** Ident mask
         */
        char* identmask;
@@ -236,6 +242,8 @@ class CoreExport ZLine : public XLine
 
        virtual bool Matches(const std::string &str);
 
+       virtual void Apply(User* u);
+
        /** IP mask
         */
        char* ipaddr;
@@ -270,6 +278,8 @@ class CoreExport QLine : public XLine
 
        virtual bool Matches(const std::string &str);
 
+       virtual void Apply(User* u);
+
        /** Nickname mask
         */
        char* nick;

diff --git a/src/xline.cpp b/src/xline.cpp
index 115ab0da67325de44b9e1240489ba519afd899c7..0c93faf39fa23c7e7b8dd55517ba1fa3c2b732db 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -167,7 +167,7 @@ bool XLineManager::AddGLine(long duration, const char* source,const char* reason
        if (DelGLine(hostmask, true))
                return false;
 
-       GLine* item = new GLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
+       GLine* item = new GLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
 
        glines.push_back(item);
        sort(glines.begin(), glines.end(),XLineManager::XSortComparison);
@@ -185,7 +185,7 @@ bool XLineManager::AddELine(long duration, const char* source, const char* reaso
        if (DelELine(hostmask, true))
                return false;
 
-       ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
+       ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
 
        elines.push_back(item);
        sort(elines.begin(), elines.end(),XLineManager::XSortComparison);
@@ -201,7 +201,7 @@ bool XLineManager::AddQLine(long duration, const char* source, const char* reaso
        if (DelQLine(nickname, true))
                return false;
 
-       QLine* item = new QLine(ServerInstance->Time(), duration, source, reason, nickname);
+       QLine* item = new QLine(ServerInstance, ServerInstance->Time(), duration, source, reason, nickname);
 
        qlines.push_back(item);
        sort(qlines.begin(), qlines.end(),XLineManager::XSortComparison);
@@ -224,7 +224,7 @@ bool XLineManager::AddZLine(long duration, const char* source, const char* reaso
        if (DelZLine(ipaddr, true))
                return false;
 
-       ZLine* item = new ZLine(ServerInstance->Time(), duration, source, reason, ipaddr);
+       ZLine* item = new ZLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ipaddr);
 
        zlines.push_back(item);
        sort(zlines.begin(), zlines.end(),XLineManager::XSortComparison);
@@ -242,7 +242,7 @@ bool XLineManager::AddKLine(long duration, const char* source, const char* reaso
        if (DelKLine(hostmask, true))
                return false;
 
-       KLine* item = new KLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
+       KLine* item = new KLine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
 
        klines.push_back(item);
        sort(klines.begin(), klines.end(),XLineManager::XSortComparison);