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 ca31c86d8d6869de7723bf63e854ec6b5f91f5b1..581dde34be8df465adf2b1aa3a30481a83eb2c99 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -14,43 +14,15 @@
  * ---------------------------------------------------
  */
 
-#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"
 
-/* XXX - these really belong in helperfuncs perhaps -- w00t */
-bool InspIRCd::is_uline(const char* server)
+bool InspIRCd::ULine(const char* server)
 {
        if (!server)
                return false;
@@ -60,11 +32,11 @@ bool InspIRCd::is_uline(const char* server)
        return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
 }
 
-int InspIRCd::operstrcmp(const char* data,const char* input)
+int InspIRCd::OperPassCompare(const char* data,const char* input)
 {
        int MOD_RESULT = 0;
        FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data,input))
-       Log(DEBUG,"operstrcmp: %d",MOD_RESULT);
+       Log(DEBUG,"OperPassCompare: %d",MOD_RESULT);
        if (MOD_RESULT == 1)
                return 0;
        if (MOD_RESULT == -1)
@@ -73,7 +45,7 @@ int InspIRCd::operstrcmp(const char* data,const char* input)
        return strcmp(data,input);
 }
 
-long InspIRCd::duration(const char* str)
+long InspIRCd::Duration(const char* str)
 {
        char n_field[MAXBUF];
        long total = 0;
@@ -83,7 +55,7 @@ long InspIRCd::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++)
@@ -134,7 +106,7 @@ long InspIRCd::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 InspIRCd::host_matches_everyone(const std::string &mask, userrec* user)
+bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
 {
        char buffer[MAXBUF];
        char itrigger[MAXBUF];
@@ -163,7 +135,7 @@ bool InspIRCd::host_matches_everyone(const std::string &mask, userrec* user)
        return false;
 }
 
-bool InspIRCd::ip_matches_everyone(const std::string &ip, userrec* user)
+bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user)
 {
        char itrigger[MAXBUF];
        long matches = 0;
@@ -189,7 +161,7 @@ bool InspIRCd::ip_matches_everyone(const std::string &ip, userrec* user)
        return false;
 }
 
-bool InspIRCd::nick_matches_everyone(const std::string &nick, userrec* user)
+bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user)
 {
        char itrigger[MAXBUF];
        long matches = 0;