X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_oper%2Fcmd_kill.cpp;h=13d6be55803da4bfb91ee7d52e5711c8e3585d00;hb=f3f2388a81b6463e1229fa5bf2b8c427440bf406;hp=8a453f7f1ea02947f238eb29352ca742c1b6cef0;hpb=d23c030c9a8fd58807438245a004e4aa5b7288ba;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_oper/cmd_kill.cpp b/src/coremods/core_oper/cmd_kill.cpp
index 8a453f7f1..13d6be558 100644
--- a/src/coremods/core_oper/cmd_kill.cpp
+++ b/src/coremods/core_oper/cmd_kill.cpp
@@ -1,9 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2016 Adam <Adam@anope.org>
+ *   Copyright (C) 2012-2014, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -24,18 +30,34 @@
 
 CommandKill::CommandKill(Module* parent)
 	: Command(parent, "KILL", 2, 2)
+	, protoev(parent, name)
 {
 	flags_needed = 'o';
-	syntax = "<nickname> <reason>";
+	syntax = "<nick>[,<nick>]+ :<reason>";
 	TRANSLATE2(TR_CUSTOM, TR_CUSTOM);
 }
 
+class KillMessage : public ClientProtocol::Message
+{
+ public:
+	KillMessage(ClientProtocol::EventProvider& protoev, User* user, LocalUser* target, const std::string& text, const std::string& hidenick)
+		: ClientProtocol::Message("KILL", NULL)
+	{
+		if (hidenick.empty())
+			SetSourceUser(user);
+		else
+			SetSource(hidenick);
+
+		PushParamRef(target->nick);
+		PushParamRef(text);
+	}
+};
 
 /** Handle /KILL
  */
-CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandKill::Handle(User* user, const Params& parameters)
 {
-	/* Allow comma seperated lists of users for /KILL (thanks w00t) */
+	/* Allow comma separated lists of users for /KILL (thanks w00t) */
 	if (CommandParser::LoopCall(user, this, parameters, 0))
 	{
 		// If we got a colon delimited list of nicks then the handler ran for each nick,
@@ -71,10 +93,10 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User
 			return CMD_FAILURE;
 
 		killreason = "Killed (";
-		if (!ServerInstance->Config->HideKillsServer.empty())
+		if (!hidenick.empty())
 		{
 			// hidekills is on, use it
-			killreason += ServerInstance->Config->HideKillsServer;
+			killreason += hidenick;
 		}
 		else
 		{
@@ -90,7 +112,7 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User
 		killreason.assign(parameters[1], 0, ServerInstance->Config->Limits.MaxQuit);
 	}
 
-	if ((!ServerInstance->Config->HideULineKills) || (!user->server->IsULine()))
+	if ((!hideuline) || (!user->server->IsULine()))
 	{
 		if (IS_LOCAL(user) && IS_LOCAL(target))
 			ServerInstance->SNO->WriteGlobalSno('k', "Local kill by %s: %s (%s)", user->nick.c_str(), target->GetFullRealHost().c_str(), parameters[1].c_str());
@@ -98,19 +120,12 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User
 			ServerInstance->SNO->WriteToSnoMask('K', "Remote kill by %s: %s (%s)", user->nick.c_str(), target->GetFullRealHost().c_str(), parameters[1].c_str());
 	}
 
-	if (IS_LOCAL(user) || IS_LOCAL(target))
-		ServerInstance->Logs->Log("KILL", LOG_DEFAULT, "%s KILL: %s :%s!%s!%s (%s)",
-				IS_LOCAL(user) && IS_LOCAL(target) ? "LOCAL" : "REMOTE",
-				target->nick.c_str(),
-				ServerInstance->Config->ServerName.c_str(), user->GetDisplayedHost().c_str(), user->nick.c_str(),
-				parameters[1].c_str());
-
 	if (IS_LOCAL(target))
 	{
-		target->Write(":%s KILL %s :%s",
-				ServerInstance->Config->HideKillsServer.empty() ? user->GetFullHost().c_str() : ServerInstance->Config->HideKillsServer.c_str(),
-				target->nick.c_str(),
-				parameters[1].c_str());
+		LocalUser* localu = IS_LOCAL(target);
+		KillMessage msg(protoev, user, localu, killreason, hidenick);
+		ClientProtocol::Event killevent(protoev, msg);
+		localu->Send(killevent);
 
 		this->lastuuid.clear();
 	}
@@ -125,7 +140,7 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User
 	return CMD_SUCCESS;
 }
 
-RouteDescriptor CommandKill::GetRouting(User* user, const std::vector<std::string>& parameters)
+RouteDescriptor CommandKill::GetRouting(User* user, const Params& parameters)
 {
 	// FindNick() doesn't work here because we quit the target user in Handle() which
 	// removes it from the nicklist, so we check lastuuid: if it's empty then this KILL
@@ -136,7 +151,7 @@ RouteDescriptor CommandKill::GetRouting(User* user, const std::vector<std::strin
 }
 
 
-void CommandKill::EncodeParameter(std::string& param, int index)
+void CommandKill::EncodeParameter(std::string& param, unsigned int index)
 {
 	// Manually translate the nick -> uuid (see above), and also the reason (params[1])
 	// because we decorate it if the oper is local and want remote servers to see the