cmd_names Allow opers having the channels/auspex priv to view the NAMES list of ...

[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 9008b02e6445b260271559c2f7768114a6dc022c..17c8a76a053479968f229916dd216ce69c9ab138 100644 (file)
--- a/src/commands/cmd_kill.cpp
+++ b/src/commands/cmd_kill.cpp
@@ -61,10 +61,7 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User
                return CMD_SUCCESS;
 
        User *u = ServerInstance->FindNick(parameters[0]);
-       char killreason[MAXBUF];
-       ModResult MOD_RESULT;
-
-       if (u)
+       if ((u) && (!IS_SERVER(u)))
        {
                /*
                 * Here, we need to decide how to munge kill messages. Whether to hide killer, what to show opers, etc.
@@ -73,32 +70,38 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User
                 * This conditional is so that we only append the "Killed (" prefix ONCE. If killer is remote, then the kill
                 * just gets processed and passed on, otherwise, if they are local, it gets prefixed. Makes sense :-) -- w00t
                 */
+
+               std::string killreason;
                if (IS_LOCAL(user))
                {
                        /*
                         * Moved this event inside the IS_LOCAL check also, we don't want half the network killing a user
                         * and the other half not. This would be a bad thing. ;p -- w00t
                         */
+                       ModResult MOD_RESULT;
                        FIRST_MOD_RESULT(OnKill, MOD_RESULT, (user, u, parameters[1]));
 
                        if (MOD_RESULT == MOD_RES_DENY)
                                return CMD_FAILURE;
 
+                       killreason = "Killed (";
                        if (!ServerInstance->Config->HideKillsServer.empty())
                        {
                                // hidekills is on, use it
-                               snprintf(killreason, ServerInstance->Config->Limits.MaxQuit, "Killed (%s (%s))", ServerInstance->Config->HideKillsServer.c_str(), parameters[1].c_str());
+                               killreason += ServerInstance->Config->HideKillsServer;
                        }
                        else
                        {
                                // hidekills is off, do nothing
-                               snprintf(killreason, ServerInstance->Config->Limits.MaxQuit, "Killed (%s (%s))", user->nick.c_str(), parameters[1].c_str());
+                               killreason += user->nick;
                        }
+
+                       killreason += " (" + parameters[1] + "))";
                }
                else
                {
                        /* Leave it alone, remote server has already formatted it */
-                       strlcpy(killreason, parameters[1].c_str(), ServerInstance->Config->Limits.MaxQuit);
+                       killreason.assign(parameters[1], 0, ServerInstance->Config->Limits.MaxQuit);
                }
 
                /*
@@ -108,7 +111,7 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User
                if (!IS_LOCAL(u))
                {
                        // remote kill
-                       ServerInstance->SNO->WriteToSnoMask('K', "Remote kill by %s: %s!%s@%s (%s)", user->nick.c_str(), u->nick.c_str(), u->ident.c_str(), u->host.c_str(), parameters[1].c_str());
+                       ServerInstance->SNO->WriteToSnoMask('K', "Remote kill by %s: %s (%s)", user->nick.c_str(), u->GetFullRealHost().c_str(), parameters[1].c_str());
                        FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason, killreason));
                }
                else
@@ -118,7 +121,10 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User
                         * XXX - this isn't entirely correct, servers A - B - C, oper on A, client on C. Oper kills client, A and B will get remote kill
                         * 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.c_str(), u->nick.c_str(), u->ident.c_str(), u->host.c_str(), parameters[1].c_str());
+                       if (IS_LOCAL(user))
+                               ServerInstance->SNO->WriteGlobalSno('k',"Local Kill by %s: %s (%s)", user->nick.c_str(), u->GetFullRealHost().c_str(), parameters[1].c_str());
+                       else
+                               ServerInstance->SNO->WriteToSnoMask('k',"Local Kill by %s: %s (%s)", user->nick.c_str(), u->GetFullRealHost().c_str(), parameters[1].c_str());
                        ServerInstance->Logs->Log("KILL",DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick.c_str(), ServerInstance->Config->ServerName.c_str(), user->dhost.c_str(), user->nick.c_str(), parameters[1].c_str());
                        /* 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