Tidy up keywords on module methods.

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

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 72cee8f1e7ee8cab96aba951815406bd6b8a75d9..40fd35c5901e6fc8f25fd2af0a229cd52b945740 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -28,24 +28,6 @@
 #include "socketengine.h"
 #include "command_parse.h"
 
-void FloodQuitUserHandler::Call(User* current)
-{
-       ServerInstance->Logs->Log("USERS",DEFAULT,"Excess flood from: %s@%s", current->ident.c_str(), current->host.c_str());
-       ServerInstance->SNO->WriteToSnoMask('f',"Excess flood from: %s%s%s@%s",
-                       current->registered == REG_ALL ? current->nick.c_str() : "",
-                       current->registered == REG_ALL ? "!" : "", current->ident.c_str(), current->host.c_str());
-       ServerInstance->Users->QuitUser(current, "Excess flood");
-
-       if (current->registered != REG_ALL)
-       {
-               ZLine* zl = new ZLine(ServerInstance->Time(), 0, ServerInstance->Config->ServerName, "Flood from unregistered connection", current->GetIPString());
-               if (ServerInstance->XLines->AddLine(zl,NULL))
-                       ServerInstance->XLines->ApplyLines();
-               else
-                       delete zl;
-       }
-}
-
 /**
  * This function is called once a second from the mainloop.
  * It is intended to do background checking on all the user structs, e.g.
@@ -56,7 +38,7 @@ void InspIRCd::DoBackgroundUserStuff()
        /*
         * loop over all local users..
         */
-       std::vector<LocalUser*>::reverse_iterator count2 = this->Users->local_users.rbegin();
+       LocalUserList::reverse_iterator count2 = this->Users->local_users.rbegin();
        while (count2 != this->Users->local_users.rend())
        {
                LocalUser *curr = *count2;
@@ -84,8 +66,7 @@ void InspIRCd::DoBackgroundUserStuff()
                                        if (!curr->lastping)
                                        {
                                                time_t time = this->Time() - (curr->nping - curr->MyClass->GetPingTime());
-                                               char message[MAXBUF];
-                                               snprintf(message, MAXBUF, "Ping timeout: %ld second%s", (long)time, time > 1 ? "s" : "");
+                                               const std::string message = "Ping timeout: " + ConvToStr(time) + (time == 1 ? " seconds" : " second");
                                                curr->lastping = 1;
                                                curr->nping = Time() + curr->MyClass->GetPingTime();
                                                this->Users->QuitUser(curr, message);
@@ -98,7 +79,7 @@ void InspIRCd::DoBackgroundUserStuff()
                                }
                                break;
                        case REG_NICKUSER:
-                               if (AllModulesReportReady(curr) && curr->dns_done)
+                               if (AllModulesReportReady(curr))
                                {
                                        /* User has sent NICK/USER, modules are okay, DNS finished. */
                                        curr->FullConnect();