X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_kill.cpp;h=43cf1d5ab2d393d621c5cef7176a8d05d79759cc;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;hp=77fcfaa23b39f960d0c8d489c3aeef67fcc35a7a;hpb=bb79b3b7a998634d8fb6c4e9462aff744a213f3e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index 77fcfaa23..43cf1d5ab 100644
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -12,10 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
-#include "wildcard.h"
 #include "commands/cmd_kill.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
@@ -33,54 +29,81 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 
 	userrec *u = ServerInstance->FindNick(parameters[0]);
 	char killreason[MAXBUF];
-	char killoperreason[MAXBUF];
 	int MOD_RESULT = 0;
 
 	if (u)
 	{
-		FOREACH_RESULT(I_OnKill, OnKill(user, u, parameters[1]));
+		/*
+		 * Here, we need to decide how to munge kill messages. Whether to hide killer, what to show opers, etc.
+		 * We only do this when the command is being issued LOCALLY, for remote KILL, we just copy the message we got.
+		 *
+		 * This conditional is so that we only append the "Killed (" prefix ONCE. If killer is remote, then the kill
+		 * just gets processed and passed on, otherwise, if they are local, it gets prefixed. Makes sense :-) -- w00t
+		 */
+		if (IS_LOCAL(user))
+		{
+			/*
+			 * Moved this event inside the IS_LOCAL check also, we don't want half the network killing a user
+			 * and the other half not. This would be a bad thing. ;p -- w00t
+			 */
+			FOREACH_RESULT(I_OnKill, OnKill(user, u, parameters[1]));
 
-		if (MOD_RESULT)
-			return CMD_FAILURE;
+			if (MOD_RESULT)
+				return CMD_FAILURE;
 
-		// generate two reasons here, one for users, one for opers. first, the user visible reason, which may change.
-		if (*ServerInstance->Config->HideKillsServer)
-		{
-			// hidekills is on, use it
-			snprintf(killreason, MAXQUIT, "Killed (%s (%s))", ServerInstance->Config->HideKillsServer, parameters[1]);
+			if (*ServerInstance->Config->HideKillsServer)
+			{
+				// hidekills is on, use it
+				snprintf(killreason, MAXQUIT, "Killed (%s (%s))", ServerInstance->Config->HideKillsServer, parameters[1]);
+			}
+			else
+			{
+				// hidekills is off, do nothing
+				snprintf(killreason, MAXQUIT, "Killed (%s (%s))", user->nick, parameters[1]);
+			}
 		}
 		else
 		{
-			// hidekills is off, do nothing
-			snprintf(killreason, MAXQUIT, "Killed (%s (%s))", user->nick, parameters[1]);
+			/* Leave it alone, remote server has already formatted it */
+			snprintf(killreason, MAXQUIT, "%s", parameters[1]);
 		}
 
-		// opers are lucky ducks, they always see the real reason
-		snprintf(killoperreason, MAXQUIT, "Killed (%s (%s))", user->nick, parameters[1]);
-
+		/*
+		 * Now we need to decide whether or not to send a local or remote snotice. Currently this checking is a little flawed.
+		 * No time to fix it right now, so left a note. -- w00t
+		 */
 		if (!IS_LOCAL(u))
 		{
 			// remote kill
-			ServerInstance->SNO->WriteToSnoMask('k',"Remote kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]);
-			FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason));
-
-			/*
-			 * IMPORTANT SHIT:
-			 *  There used to be a WriteCommonExcept() of the QUIT here. It seems to be unnecessary with QuitUser() right below, so it's gone.
-			 *  If it explodes painfully, put it back!
-			 */
+			ServerInstance->SNO->WriteToSnoMask('K', "Remote kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]);
+			FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason, killreason));
 		}
 		else
 		{
 			// local kill
+			/*
+			 * XXX - this isn't entirely correct, servers A - B - C, oper on A, client on C. Oper kills client, A and B will get remote kill
+			 * snotices, C will get a local kill snotice. this isn't accurate, and needs fixing at some stage. -- w00t
+			 */
 			ServerInstance->SNO->WriteToSnoMask('k',"Local Kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]);
 			ServerInstance->Log(DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick, ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]);
-			user->WriteTo(u, "KILL %s :%s!%s!%s (%s)", *ServerInstance->Config->HideKillsServer ? ServerInstance->Config->HideKillsServer : u->nick,
-					ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]);
+			/* Bug #419, make sure this message can only occur once even in the case of multiple KILL messages crossing the network, and change to show
+			 * hidekillsserver as source if possible
+			 */
+			if (!u->muted)
+			{
+				u->Write(":%s KILL %s :%s!%s!%s (%s)", *ServerInstance->Config->HideKillsServer ? ServerInstance->Config->HideKillsServer : user->GetFullHost(),
+						u->nick,
+						ServerInstance->Config->ServerName,
+						user->dhost,
+						*ServerInstance->Config->HideKillsServer ? ServerInstance->Config->HideKillsServer : user->nick,
+						parameters[1]);
+				u->muted = true;
+			}
 		}
 
 		// send the quit out
-		userrec::QuitUser(ServerInstance, u, killreason, killoperreason);
+		userrec::QuitUser(ServerInstance, u, killreason);
 	}
 	else
 	{