Fix for bug typo, dont let it creep into the release!

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 9ddfe338ff6b11e4e0664a94cf2993d1a456ef6e..3f0b5ff0ce8ceb93d22710a1f38d456fe78ec287 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -19,6 +19,7 @@
 #include "mode.h"
 #include "xline.h"
 #include "inspircd.h"
+#include "exitcodes.h"
 
 static char TIMESTR[26];
 static time_t LAST = 0;
@@ -227,9 +228,9 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
 
 userrec* InspIRCd::FindNick(const std::string &nick)
 {
-       user_hash::iterator iter = clientlist.find(nick);
+       user_hash::iterator iter = clientlist->find(nick);
 
-       if (iter == clientlist.end())
+       if (iter == clientlist->end())
                /* Couldn't find it */
                return NULL;
 
@@ -238,9 +239,9 @@ userrec* InspIRCd::FindNick(const std::string &nick)
 
 userrec* InspIRCd::FindNick(const char* nick)
 {
-       user_hash::iterator iter = clientlist.find(nick);
+       user_hash::iterator iter = clientlist->find(nick);
        
-       if (iter == clientlist.end())
+       if (iter == clientlist->end())
                return NULL;
 
        return iter->second;
@@ -250,9 +251,9 @@ userrec* InspIRCd::FindNick(const char* nick)
 
 chanrec* InspIRCd::FindChan(const char* chan)
 {
-       chan_hash::iterator iter = chanlist.find(chan);
+       chan_hash::iterator iter = chanlist->find(chan);
 
-       if (iter == chanlist.end())
+       if (iter == chanlist->end())
                /* Couldn't find it */
                return NULL;
 
@@ -261,9 +262,9 @@ chanrec* InspIRCd::FindChan(const char* chan)
 
 chanrec* InspIRCd::FindChan(const std::string &chan)
 {
-       chan_hash::iterator iter = chanlist.find(chan);
+       chan_hash::iterator iter = chanlist->find(chan);
 
-       if (iter == chanlist.end())
+       if (iter == chanlist->end())
                /* Couldn't find it */
                return NULL;
 
@@ -298,72 +299,51 @@ void InspIRCd::SendError(const std::string &s)
 // this function counts all users connected, wether they are registered or NOT.
 int InspIRCd::UserCount()
 {
-       return clientlist.size();
+       return clientlist->size();
 }
 
 // this counts only registered users, so that the percentages in /MAP don't mess up when users are sitting in an unregistered state
 int InspIRCd::RegisteredUserCount()
 {
-       return clientlist.size() - this->UnregisteredUserCount();
+       return clientlist->size() - this->UnregisteredUserCount();
 }
 
-int InspIRCd::InvisibleUserCount()
+int InspIRCd::ModeCount(const char mode)
 {
-       int c = 0;
+       ModeHandler* mh = this->Modes->FindMode(mode, MODETYPE_USER);
 
-       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-       {
-               c += ((i->second->registered == REG_ALL) && (i->second->modes[UM_INVISIBLE]));
-       }
+       if (mh)
+               return mh->GetCount();
+       else
+               return 0;
+}
 
-       return c;
+int InspIRCd::InvisibleUserCount()
+{
+       return ModeCount('i');
 }
 
 int InspIRCd::OperCount()
 {
-       int c = 0;
-
-       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-       {
-               if (*(i->second->oper))
-                       c++;
-       }
-       return c;
+       return this->all_opers.size();
 }
 
 int InspIRCd::UnregisteredUserCount()
 {
-       int c = 0;
-
-       for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-       {
-               userrec* t = (userrec*)(*i);
-               if (t->registered != REG_ALL)
-                       c++;
-       }
-
-       return c;
+       return this->unregistered_count;
 }
 
 long InspIRCd::ChannelCount()
 {
-       return chanlist.size();
+       return chanlist->size();
 }
 
 long InspIRCd::LocalUserCount()
 {
-       int c = 0;
-
-       for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-       {
-               userrec* t = (userrec*)(*i);
-               if (t->registered == REG_ALL)
-                       c++;
-       }
-
-       return c;
+       /* Doesnt count unregistered clients */
+       return (local_users.size() - this->UnregisteredUserCount());
 }
-
+       
 bool InspIRCd::IsChannel(const char *chname)
 {
        char *c;
@@ -428,8 +408,6 @@ bool InspIRCd::IsNick(const char* n)
 void InspIRCd::OpenLog(char** argv, int argc)
 {
        Config->MyDir = ServerConfig::GetFullProgDir(argv,argc);
-       Config->argv = argv;
-       Config->argc = argc;
 
        if (!*this->LogFileName)
        {
@@ -448,7 +426,7 @@ void InspIRCd::OpenLog(char** argv, int argc)
        if (!Config->log_file)
        {
                printf("ERROR: Could not write to logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno));
-               Exit(ERROR);
+               Exit(EXIT_STATUS_LOG);
        }
 
        this->Logger = new FileLogger(this, Config->log_file);
@@ -460,7 +438,7 @@ void InspIRCd::CheckRoot()
        {
                printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");
                this->Log(DEFAULT,"Cant start as root");
-               Exit(ERROR);
+               Exit(EXIT_STATUS_ROOT);
        }
 }
 
@@ -470,7 +448,7 @@ void InspIRCd::CheckDie()
        {
                printf("WARNING: %s\n\n",Config->DieValue);
                this->Log(DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
-               Exit(ERROR);
+               Exit(EXIT_STATUS_DIETAG);
        }
 }
 
@@ -483,14 +461,14 @@ void InspIRCd::LoadAllModules()
 
        for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++)
        {
-               Config->ConfValue(Config->config_data, "module","name",count,configToken,MAXBUF);
+               Config->ConfValue(Config->config_data, "module", "name", count, configToken, MAXBUF);
                printf("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken);
                
                if (!this->LoadModule(configToken))             
                {
-                       this->Log(DEFAULT,"There was an error loading a module: %s", this->ModuleError());
-                       printf("\nThere was an error loading a module: %s\n\n",this->ModuleError());
-                       Exit(ERROR);
+                       this->Log(DEFAULT,"There was an error loading the module '%s': %s", configToken, this->ModuleError());
+                       printf("\n[\033[1;31m*\033[0m] There was an error loading the module '%s': %s\n\n", configToken, this->ModuleError());
+                       Exit(EXIT_STATUS_MODULE);
                }
        }
        printf("\nA total of \033[1;32m%d\033[0m module%s been loaded.\n", this->ModCount+1, this->ModCount+1 == 1 ? " has" : "s have");