cmd_mode Exempt remote users and servers from max modes limitation when changing...

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 9c04c7889874830e683ea42a4d4649329f6083e4..52cb4989fbbaf199ff0eee1aa1718d27337e4aae 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -245,7 +245,7 @@ void UserManager::ServerNoticeAll(const char* text, ...)
        VAFORMAT(message, text, text);
        message = "NOTICE $" + ServerInstance->Config->ServerName + " :" + message;
 
-       for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+       for (LocalList::const_iterator i = local_users.begin(); i != local_users.end(); ++i)
        {
                User* t = *i;
                t->WriteServ(message);
@@ -256,7 +256,7 @@ void UserManager::GarbageCollect()
 {
        // Reset the already_sent IDs so we don't wrap it around and drop a message
        LocalUser::already_sent_id = 0;
-       for (LocalUserList::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
+       for (LocalList::const_iterator i = local_users.begin(); i != local_users.end(); ++i)
        {
                (**i).already_sent = 0;
                (**i).RemoveExpiredInvites();
@@ -284,7 +284,7 @@ void UserManager::DoBackgroundUserStuff()
        /*
         * loop over all local users..
         */
-       for (LocalUserList::iterator i = local_users.begin(); i != local_users.end(); ++i)
+       for (LocalList::iterator i = local_users.begin(); i != local_users.end(); ++i)
        {
                LocalUser* curr = *i;
 
@@ -301,7 +301,7 @@ void UserManager::DoBackgroundUserStuff()
                switch (curr->registered)
                {
                        case REG_ALL:
-                               if (ServerInstance->Time() > curr->nping)
+                               if (ServerInstance->Time() >= curr->nping)
                                {
                                        // This user didn't answer the last ping, remove them
                                        if (!curr->lastping)