Rewrite invite system

[user/henk/code/inspircd.git] / src / coremods / core_lusers.cpp

diff --git a/src/coremods/core_lusers.cpp b/src/coremods/core_lusers.cpp
index 206d969d19dcdc1fee13eabd25887fc7e824f34f..2529ca42bd37fddc06aa2baeaebfbb358c863402 100644 (file)
--- a/src/coremods/core_lusers.cpp
+++ b/src/coremods/core_lusers.cpp
@@ -95,8 +95,8 @@ CmdResult CommandLusers::Handle (const std::vector<std::string>&, User *user)
 
        user->WriteNumeric(RPL_LUSERCHANNELS, "%lu :channels formed", (unsigned long)ServerInstance->GetChans().size());
        user->WriteNumeric(RPL_LUSERME, ":I have %d clients and %d servers", ServerInstance->Users->LocalUserCount(),n_local_servs);
-       user->WriteNumeric(RPL_LOCALUSERS, ":Current Local Users: %d  Max: %d", ServerInstance->Users->LocalUserCount(), counters.max_local);
-       user->WriteNumeric(RPL_GLOBALUSERS, ":Current Global Users: %d  Max: %d", n_users, counters.max_global);
+       user->WriteNumeric(RPL_LOCALUSERS, ":Current local users: %d  Max: %d", ServerInstance->Users->LocalUserCount(), counters.max_local);
+       user->WriteNumeric(RPL_GLOBALUSERS, ":Current global users: %d  Max: %d", n_users, counters.max_global);
 
        return CMD_SUCCESS;
 }
@@ -132,7 +132,8 @@ class ModuleLusers : public Module
        unsigned int CountInvisible()
        {
                unsigned int c = 0;
-               for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); ++i)
+               const user_hash& users = ServerInstance->Users->GetUsers();
+               for (user_hash::const_iterator i = users.begin(); i != users.end(); ++i)
                {
                        User* u = i->second;
                        if (u->IsModeSet(invisiblemode))