Fix routing for normal core commands like QUIT

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

diff --git a/src/commands/cmd_kick.cpp b/src/commands/cmd_kick.cpp
index 0a6e34cb29d91f9abf0dccd0777c65f639d1344c..d160b030b2eb99f52b126a207cbbf5a14af04611 100644 (file)
--- a/src/commands/cmd_kick.cpp
+++ b/src/commands/cmd_kick.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,45 +12,65 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_kick.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** Handle /KICK. 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 CommandKick : public Command
 {
-       return new CommandKick(Instance);
-}
+ public:
+       /** Constructor for kick.
+        */
+       CommandKick ( Module* parent) : Command(parent,"KICK",2,3) { syntax = "<channel> <nick>{,<nick>} [<reason>]"; }
+       /** 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);
+};
+
 
 /** Handle /KICK
  */
-CmdResult CommandKick::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       char reason[MAXKICK];
+       std::string reason;
        Channel* c = ServerInstance->FindChan(parameters[0]);
        User* u = ServerInstance->FindNick(parameters[1]);
 
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, 1))
+               return CMD_SUCCESS;
+
        if (!u || !c)
        {
-               user->WriteServ( "401 %s %s :No such nick/channel", user->nick, u ? parameters[0] : parameters[1]);
+               user->WriteServ( "401 %s %s :No such nick/channel", user->nick.c_str(), u ? parameters[0].c_str() : parameters[1].c_str());
                return CMD_FAILURE;
        }
 
        if ((IS_LOCAL(user)) && (!c->HasUser(user)) && (!ServerInstance->ULine(user->server)))
        {
-               user->WriteServ( "442 %s %s :You're not on that channel!", user->nick, parameters[0]);
+               user->WriteServ( "442 %s %s :You're not on that channel!", user->nick.c_str(), parameters[0].c_str());
                return CMD_FAILURE;
        }
 
-       if (pcnt > 2)
+       if (parameters.size() > 2)
        {
-               strlcpy(reason, parameters[2], MAXKICK - 1);
+               reason.assign(parameters[2], 0, ServerInstance->Config->Limits.MaxKick);
        }
        else
        {
-               strlcpy(reason, user->nick, MAXKICK - 1);
+               reason.assign(user->nick, 0, ServerInstance->Config->Limits.MaxKick);
        }
 
-       if (!c->KickUser(user, u, reason))
+       if (!c->KickUser(user, u, reason.c_str()))
                /* Nobody left here, delete the Channel */
                delete c;
 
        return CMD_SUCCESS;
 }
+
+COMMAND_INIT(CommandKick)