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

[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 a44131129232f54a195cb5c2ba5d751715b2a905..d6ba847e48d282b9c8e9c0df4e90262be352d9b2 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.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 CommandSapart : public Command
 {
  public:
-       CommandSapart (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"SAPART", "o", 2, 3, false, 0)
+       CommandSapart(Module* Creator) : Command(Creator,"SAPART", 2, 3)
        {
-               syntax = "<nick> <channel> [reason]";
+               flags_needed = 'o'; Penalty = 0; syntax = "<nick> <channel> [reason]";
                TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
        }
 
@@ -49,8 +49,7 @@ class CommandSapart : public Command
                         */
                        if (IS_LOCAL(dest))
                        {
-                               if (!channel->PartUser(dest, reason))
-                                       delete channel;
+                               channel->PartUser(dest, reason);
 
                                Channel* n = ServerInstance->FindChan(parameters[1]);
                                if (!n)
@@ -82,6 +81,14 @@ class CommandSapart : public Command
 
                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;
+       }
 };
 
 
@@ -89,8 +96,8 @@ class ModuleSapart : public Module
 {
        CommandSapart cmd;
  public:
-       ModuleSapart(InspIRCd* Me)
-               : Module(Me), cmd(Me, this)
+       ModuleSapart()
+               : cmd(this)
        {
                ServerInstance->AddCommand(&cmd);
        }
@@ -101,7 +108,7 @@ class ModuleSapart : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for unreal-style SAPART command", VF_OPTCOMMON | VF_VENDOR);
        }
 
 };