X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_kill.cpp;h=49f05d6c29e5b2ae57cfbc3c2901b9e637b04982;hb=b0e469b0bbdbc76692364e1f52ef613cc02a2a06;hp=bc59f8492602bcad078776dbc4a6e625f7e917f8;hpb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index bc59f8492..49f05d6c2 100644
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -35,18 +35,12 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 	char killreason[MAXBUF];
 	int MOD_RESULT = 0;
 
-	ServerInstance->Log(DEBUG,"kill: %s %s", parameters[0], parameters[1]);
-
 	if (u)
 	{
-		ServerInstance->Log(DEBUG, "into kill mechanism");
 		FOREACH_RESULT(I_OnKill, OnKill(user, u, parameters[1]));
 
 		if (MOD_RESULT)
-		{
-			ServerInstance->Log(DEBUG, "A module prevented the kill with result %d", MOD_RESULT);
 			return CMD_FAILURE;
-		}
 
 		if (!IS_LOCAL(u))
 		{
@@ -55,27 +49,8 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 			snprintf(killreason, MAXQUIT,"[%s] Killed (%s (%s))", ServerInstance->Config->ServerName, user->nick, parameters[1]);
 			u->WriteCommonExcept("QUIT :%s", killreason);
 			FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason));
-			
-			user_hash::iterator iter = ServerInstance->clientlist.find(u->nick);
-
-			if (iter != ServerInstance->clientlist.end())
-			{
-				ServerInstance->Log(DEBUG,"deleting user hash value %d", iter->second);
-				ServerInstance->clientlist.erase(iter);
-			}
 
-			if (u->registered == REG_ALL)
-			{
-				u->PurgeEmptyChannels();
-			}
-
-			if (u == user)
-			{
-				std::string original_command = std::string("KILL ") + u->nick + " :"+parameters[1];
-				FOREACH_MOD(I_OnPostCommand,OnPostCommand("KILL", parameters, pcnt, user, CMD_SUCCESS,original_command));
-				return CMD_USER_DELETED;
-			}
-			DELETE(u);
+			userrec::QuitUser(ServerInstance, u, killreason);
 		}
 		else
 		{
@@ -84,10 +59,8 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 			user->WriteTo(u, "KILL %s :%s!%s!%s (%s)", u->nick, ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]);
 			ServerInstance->SNO->WriteToSnoMask('k',"Local Kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]);
 			snprintf(killreason,MAXQUIT,"Killed (%s (%s))", user->nick, parameters[1]);
-			userrec::QuitUser(ServerInstance, u, killreason);
 
-			if (u == user)
-				return CMD_USER_DELETED;
+			userrec::QuitUser(ServerInstance, u, killreason);
 		}
 	}
 	else