* | 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);
}
+/** 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;
u->WriteCommonExcept("QUIT :%s", killreason);
FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason));
- user_hash::iterator iter = ServerInstance->clientlist.find(u->nick);
+ user_hash::iterator iter = ServerInstance->clientlist->find(u->nick);
- if (iter != ServerInstance->clientlist.end())
+ if (iter != ServerInstance->clientlist->end())
{
ServerInstance->Log(DEBUG,"deleting user hash value %d", iter->second);
- ServerInstance->clientlist.erase(iter);
+ ServerInstance->clientlist->erase(iter);
}
if (u->registered == REG_ALL)
if (u == user)
{
- FOREACH_MOD(I_OnPostCommand,OnPostCommand("KILL", parameters, pcnt, user, CMD_SUCCESS));
+ std::string original_command = std::string("KILL ") + u->nick + " :"+parameters[1];
+ FOREACH_MOD(I_OnPostCommand,OnPostCommand("KILL", parameters, pcnt, user, CMD_SUCCESS,original_command));
return CMD_USER_DELETED;
}
DELETE(u);
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);
+
+ if (u == user)
+ return CMD_USER_DELETED;
}
}
else