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

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

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index cdfe0801f2f2d3bf3109deab2d9438b6b3c8fd94..9908ad05399acba78b9671814577be695b6e357b 100644 (file)
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -2,27 +2,17 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 // Globops and +g support module by C.J.Edwards
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for GLOBOPS and user mode +g */
@@ -36,6 +26,7 @@ class cmd_globops : public command_t
        {
                this->source = "m_globops.so";
                syntax = "<any-text>";
+               TRANSLATE2(TR_TEXT, TR_END);
        }
 
        CmdResult Handle (const char** parameters, int pcnt, userrec *user)
@@ -47,6 +38,7 @@ class cmd_globops : public command_t
                }
                ServerInstance->SNO->WriteToSnoMask('g',line);
 
+               /* route it (ofc :p) */
                return CMD_SUCCESS;
        }
 };
@@ -56,7 +48,7 @@ class ModuleGlobops : public Module
        cmd_globops* mycommand;
  public:
        ModuleGlobops(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                mycommand = new cmd_globops(ServerInstance);
                ServerInstance->AddCommand(mycommand);
@@ -66,12 +58,11 @@ class ModuleGlobops : public Module
        virtual ~ModuleGlobops()
        {
                ServerInstance->SNO->DisableSnomask('g');
-               DELETE(mycommand);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
        void Implements(char* List)
@@ -79,27 +70,4 @@ class ModuleGlobops : public Module
        }
 };
 
-class ModuleGlobopsFactory : public ModuleFactory
-{
- public:
-       ModuleGlobopsFactory()
-       {
-       }
-       
-       ~ModuleGlobopsFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleGlobops(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleGlobopsFactory;
-}
-
+MODULE_INIT(ModuleGlobops)