Add a Flash Policy Daemon module

[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 016a14b2ef70d4066210d90a92c578fd6da745f3..10022d1050dfbcc09bf84e7aaa34718e12520f00 100644 (file)
--- a/src/commands/cmd_kick.cpp
+++ b/src/commands/cmd_kick.cpp
@@ -38,6 +38,10 @@ class CommandKick : public 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)
+       {
+               return (IS_LOCAL(user) ? ROUTE_LOCALONLY : ROUTE_BROADCAST);
+       }
 };
 
 /** Handle /KICK
@@ -48,7 +52,7 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
        Channel* c = ServerInstance->FindChan(parameters[0]);
        User* u;
 
-       if (ServerInstance->Parser->LoopCall(user, this, parameters, 1))
+       if (CommandParser::LoopCall(user, this, parameters, 1))
                return CMD_SUCCESS;
 
        if (IS_LOCAL(user))
@@ -58,7 +62,7 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
 
        if (!u || !c)
        {
-               user->WriteServ( "401 %s %s :No such nick/channel", user->nick.c_str(), u ? parameters[0].c_str() : parameters[1].c_str());
+               user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", u ? parameters[0].c_str() : parameters[1].c_str());
                return CMD_FAILURE;
        }
 
@@ -68,13 +72,13 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
                srcmemb = c->GetUser(user);
                if (!srcmemb)
                {
-                       user->WriteServ( "442 %s %s :You're not on that channel!", user->nick.c_str(), parameters[0].c_str());
+                       user->WriteNumeric(ERR_NOTONCHANNEL, "%s :You're not on that channel!", parameters[0].c_str());
                        return CMD_FAILURE;
                }
 
                if (ServerInstance->ULine(u->server))
                {
-                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You may not kick a u-lined client", user->nick.c_str(), c->name.c_str());
+                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You may not kick a u-lined client", c->name.c_str());
                        return CMD_FAILURE;
                }
        }