2 files changed, 43 insertions, 53 deletions

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index 77fcfaa23..bd437c03a 100644
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -38,41 +38,65 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 
 	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]);
+			}
+
+			// opers are lucky ducks, they always see the real reason
+			snprintf(killoperreason, MAXQUIT, "Killed (%s (%s))", user->nick, parameters[1]);
 		}
 		else
 		{
-			// hidekills is off, do nothing
-			snprintf(killreason, MAXQUIT, "Killed (%s (%s))", user->nick, parameters[1]);
+			snprintf(killreason, MAXQUIT, "%s", parameters[1]);
+			/*
+			 * XXX - yes, this means opers will probably see a censored kill remotely. this needs fixing.
+			 * maybe a version of QuitUser that doesn't take nor propegate an oper reason? -- w00t
+			 */
+			snprintf(killoperreason, 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!
-			 */
 		}
 		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,
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index dcf4652c7..e715fdffc 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -376,36 +376,6 @@ bool TreeSocket::RemoteRehash(const std::string &prefix, std::deque<std::string>
 	return true;
 }
 
-bool TreeSocket::RemoteKill(const std::string &prefix, std::deque<std::string> &params)
-{
-	if (params.size() != 2)
-		return true;
-
-	std::string nick = params[0];
-	userrec* u = this->Instance->FindNick(prefix);
-	userrec* who = this->Instance->FindNick(nick);
-
-	if (who)
-	{
-		/* Prepend kill source, if we don't have one */
-		std::string sourceserv = prefix;
-		if (u)
-		{
-			sourceserv = u->server;
-		}
-		if (*(params[1].c_str()) != '[')
-		{
-			params[1] = "[" + sourceserv + "] Killed (" + params[1] +")";
-		}
-		std::string reason = params[1];
-		params[1] = ":" + params[1];
-		Utils->DoOneToAllButSender(prefix,"KILL",params,sourceserv);
-		who->Write(":%s KILL %s :%s (%s)", sourceserv.c_str(), who->nick, sourceserv.c_str(), reason.c_str());
-		userrec::QuitUser(this->Instance,who,reason);
-	}
-	return true;
-}
-
 bool TreeSocket::LocalPong(const std::string &prefix, std::deque<std::string> &params)
 {
 	if (params.size() < 1)
@@ -1239,10 +1209,6 @@ bool TreeSocket::ProcessLine(std::string &line)
 					Utils->SetRemoteBursting(ServerSource, false);
 				return this->ForceMode(prefix,params);
 			}
-			else if (command == "KILL")
-			{
-				return this->RemoteKill(prefix,params);
-			}
 			else if (command == "FTOPIC")
 			{
 				return this->ForceTopic(prefix,params);