Add <gecos> field to <server> in XML stats output, also add to ProtoServer. Fixes...

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

diff --git a/src/commands.cpp b/src/commands.cpp
index 65b11e5a027a8091e98c60d836b35df34b8cef7c..382783c71c65b298c1449223a02b3b7c944590b2 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,17 +11,16 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDcommands */
+
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "xline.h"
 #include "command_parse.h"
 
 /* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */
 
-bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
+bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user)
 {
        char itrigger[MAXBUF];
        long matches = 0;
@@ -32,9 +31,9 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* 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 ((match(u->second->MakeHost(), mask, true)) || (match(u->second->MakeHostIP(), mask, true)))
                {
                        matches++;
                }
@@ -43,16 +42,16 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* 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))
        {
-               WriteOpers("*** \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;
 }
 
-bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user)
+bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user)
 {
        char itrigger[MAXBUF];
        long matches = 0;
@@ -63,25 +62,25 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* 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 (match(u->second->GetIPString(),ip,true))
                        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))
        {
-               WriteOpers("*** \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;
 }
 
-bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user)
+bool InspIRCd::NickMatchesEveryone(const std::string &nick, User* user)
 {
        char itrigger[MAXBUF];
        long matches = 0;
@@ -92,19 +91,19 @@ bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* 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 (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))
        {
-               WriteOpers("*** \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;