Fix for bug #415, affects only trunk (wish i'd known this before i started!)

[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 2b2dfc565dbd0998557c31411d72dfc8aea285b0..7aafcc19376c0b266dea795334cf7642542ce953 100644 (file)
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -11,11 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for an SAQUIT command, exits user with a reason */
@@ -29,6 +24,7 @@ class cmd_saquit : public command_t
        {
                this->source = "m_saquit.so";
                syntax = "<nick> <reason>";
+               TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
        CmdResult Handle (const char** parameters, int pcnt, userrec *user)
@@ -41,12 +37,16 @@ class cmd_saquit : public command_t
                                user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
                                return CMD_FAILURE;
                        }
+                       
                        irc::stringjoiner reason_join(" ", parameters, 1, pcnt - 1);
                        std::string line = reason_join.GetJoined();
-
-                       ServerInstance->WriteOpers(std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+line);
+                       ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+line);
+                       
+                       // Pass the command on, so the client's server can quit it properly.
+                       if (!IS_LOCAL(dest))
+                               return CMD_SUCCESS;
+                       
                        userrec::QuitUser(ServerInstance, dest, line);
-
                        return CMD_SUCCESS;
                }
                else
@@ -63,7 +63,7 @@ class ModuleSaquit : public Module
        cmd_saquit*     mycommand;
  public:
        ModuleSaquit(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                mycommand = new cmd_saquit(ServerInstance);
@@ -76,34 +76,9 @@ class ModuleSaquit : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSaquitFactory : public ModuleFactory
-{
- public:
-       ModuleSaquitFactory()
-       {
-       }
-       
-       ~ModuleSaquitFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSaquit(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSaquitFactory;
-}
-
+MODULE_INIT(ModuleSaquit)