Merge pull request #16 from Adam-/insp20

[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 2f1a4783e4c6e02a0b71f6f447bc1c567e17db02..3490199c8b800ffb60d1797c84aab334fcd196dc 100644 (file)
--- a/src/commands/cmd_kill.cpp
+++ b/src/commands/cmd_kill.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,12 +12,37 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_kill.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** Handle /KILL. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandKill : public Command
 {
-       return new CommandKill(Instance);
-}
+ public:
+       /** Constructor for kill.
+        */
+       CommandKill ( Module* parent) : Command(parent,"KILL",2,2) {
+               flags_needed = 'o';
+               syntax = "<nickname> <reason>";
+               TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
+       }
+       /** Handle command.
+        * @param parameters The parameters to the comamnd
+        * @param pcnt The number of parameters passed to teh command
+        * @param user The user issuing the command
+        * @return A value from CmdResult to indicate command success or failure.
+        */
+       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               // local kills of remote users are routed via the OnRemoteKill hook
+               if (IS_LOCAL(user))
+                       return ROUTE_LOCALONLY;
+               return ROUTE_BROADCAST;
+       }
+};
 
 /** Handle /KILL
  */
@@ -46,15 +71,15 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, 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
                         */
-                       FIRST_MOD_RESULT(ServerInstance, OnKill, MOD_RESULT, (user, u, parameters[1]));
+                       FIRST_MOD_RESULT(OnKill, MOD_RESULT, (user, u, parameters[1]));
 
                        if (MOD_RESULT == MOD_RES_DENY)
                                return CMD_FAILURE;
 
-                       if (*ServerInstance->Config->HideKillsServer)
+                       if (!ServerInstance->Config->HideKillsServer.empty())
                        {
                                // hidekills is on, use it
-                               snprintf(killreason, ServerInstance->Config->Limits.MaxQuit, "Killed (%s (%s))", ServerInstance->Config->HideKillsServer, parameters[1].c_str());
+                               snprintf(killreason, ServerInstance->Config->Limits.MaxQuit, "Killed (%s (%s))", ServerInstance->Config->HideKillsServer.c_str(), parameters[1].c_str());
                        }
                        else
                        {
@@ -86,17 +111,17 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, 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.c_str(), u->nick.c_str(), u->ident.c_str(), u->host.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, user->dhost.c_str(), user->nick.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
                         */
                        if (!u->quitting)
                        {
-                               u->Write(":%s KILL %s :%s!%s!%s (%s)", *ServerInstance->Config->HideKillsServer ? ServerInstance->Config->HideKillsServer : user->GetFullHost().c_str(),
+                               u->Write(":%s KILL %s :%s!%s!%s (%s)", ServerInstance->Config->HideKillsServer.empty() ? user->GetFullHost().c_str() : ServerInstance->Config->HideKillsServer.c_str(),
                                                u->nick.c_str(),
-                                               ServerInstance->Config->ServerName,
+                                               ServerInstance->Config->ServerName.c_str(),
                                                user->dhost.c_str(),
-                                               *ServerInstance->Config->HideKillsServer ? ServerInstance->Config->HideKillsServer : user->nick.c_str(),
+                                               ServerInstance->Config->HideKillsServer.empty() ? user->nick.c_str() : ServerInstance->Config->HideKillsServer.c_str(),
                                                parameters[1].c_str());
                        }
                }
@@ -113,3 +138,5 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User
        return CMD_SUCCESS;
 }
 
+
+COMMAND_INIT(CommandKill)