Annotations

[user/henk/code/inspircd.git] / src / cmd_kill.cpp

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index 2143451b31b9665859b4e90ea402600ab7c103d1..dfcf99590e0600b13729820de1919f7e6adc8362 100644 (file)
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -14,41 +14,41 @@
  * ---------------------------------------------------
  */
 
-#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"
 
 
 
-void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_kill(Instance);
+}
+
+CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 {
        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
-                       ServerInstance->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));
@@ -57,7 +57,7 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 
                        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);
                        }
 
@@ -66,14 +66,19 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
                                u->PurgeEmptyChannels();
                        }
 
+                       if (u == user)
+                       {
+                               FOREACH_MOD(I_OnPostCommand,OnPostCommand("KILL", parameters, pcnt, user, CMD_SUCCESS));
+                               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]);
-                       ServerInstance->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(ServerInstance, u, killreason);
                }
@@ -81,5 +86,9 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
        else
        {
                user->WriteServ( "401 %s %s :No such nick/channel", user->nick, parameters[0]);
+               return CMD_FAILURE;
        }
+
+       return CMD_SUCCESS;
 }
+