* ---------------------------------------------------
*/
-#include <vector>
-#include "inspircd_config.h"
-#include "hash_map.h"
#include "configreader.h"
#include "users.h"
#include "modules.h"
-#include "commands.h"
-#include "helperfuncs.h"
#include "commands/cmd_kill.h"
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+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)
{
- userrec *u = Find(parameters[0]);
+ userrec *u = ServerInstance->FindNick(parameters[0]);
char killreason[MAXBUF];
int MOD_RESULT = 0;
- log(DEBUG,"kill: %s %s", parameters[0], parameters[1]);
+ ServerInstance->Log(DEBUG,"kill: %s %s", parameters[0], parameters[1]);
if (u)
{
- log(DEBUG, "into kill mechanism");
+ ServerInstance->Log(DEBUG, "into kill mechanism");
FOREACH_RESULT(I_OnKill, OnKill(user, u, parameters[1]));
if (MOD_RESULT)
{
- log(DEBUG, "A module prevented the kill with result %d", MOD_RESULT);
- return;
+ ServerInstance->Log(DEBUG, "A module prevented the kill with result %d", MOD_RESULT);
+ return CMD_FAILURE;
}
if (!IS_LOCAL(u))
{
// remote kill
- WriteOpers("*** Remote kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]);
+ 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));
if (iter != ServerInstance->clientlist.end())
{
- log(DEBUG,"deleting user hash value %d", iter->second);
+ ServerInstance->Log(DEBUG,"deleting user hash value %d", iter->second);
ServerInstance->clientlist.erase(iter);
}
if (u->registered == REG_ALL)
{
- purge_empty_chans(u);
+ u->PurgeEmptyChannels();
}
+ if (u == user)
+ {
+ 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);
}
else
{
// local kill
- log(DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick, ServerInstance->Config->ServerName, user->dhost, user->nick, 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]);
- WriteOpers("*** Local Kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, 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(u, killreason);
+ 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;
}
+