Remove bad check for channel op in m_auditorium, fixes bug #886

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

diff --git a/src/commands.cpp b/src/commands.cpp
index 495fb821b32d52fbe188b98ccba8a270f8a5ecb3..db2074d87e85dd82576a280230ec010f55fc58a3 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))
+
+       if (!Config->ConfValue("insane","trigger", 0, itrigger, MAXBUF))
                strlcpy(itrigger,"95.5",MAXBUF);
-       
-       if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0))
+
+       if (Config->ConfValueBool("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('A', "\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;
@@ -55,26 +55,26 @@ 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))
+
+       if (!Config->ConfValue("insane","trigger",0,itrigger,MAXBUF))
                strlcpy(itrigger,"95.5",MAXBUF);
-       
-       if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0))
+
+       if (Config->ConfValueBool("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('A', "\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;
@@ -84,26 +84,26 @@ 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))
+
+       if (!Config->ConfValue("insane","trigger",0,itrigger,MAXBUF))
                strlcpy(itrigger,"95.5",MAXBUF);
-       
-       if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0))
+
+       if (Config->ConfValueBool("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('A', "\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;