Change module versions to use a string instead of fixed digits, and use propset ID...

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

diff --git a/src/xline.cpp b/src/xline.cpp
index 47e12242053344ffe81d1000b51ac91b9fb869b8..53493b59e72888701d6d55879792e9983b05d004 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -11,10 +11,9 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDxline */
+/* $Core */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "bancache.h"
 
@@ -116,6 +115,22 @@ XLineLookup* XLineManager::GetAll(const std::string &type)
        return &(n->second);
 }
 
+void XLineManager::DelAll(const std::string &type)
+{
+       ContainerIter n = lookup_lines.find(type);
+
+       if (n == lookup_lines.end())
+               return;
+
+       LookupIter x;
+
+       /* Delete all of a given type (this should probably use DelLine, but oh well) */
+       while ((x = n->second.begin()) != n->second.end())
+       {
+               ExpireLine(n, x);
+       }
+}
+
 std::vector<std::string> XLineManager::GetAllTypes()
 {
        std::vector<std::string> items;
@@ -391,6 +406,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)
@@ -407,7 +434,8 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
        char sreason[MAXBUF];
        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);
+               u->WriteServ("NOTICE %s :*** %s", u->nick.c_str(), ServerInstance->Config->MoronBanner);
+
        if (ServerInstance->Config->HideBans)
                ServerInstance->Users->QuitUser(u, line + "-Lined", sreason);
        else
@@ -429,9 +457,10 @@ bool KLine::Matches(User *u)
        if (u->exempt)
                return false;
 
-       if ((match(u->ident, this->identmask)))
+       if (InspIRCd::Match(u->ident, this->identmask, NULL))
        {
-               if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
+               if (InspIRCd::MatchCIDR(u->host, this->hostmask, NULL) ||
+                   InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, NULL))
                {
                        return true;
                }
@@ -450,9 +479,10 @@ bool GLine::Matches(User *u)
        if (u->exempt)
                return false;
 
-       if ((match(u->ident, this->identmask)))
+       if (InspIRCd::Match(u->ident, this->identmask, NULL))
        {
-               if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
+               if (InspIRCd::MatchCIDR(u->host, this->hostmask, NULL) ||
+                   InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, NULL))
                {
                        return true;
                }
@@ -471,9 +501,10 @@ bool ELine::Matches(User *u)
        if (u->exempt)
                return false;
 
-       if ((match(u->ident, this->identmask)))
+       if (InspIRCd::Match(u->ident, this->identmask, NULL))
        {
-               if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
+               if (InspIRCd::MatchCIDR(u->host, this->hostmask, NULL) ||
+                   InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, NULL))
                {
                        return true;
                }
@@ -487,7 +518,7 @@ bool ZLine::Matches(User *u)
        if (u->exempt)
                return false;
 
-       if (match(u->GetIPString(), this->ipaddr, true))
+       if (InspIRCd::MatchCIDR(u->GetIPString(), this->ipaddr, NULL))
                return true;
        else
                return false;
@@ -504,7 +535,7 @@ bool QLine::Matches(User *u)
        if (u->exempt)
                return false;
 
-       if (match(u->nick, this->nick))
+       if (InspIRCd::Match(u->nick, this->nick, lowermap))
                return true;
 
        return false;
@@ -513,13 +544,13 @@ bool QLine::Matches(User *u)
 void QLine::Apply(User* u)
 {       
        /* Force to uuid on apply of qline, no need to disconnect any more :) */
-       u->ForceNickChange(u->uuid);
+       u->ForceNickChange(u->uuid.c_str());
 }
 
 
 bool ZLine::Matches(const std::string &str)
 {
-       if (match(str.c_str(), this->ipaddr, true))
+       if (InspIRCd::MatchCIDR(str, this->ipaddr, NULL))
                return true;
        else
                return false;
@@ -527,7 +558,7 @@ bool ZLine::Matches(const std::string &str)
 
 bool QLine::Matches(const std::string &str)
 {
-       if (match(str.c_str(), this->nick))
+       if (InspIRCd::Match(str, this->nick, lowermap))
                return true;
 
        return false;
@@ -535,17 +566,17 @@ bool QLine::Matches(const std::string &str)
 
 bool ELine::Matches(const std::string &str)
 {
-       return ((match(str.c_str(), matchtext.c_str(), true)));
+       return (InspIRCd::MatchCIDR(str, matchtext, NULL));
 }
 
 bool KLine::Matches(const std::string &str)
 {
-       return ((match(str.c_str(), matchtext.c_str(), true)));
+       return (InspIRCd::MatchCIDR(str.c_str(), matchtext, NULL));
 }
 
 bool GLine::Matches(const std::string &str)
 {
-       return ((match(str.c_str(), matchtext.c_str(), true)));
+       return (InspIRCd::MatchCIDR(str, matchtext, NULL));
 }
 
 void ELine::OnAdd()