Made SANICK not collide the user (theres no need to in the new 1.1 now we have return...

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

diff --git a/src/commands.cpp b/src/commands.cpp
index e74d820101d2807a8dc40964daa3190058b5029e..581dde34be8df465adf2b1aa3a30481a83eb2c99 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -14,74 +14,38 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "inspircd.h"
 #include "configreader.h"
-#include <unistd.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <cstdio>
-#include <time.h>
-#include <string>
-#include <sstream>
-#include <vector>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#ifndef RUSAGE_SELF
-#define   RUSAGE_SELF     0
-#define   RUSAGE_CHILDREN     -1
-#endif
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
 #include "wildcard.h"
-#include "commands.h"
-#include "mode.h"
 #include "xline.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
 #include "command_parse.h"
 
-extern InspIRCd* ServerInstance;
-
-const long duration_m = 60;
-const long duration_h = duration_m * 60;
-const long duration_d = duration_h * 24;
-const long duration_w = duration_d * 7;
-const long duration_y = duration_w * 52;
-
-/* XXX - these really belong in helperfuncs perhaps -- w00t */
-bool is_uline(const char* server)
+bool InspIRCd::ULine(const char* server)
 {
        if (!server)
                return false;
        if (!*server)
                return true;
 
-       return (find(ServerInstance->Config->ulines.begin(),ServerInstance->Config->ulines.end(),server) != ServerInstance->Config->ulines.end());
+       return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
 }
 
-int operstrcmp(const char* data,const char* input)
+int InspIRCd::OperPassCompare(const char* data,const char* input)
 {
        int MOD_RESULT = 0;
-       FOREACH_RESULT(I_OnOperCompare,OnOperCompare(data,input))
-       log(DEBUG,"operstrcmp: %d",MOD_RESULT);
+       FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data,input))
+       Log(DEBUG,"OperPassCompare: %d",MOD_RESULT);
        if (MOD_RESULT == 1)
                return 0;
        if (MOD_RESULT == -1)
                return 1;
-       log(DEBUG,"strcmp fallback: '%s' '%s' %d",data,input,strcmp(data,input));
+       Log(DEBUG,"strcmp fallback: '%s' '%s' %d",data,input,strcmp(data,input));
        return strcmp(data,input);
 }
 
-long duration(const char* str)
+long InspIRCd::Duration(const char* str)
 {
        char n_field[MAXBUF];
        long total = 0;
@@ -91,7 +55,7 @@ long duration(const char* str)
        {
                std::string n = str;
                n += 's';
-               return duration(n.c_str());
+               return Duration(n.c_str());
        }
        
        for (char* i = (char*)str; *i; i++)
@@ -142,19 +106,19 @@ long duration(const char* str)
 
 /* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */
 
-bool host_matches_everyone(const std::string &mask, userrec* user)
+bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
 {
        char buffer[MAXBUF];
        char itrigger[MAXBUF];
        long matches = 0;
        
-       if (!ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "insane","trigger", 0, itrigger, MAXBUF))
+       if (!Config->ConfValue(Config->config_data, "insane","trigger", 0, itrigger, MAXBUF))
                strlcpy(itrigger,"95.5",MAXBUF);
        
-       if (ServerInstance->Config->ConfValueBool(ServerInstance->Config->config_data, "insane","hostmasks", 0))
+       if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0))
                return false;
        
-       for (user_hash::iterator u = ServerInstance->clientlist.begin(); u != ServerInstance->clientlist.end(); u++)
+       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
        {
                strlcpy(buffer,u->second->ident,MAXBUF);
                charlcat(buffer,'@',MAXBUF);
@@ -162,62 +126,62 @@ bool host_matches_everyone(const std::string &mask, userrec* user)
                if (match(buffer,mask.c_str()))
                        matches++;
        }
-       float percent = ((float)matches / (float)ServerInstance->clientlist.size()) * 100;
+       float percent = ((float)matches / (float)clientlist.size()) * 100;
        if (percent > (float)atof(itrigger))
        {
-               ServerInstance->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);
+               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);
                return true;
        }
        return false;
 }
 
-bool ip_matches_everyone(const std::string &ip, userrec* user)
+bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user)
 {
        char itrigger[MAXBUF];
        long matches = 0;
        
-       if (!ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
+       if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
                strlcpy(itrigger,"95.5",MAXBUF);
        
-       if (ServerInstance->Config->ConfValueBool(ServerInstance->Config->config_data, "insane","ipmasks",0))
+       if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0))
                return false;
        
-       for (user_hash::iterator u = ServerInstance->clientlist.begin(); u != ServerInstance->clientlist.end(); u++)
+       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
        {
                if (match(u->second->GetIPString(),ip.c_str(),true))
                        matches++;
        }
        
-       float percent = ((float)matches / (float)ServerInstance->clientlist.size()) * 100;
+       float percent = ((float)matches / (float)clientlist.size()) * 100;
        if (percent > (float)atof(itrigger))
        {
-               ServerInstance->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);
+               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);
                return true;
        }
        return false;
 }
 
-bool nick_matches_everyone(const std::string &nick, userrec* user)
+bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user)
 {
        char itrigger[MAXBUF];
        long matches = 0;
        
-       if (!ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
+       if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
                strlcpy(itrigger,"95.5",MAXBUF);
        
-       if (ServerInstance->Config->ConfValueBool(ServerInstance->Config->config_data, "insane","nickmasks",0))
+       if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0))
                return false;
 
-       for (user_hash::iterator u = ServerInstance->clientlist.begin(); u != ServerInstance->clientlist.end(); u++)
+       for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
        {
                if (match(u->second->nick,nick.c_str()))
                        matches++;
        }
        
-       float percent = ((float)matches / (float)ServerInstance->clientlist.size()) * 100;
+       float percent = ((float)matches / (float)clientlist.size()) * 100;
        if (percent > (float)atof(itrigger))
        {
-               ServerInstance->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);
+               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);
                return true;
        }
        return false;