Remove use of SendSNONotice to send to remote servers, this is done automagically now

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

diff --git a/src/commands/cmd_kill.cpp b/src/commands/cmd_kill.cpp
index 9b4dbbf1a641f37d178d7e4527e59b09773984c3..6932c8ed6debb3eb65558c10ef2a14e467c1d4a8 100644 (file)
--- a/src/commands/cmd_kill.cpp
+++ b/src/commands/cmd_kill.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /KILL
  */
-CmdResult CommandKill::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandKill::Handle (const char* const* parameters, int pcnt, User *user)
 {
        /* Allow comma seperated lists of users for /KILL (thanks w00t) */
        if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
@@ -86,11 +86,11 @@ CmdResult CommandKill::Handle (const char** parameters, int pcnt, User *user)
                         * snotices, C will get a local kill snotice. this isn't accurate, and needs fixing at some stage. -- w00t
                         */
                        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]);
+                       ServerInstance->Logs->Log("KILL",DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick, ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]);
                        /* Bug #419, make sure this message can only occur once even in the case of multiple KILL messages crossing the network, and change to show
                         * hidekillsserver as source if possible
                         */
-                       if (!u->muted)
+                       if (!u->quitting)
                        {
                                u->Write(":%s KILL %s :%s!%s!%s (%s)", *ServerInstance->Config->HideKillsServer ? ServerInstance->Config->HideKillsServer : user->GetFullHost(),
                                                u->nick,
@@ -98,12 +98,11 @@ CmdResult CommandKill::Handle (const char** parameters, int pcnt, User *user)
                                                user->dhost,
                                                *ServerInstance->Config->HideKillsServer ? ServerInstance->Config->HideKillsServer : user->nick,
                                                parameters[1]);
-                               u->muted = true;
                        }
                }
 
                // send the quit out
-               User::QuitUser(ServerInstance, u, killreason);
+               ServerInstance->Users->QuitUser(u, killreason);
        }
        else
        {