Don't do anything with logging in the handler for /REHASH.

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

diff --git a/src/commands.cpp b/src/commands.cpp
index 382783c71c65b298c1449223a02b3b7c944590b2..34fc71168ff37a811e5760dd1e1c966f4e37ad50 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,10 +11,9 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDcommands */
+/* $Core */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "command_parse.h"
 
@@ -24,16 +23,17 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user)
 {
        char itrigger[MAXBUF];
        long matches = 0;
-       
+
        if (!Config->ConfValue(Config->config_data, "insane","trigger", 0, itrigger, MAXBUF))
                strlcpy(itrigger,"95.5",MAXBUF);
-       
+
        if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0))
                return false;
-       
+
        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++;
                }
@@ -55,16 +55,16 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user)
 {
        char itrigger[MAXBUF];
        long matches = 0;
-       
+
        if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
                strlcpy(itrigger,"95.5",MAXBUF);
-       
+
        if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0))
                return false;
-       
+
        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++;
        }
 
@@ -84,16 +84,16 @@ bool InspIRCd::NickMatchesEveryone(const std::string &nick, User* user)
 {
        char itrigger[MAXBUF];
        long matches = 0;
-       
+
        if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
                strlcpy(itrigger,"95.5",MAXBUF);
-       
+
        if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0))
                return false;
 
        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++;
        }