*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 4f303d32c5bfaac9a4549aa28a75efcffc55800e..37a9e1b0417e42321e113906b1a761472495018b 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -228,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;
 
@@ -239,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;
@@ -251,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;
 
@@ -262,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;
 
@@ -299,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;
@@ -429,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)
        {