Fix potential for duplicate SID if the SID is auto generated.

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

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index a5630751b35a1b76fa6a81b2a38cb612584e6b33..b49efd35efbe2d2688a4033d014e2edd1150d3c0 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -13,10 +13,6 @@
 
 /* $ModDesc: Provides more advanced UnrealIRCd SAMODE command */
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /** Handle /SAMODE
@@ -48,10 +44,10 @@ class cmd_samode : public command_t
                        std::deque<std::string> n;
                        irc::spacesepstream spaced(ServerInstance->Modes->GetLastParse());
                        std::string one = "*";
-                       while ((one = spaced.GetToken()) != "")
+                       while (spaced.GetToken(one))
                                n.push_back(one);
 
-                       Event rmode((char *)&n, NULL, "send_mode_explicit");
+                       Event rmode((char *)&n, NULL, "send_mode");
                        rmode.Send(ServerInstance);
 
                        n.clear();
@@ -61,9 +57,9 @@ class cmd_samode : public command_t
 
                        /* XXX: Yes, this is right. We dont want to propogate the
                         * actual SAMODE command, just the MODE command generated
-                        * by the send_mode_explicit
+                        * by the send_mode
                         */
-                       return CMD_FAILURE;
+                       return CMD_LOCALONLY;
                }
                else
                {
@@ -79,7 +75,7 @@ class ModuleSaMode : public Module
        cmd_samode*     mycommand;
  public:
        ModuleSaMode(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                mycommand = new cmd_samode(ServerInstance);
@@ -92,31 +88,8 @@ class ModuleSaMode : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,2,2,VF_VENDOR,API_VERSION);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };
 
-
-class ModuleSaModeFactory : public ModuleFactory
-{
- public:
-       ModuleSaModeFactory()
-       {
-       }
-       
-       ~ModuleSaModeFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSaMode(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSaModeFactory;
-}
+MODULE_INIT(ModuleSaMode)