Socket engine tweaks to fix a glitch, and improvements to new m_ident

[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 3d48eb92a1587cae80312d8dc93fc4a4a6e13090..b95f455dc7759033036dc6a6e69e41e9ab50a9d1 100644 (file)
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -13,27 +13,23 @@
 
 // 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 */
 
 /** Handle /GLOBOPS
  */
-class cmd_globops : public command_t
+class cmd_globops : public Command
 {
  public:
-       cmd_globops (InspIRCd* Instance) : command_t(Instance,"GLOBOPS",'o',1)
+       cmd_globops (InspIRCd* Instance) : Command(Instance,"GLOBOPS",'o',1)
        {
                this->source = "m_globops.so";
                syntax = "<any-text>";
+               TRANSLATE2(TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
                std::string line = "From " + std::string(user->nick) + ": ";
                for (int i = 0; i < pcnt; i++)
@@ -42,6 +38,7 @@ class cmd_globops : public command_t
                }
                ServerInstance->SNO->WriteToSnoMask('g',line);
 
+               /* route it (ofc :p) */
                return CMD_SUCCESS;
        }
 };
@@ -51,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);
@@ -61,7 +58,6 @@ class ModuleGlobops : public Module
        virtual ~ModuleGlobops()
        {
                ServerInstance->SNO->DisableSnomask('g');
-               DELETE(mycommand);
        }
        
        virtual Version GetVersion()
@@ -74,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)