X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=dd1ca179981c2a3e59cc97dbece77220667ff940;hb=af7e1a1ca8b36064593becf62b1a91468ad32237;hp=eb5ea050c5d7c73471609b23a65e130c32567e30;hpb=393c1afdd7bfede2b7f489d7ceb000c909c0fccf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index eb5ea050c..dd1ca1799 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -26,10 +26,14 @@ void FloodQuitUserHandler::Call(User* current)
 			current->registered == REG_ALL ? current->nick : "",
 			current->registered == REG_ALL ? "!" : "", current->ident, current->host);
 	User::QuitUser(Server, current, "Excess flood");
+
 	if (current->registered != REG_ALL)
 	{
-		Server->XLines->add_zline(120, Server->Config->ServerName, "Flood from unregistered connection", current->GetIPString());
-		Server->XLines->apply_lines(APPLY_ZLINES);
+		ZLine* zl = new ZLine(Server, Server->Time(), 0, Server->Config->ServerName, "Flood from unregistered connection", current->GetIPString());
+		if (Server->XLines->AddLine(zl,NULL))
+			Server->XLines->ApplyLines();
+		else
+			delete zl;
 	}
 }
 
@@ -163,7 +167,7 @@ void InspIRCd::DoBackgroundUserStuff()
 	/*
 	 * loop over all local users..
 	 */
-	for (std::vector<User*>::iterator count2 = local_users.begin(); count2 != local_users.end(); count2++)
+	for (std::vector<User*>::iterator count2 = this->Users->local_users.begin(); count2 != this->Users->local_users.end(); count2++)
 	{
 		User *curr = *count2;
 
@@ -186,7 +190,6 @@ void InspIRCd::DoBackgroundUserStuff()
 			 * registration timeout -- didnt send USER/NICK/HOST
 			 * in the time specified in their connection class.
 			 */
-			curr->muted = true;
 			User::QuitUser(this, curr, "Registration timeout");
 			continue;
 		}
@@ -216,7 +219,6 @@ void InspIRCd::DoBackgroundUserStuff()
 				time_t time = this->Time(false) - (curr->nping - curr->MyClass->GetPingTime());
 				char message[MAXBUF];
 				snprintf(message, MAXBUF, "Ping timeout: %ld second%s", (long)time, time > 1 ? "s" : "");
-				curr->muted = true;
 				curr->lastping = 1;
 				curr->nping = TIME + curr->MyClass->GetPingTime();
 				User::QuitUser(this, curr, message);