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 fdbeb613f809b4ce0c698f743b0d2605e0df7f7e..3f0b5ff0ce8ceb93d22710a1f38d456fe78ec287 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -308,42 +308,29 @@ int InspIRCd::RegisteredUserCount()
        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()
@@ -353,18 +340,10 @@ long InspIRCd::ChannelCount()
 
 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;
@@ -482,13 +461,13 @@ 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());
+                       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);
                }
        }