This works, not sure why. Someone find out why we cant use && !isock->HasResult(...

[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 95a1e1e3744a291a19ef493bf6e3cd8516a533a5..fe4279213bcabf1965008f6c4176d6542a1cdb49 100644 (file)
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -14,24 +14,22 @@
 // Globops and +g support module by C.J.Edwards
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for GLOBOPS and user mode +g */
 
 /** Handle /GLOBOPS
  */
-class cmd_globops : public command_t
+class CommandGlobops : public Command
 {
  public:
-       cmd_globops (InspIRCd* Instance) : command_t(Instance,"GLOBOPS",'o',1)
+       CommandGlobops (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++)
@@ -47,12 +45,12 @@ class cmd_globops : public command_t
 
 class ModuleGlobops : public Module
 {
-       cmd_globops* mycommand;
+       CommandGlobops* mycommand;
  public:
        ModuleGlobops(InspIRCd* Me)
                : Module(Me)
        {
-               mycommand = new cmd_globops(ServerInstance);
+               mycommand = new CommandGlobops(ServerInstance);
                ServerInstance->AddCommand(mycommand);
                ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
        }
@@ -60,7 +58,6 @@ class ModuleGlobops : public Module
        virtual ~ModuleGlobops()
        {
                ServerInstance->SNO->DisableSnomask('g');
-               DELETE(mycommand);
        }
        
        virtual Version GetVersion()
@@ -73,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" DllExport void * init_module( void )
-{
-       return new ModuleGlobopsFactory;
-}
-
+MODULE_INIT(ModuleGlobops)