Rewrite the build system directive parser.

[user/henk/code/inspircd.git] / src / modules / m_sapart.cpp

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index fa5ab176a5ad5f1ee0b920fc9b5e37b7f68034c1..db1e6fdeea6304014e3bf91c7f8727e8fc7ccd20 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -28,12 +28,15 @@ class CommandSapart : public Command
  public:
        CommandSapart(Module* Creator) : Command(Creator,"SAPART", 2, 3)
        {
-               flags_needed = 'o'; Penalty = 0; syntax = "<nick> <channel> [reason]";
+               flags_needed = 'o'; Penalty = 0; syntax = "<nick> <channel>[,<channel>] [reason]";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT);
        }
 
        CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
+               if (CommandParser::LoopCall(user, this, parameters, 1))
+                       return CMD_FAILURE;
+
                User* dest = ServerInstance->FindNick(parameters[0]);
                Channel* channel = ServerInstance->FindChan(parameters[1]);
                std::string reason;
@@ -45,7 +48,7 @@ class CommandSapart : public Command
 
                        if (dest->server->IsULine())
                        {
-                               user->WriteNumeric(ERR_NOPRIVILEGES, ":Cannot use an SA command on a u-lined client");
+                               user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a u-lined client");
                                return CMD_FAILURE;
                        }
 
@@ -77,10 +80,7 @@ class CommandSapart : public Command
 
        RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
        {
-               User* dest = ServerInstance->FindNick(parameters[0]);
-               if (dest)
-                       return ROUTE_OPT_UCAST(dest->server);
-               return ROUTE_LOCALONLY;
+               return ROUTE_OPT_UCAST(parameters[0]);
        }
 };