X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_kill.cpp;h=ae327166d73416da6579f73aa26540308fad2807;hb=ddb970dd670bcd905c8f34458f8fcf70e9fd89bd;hp=91dbca8bd19a00945b17b7571d8301335c561f60;hpb=1b7c615062a7b203c7fc3ce4c56e16eb671f7c15;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index 91dbca8bd..ae327166d 100644
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -2,48 +2,45 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
+#include "wildcard.h"
 #include "commands/cmd_kill.h"
 
-
-
 extern "C" command_t* init_command(InspIRCd* Instance)
 {
 	return new cmd_kill(Instance);
 }
 
-void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
+/** Handle /KILL
+ */
+CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 {
+	/* Allow comma seperated lists of users for /KILL (thanks w00t) */
+	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+		return CMD_SUCCESS;
+
 	userrec *u = ServerInstance->FindNick(parameters[0]);
 	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;
-		}
+			return CMD_FAILURE;
 
 		if (!IS_LOCAL(u))
 		{
@@ -53,20 +50,7 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 			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();
-			}
-
-			DELETE(u);
+			userrec::QuitUser(ServerInstance, u, parameters[1]);
 		}
 		else
 		{
@@ -75,12 +59,16 @@ void 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);
 		}
 	}
 	else
 	{
 		user->WriteServ( "401 %s %s :No such nick/channel", user->nick, parameters[0]);
+		return CMD_FAILURE;
 	}
+
+	return CMD_SUCCESS;
 }