1 files changed, 12 insertions, 38 deletions

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 9cc2e7df7..fe55fb3f7 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -21,46 +21,24 @@
  */
 
 
-/* $Core */
-
 #include "inspircd.h"
 #include "xline.h"
 #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.
  * stuff like ping checks, registration timeouts, etc.
  */
-void InspIRCd::DoBackgroundUserStuff()
+void UserManager::DoBackgroundUserStuff()
 {
 	/*
 	 * loop over all local users..
 	 */
-	LocalUserList::reverse_iterator count2 = this->Users->local_users.rbegin();
-	while (count2 != this->Users->local_users.rend())
+	for (LocalUserList::iterator i = local_users.begin(); i != local_users.end(); ++i)
 	{
-		LocalUser *curr = *count2;
-		count2++;
+		LocalUser* curr = *i;
 
 		if (curr->quitting)
 			continue;
@@ -78,27 +56,24 @@ void InspIRCd::DoBackgroundUserStuff()
 		switch (curr->registered)
 		{
 			case REG_ALL:
-				if (Time() > curr->nping)
+				if (ServerInstance->Time() > curr->nping)
 				{
 					// This user didn't answer the last ping, remove them
 					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" : "");
-						curr->lastping = 1;
-						curr->nping = Time() + curr->MyClass->GetPingTime();
-						this->Users->QuitUser(curr, message);
+						time_t time = ServerInstance->Time() - (curr->nping - curr->MyClass->GetPingTime());
+						const std::string message = "Ping timeout: " + ConvToStr(time) + (time == 1 ? " seconds" : " second");
+						this->QuitUser(curr, message);
 						continue;
 					}
 
-					curr->Write("PING :%s",this->Config->ServerName.c_str());
+					curr->Write("PING :" + ServerInstance->Config->ServerName);
 					curr->lastping = 0;
-					curr->nping = Time()  +curr->MyClass->GetPingTime();
+					curr->nping = ServerInstance->Time() + curr->MyClass->GetPingTime();
 				}
 				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();
@@ -107,15 +82,14 @@ void InspIRCd::DoBackgroundUserStuff()
 				break;
 		}
 
-		if (curr->registered != REG_ALL && (Time() > (curr->age + curr->MyClass->GetRegTimeout())))
+		if (curr->registered != REG_ALL && (ServerInstance->Time() > (curr->age + curr->MyClass->GetRegTimeout())))
 		{
 			/*
 			 * registration timeout -- didnt send USER/NICK/HOST
 			 * in the time specified in their connection class.
 			 */
-			this->Users->QuitUser(curr, "Registration timeout");
+			this->QuitUser(curr, "Registration timeout");
 			continue;
 		}
 	}
 }
-