Fix for parameters which contain a colon (which is not the first char in the string)

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

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index bf596ee2bb409047882514c8c89a7e20e393147f..fa294ad9ef25ce3fe07bb7aa7435074852c941df 100644 (file)
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -14,18 +14,11 @@
  * ---------------------------------------------------
  */
 
-#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)
 {
        userrec *u = ServerInstance->FindNick(parameters[0]);
@@ -48,7 +41,7 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
                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));
@@ -73,7 +66,7 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
                        // local kill
                        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);
                }
@@ -83,3 +76,4 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
                user->WriteServ( "401 %s %s :No such nick/channel", user->nick, parameters[0]);
        }
 }
+