*slaps self* for not test compiling

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index ff6d6035abea55e1dacf6bf6d78a20479421b81d..37a9e1b0417e42321e113906b1a761472495018b 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -325,21 +325,12 @@ int InspIRCd::InvisibleUserCount()
 
 int InspIRCd::OperCount()
 {
-       return ModeCount('o');
+       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()
@@ -349,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;