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

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

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index f82004f162f09fb022e1dc62825ca6aab9aa9dbf..b25ed7089dd79331aa95b99a014d66b9d690a027 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: /helpop Command, Works like Unreal helpop */
@@ -92,10 +89,8 @@ class cmd_helpop : public command_t
                        irc::sepstream stream(value, '\n');
                        std::string token = "*";
 
-                       while ((token = stream.GetToken()) != "")
-                       {
+                       while (stream.GetToken(token))
                                user->WriteServ("NOTICE %s :%s", user->nick, token.c_str());
-                       }
 
                        user->WriteServ("NOTICE %s :*** End of HELPOP", user->nick);
                }
@@ -116,7 +111,7 @@ class ModuleHelpop : public Module
 
        public:
                ModuleHelpop(InspIRCd* Me)
-                       : Module::Module(Me)
+                       : Module(Me)
                {
                        ReadConfig();
                        ho = new Helpop(ServerInstance);
@@ -188,25 +183,4 @@ class ModuleHelpop : public Module
                }
 };
 
-class ModuleHelpopFactory : public ModuleFactory
-{
- public:
-       ModuleHelpopFactory()
-       {
-       }
-       
-       ~ModuleHelpopFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleHelpop(Me);
-       }
-       
-};
-
-extern "C" void * init_module( void )
-{
-       return new ModuleHelpopFactory;
-}
+MODULE_INIT(ModuleHelpop)