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 92800e701be72989aa6f3d9eb2a41a7d102c1c03..b49efd35efbe2d2688a4033d014e2edd1150d3c0 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -14,9 +14,6 @@
 /* $ModDesc: Provides more advanced UnrealIRCd SAMODE command */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /** Handle /SAMODE
  */
@@ -47,7 +44,7 @@ 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");
@@ -91,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" DllExport void * init_module( void )
-{
-       return new ModuleSaModeFactory;
-}
+MODULE_INIT(ModuleSaMode)