Make xline expiry messages a bit clearer that the xline may have expired a while...

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

diff --git a/src/commands.cpp b/src/commands.cpp
index a9a81f177e976911b1bcf656c44c3b866000f932..18153d87bca84ef03c31d057661dcebb3c3a7e4d 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -14,7 +14,6 @@
 /* $Core */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "command_parse.h"
 
@@ -33,7 +32,8 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user)
        
        for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++)
        {
-               if ((match(u->second->MakeHost(), mask, true)) || (match(u->second->MakeHostIP(), mask, true)))
+               if ((InspIRCd::Match(u->second->MakeHost(), mask, ascii_case_insensitive_map)) ||
+                   (InspIRCd::Match(u->second->MakeHostIP(), mask, ascii_case_insensitive_map)))
                {
                        matches++;
                }
@@ -64,7 +64,7 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user)
        
        for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++)
        {
-               if (match(u->second->GetIPString(),ip,true))
+               if (InspIRCd::Match(u->second->GetIPString(), ip, ascii_case_insensitive_map))
                        matches++;
        }
 
@@ -93,7 +93,7 @@ bool InspIRCd::NickMatchesEveryone(const std::string &nick, User* user)
 
        for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++)
        {
-               if (match(u->second->nick,nick))
+               if (InspIRCd::Match(u->second->nick, nick))
                        matches++;
        }