* | 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)
*/
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];
+ char killoperreason[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 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]);
+ }
+ 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]);
+
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]);
- snprintf(killreason, MAXQUIT,"[%s] Killed (%s (%s))", ServerInstance->Config->ServerName, user->nick, parameters[1]);
- 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();
- }
+ /*
+ * 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!
+ */
- if (u == user)
- {
- FOREACH_MOD(I_OnPostCommand,OnPostCommand("KILL", parameters, pcnt, user, CMD_SUCCESS));
- return CMD_USER_DELETED;
- }
- DELETE(u);
+ userrec::QuitUser(ServerInstance, u, killreason);
}
else
{
// local kill
+ 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)", 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);
}
+
+ // send the quit out
+ userrec::QuitUser(ServerInstance, u, killreason, killoperreason);
}
else
{