X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_oper%2Fcmd_kill.cpp;h=13d6be55803da4bfb91ee7d52e5711c8e3585d00;hb=f3f2388a81b6463e1229fa5bf2b8c427440bf406;hp=5572e5789f7f79014df847ef6637686bf3cdb70f;hpb=58a0a7e01422e62de1565a8eb0a1febdc463d04d;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 5572e5789..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
@@ -27,20 +33,20 @@ CommandKill::CommandKill(Module* parent)
 	, 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)
+	KillMessage(ClientProtocol::EventProvider& protoev, User* user, LocalUser* target, const std::string& text, const std::string& hidenick)
 		: ClientProtocol::Message("KILL", NULL)
 	{
-		if (ServerInstance->Config->HideKillsServer.empty())
+		if (hidenick.empty())
 			SetSourceUser(user);
 		else
-			SetSource(ServerInstance->Config->HideKillsServer);
+			SetSource(hidenick);
 
 		PushParamRef(target->nick);
 		PushParamRef(text);
@@ -51,7 +57,7 @@ class KillMessage : public ClientProtocol::Message
  */
 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,
@@ -87,10 +93,10 @@ CmdResult CommandKill::Handle(User* user, const Params& parameters)
 			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
 		{
@@ -106,7 +112,7 @@ CmdResult CommandKill::Handle(User* user, const Params& parameters)
 		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());
@@ -117,7 +123,7 @@ CmdResult CommandKill::Handle(User* user, const Params& parameters)
 	if (IS_LOCAL(target))
 	{
 		LocalUser* localu = IS_LOCAL(target);
-		KillMessage msg(protoev, user, localu, killreason);
+		KillMessage msg(protoev, user, localu, killreason, hidenick);
 		ClientProtocol::Event killevent(protoev, msg);
 		localu->Send(killevent);