Merge commit 'refs/merge-requests/5' of git://gitorious.org/inspircd/inspircd into...

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

diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 6f0a20f9ab20458aa17d89064da7f0f5f7479724..463d5178d37ac2c1211c4e3e820841f84d4bb67a 100644 (file)
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.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
@@ -20,9 +20,9 @@
 class CommandSaquit : public Command
 {
  public:
-       CommandSaquit (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator, "SAQUIT", "o", 2, 2, false, 0)
+       CommandSaquit(Module* Creator) : Command(Creator, "SAQUIT", 2, 2)
        {
-               syntax = "<nick> <reason>";
+               flags_needed = 'o'; Penalty = 0; syntax = "<nick> <reason>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
@@ -44,14 +44,21 @@ class CommandSaquit : public Command
                        ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+parameters[1]);
 
                        ServerInstance->Users->QuitUser(dest, parameters[1]);
-                       return CMD_LOCALONLY;
+                       return CMD_SUCCESS;
                }
                else
                {
                        user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[0].c_str());
+                       return CMD_FAILURE;
                }
+       }
 
-               return CMD_FAILURE;
+       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;
        }
 };
 
@@ -59,8 +66,8 @@ class ModuleSaquit : public Module
 {
        CommandSaquit cmd;
  public:
-       ModuleSaquit(InspIRCd* Me)
-               : Module(Me), cmd(Me, this)
+       ModuleSaquit()
+               : cmd(this)
        {
                ServerInstance->AddCommand(&cmd);
        }
@@ -71,7 +78,7 @@ class ModuleSaquit : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for an SAQUIT command, exits user with a reason", VF_OPTCOMMON | VF_VENDOR);
        }
 
 };