Wakey wakey w00t :p

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

diff --git a/src/commands.cpp b/src/commands.cpp
index b1e1be5df2380744edc48c7de73779b4ec9c81da..364f0600417dc38e4a0e024b5c77607df8bf2843 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -11,10 +11,9 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDcommands */
+/* $Core */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "command_parse.h"
 
@@ -31,9 +30,10 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user)
        if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0))
                return false;
        
-       for (user_hash::iterator u = clientlist->begin(); u != clientlist->end(); u++)
+       for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++)
        {
-               if ((match(u->second->MakeHost(),mask.c_str(),true)) || (match(u->second->MakeHostIP(),mask.c_str(),true)))
+               if ((InspIRCd::Match(u->second->MakeHost(), mask, ascii_case_insensitive_map)) ||
+                   (InspIRCd::Match(u->second->MakeHostIP(), mask, ascii_case_insensitive_map)))
                {
                        matches++;
                }
@@ -42,10 +42,10 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user)
        if (!matches)
                return false;
 
-       float percent = ((float)matches / (float)clientlist->size()) * 100;
+       float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100;
        if (percent > (float)atof(itrigger))
        {
-               SNO->WriteToSnoMask('O', "\2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick,mask.c_str(),percent);
+               SNO->WriteToSnoMask('A', "\2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),mask.c_str(),percent);
                return true;
        }
        return false;
@@ -62,19 +62,19 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user)
        if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0))
                return false;
        
-       for (user_hash::iterator u = clientlist->begin(); u != clientlist->end(); u++)
+       for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++)
        {
-               if (match(u->second->GetIPString(),ip.c_str(),true))
+               if (InspIRCd::Match(u->second->GetIPString(), ip, ascii_case_insensitive_map))
                        matches++;
        }
 
        if (!matches)
                return false;
 
-       float percent = ((float)matches / (float)clientlist->size()) * 100;
+       float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100;
        if (percent > (float)atof(itrigger))
        {
-               SNO->WriteToSnoMask('O', "\2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick,ip.c_str(),percent);
+               SNO->WriteToSnoMask('A', "\2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),ip.c_str(),percent);
                return true;
        }
        return false;
@@ -91,19 +91,19 @@ bool InspIRCd::NickMatchesEveryone(const std::string &nick, User* user)
        if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0))
                return false;
 
-       for (user_hash::iterator u = clientlist->begin(); u != clientlist->end(); u++)
+       for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++)
        {
-               if (match(u->second->nick,nick.c_str()))
+               if (InspIRCd::Match(u->second->nick, nick))
                        matches++;
        }
 
        if (!matches)
                return false;
 
-       float percent = ((float)matches / (float)clientlist->size()) * 100;
+       float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100;
        if (percent > (float)atof(itrigger))
        {
-               SNO->WriteToSnoMask('O', "\2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick,nick.c_str(),percent);
+               SNO->WriteToSnoMask('A', "\2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),nick.c_str(),percent);
                return true;
        }
        return false;