Annotations

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

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index e56dfa79cf6968f5ee5dbc7bd50e8a7177288030..e65f90b64246b0c87d0dbada175dc8c9889e21fe 100644 (file)
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -23,29 +23,29 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "inspircd.h"
-#include "helperfuncs.h"
 
-extern InspIRCd *ServerInstance;
-        
+
 class cmd_gloadmodule : public command_t
 {
  public:
-       cmd_gloadmodule () : command_t("GLOADMODULE", 'o', 1)
+       cmd_gloadmodule (InspIRCd* Instance) : command_t(Instance,"GLOADMODULE", 'o', 1)
        {
                this->source = "m_globalload.so";
                syntax = "<modulename>";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                if (ServerInstance->LoadModule(parameters[0]))
                {
-                       WriteOpers("*** NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0],user->nick);
-                       WriteServ(user->fd,"975 %s %s :Module successfully loaded.",user->nick, parameters[0]);
+                       ServerInstance->WriteOpers("*** NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0],user->nick);
+                       user->WriteServ("975 %s %s :Module successfully loaded.",user->nick, parameters[0]);
+                       return CMD_SUCCESS;
                }
                else
                {
-                       WriteServ(user->fd,"974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                       user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                       return CMD_FAILURE;
                }
        }
 };
@@ -53,22 +53,24 @@ class cmd_gloadmodule : public command_t
 class cmd_gunloadmodule : public command_t
 {
  public:
-       cmd_gunloadmodule () : command_t("GUNLOADMODULE", 'o', 1)
+       cmd_gunloadmodule (InspIRCd* Instance) : command_t(Instance,"GUNLOADMODULE", 'o', 1)
        {
                this->source = "m_globalload.so";
                syntax = "<modulename>";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                if (ServerInstance->UnloadModule(parameters[0]))
                {
-                       WriteOpers("*** MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0],user->nick);
-                       WriteServ(user->fd,"973 %s %s :Module successfully unloaded.",user->nick, parameters[0]);
+                       ServerInstance->WriteOpers("*** MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0],user->nick);
+                       user->WriteServ("973 %s %s :Module successfully unloaded.",user->nick, parameters[0]);
+                       return CMD_SUCCESS;
                }
                else
                {
-                       WriteServ(user->fd,"972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                       user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                       return CMD_FAILURE;
                }
        }
 };
@@ -77,15 +79,15 @@ class ModuleGlobalLoad : public Module
 {
        cmd_gloadmodule *mycommand;
        cmd_gunloadmodule *mycommand2;
-       Server *Srv;
+       
  public:
-       ModuleGlobalLoad(Server* Me) : Module::Module(Me)
+       ModuleGlobalLoad(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_gloadmodule();
-               mycommand2 = new cmd_gunloadmodule();
-               Srv->AddCommand(mycommand);
-               Srv->AddCommand(mycommand2);
+               
+               mycommand = new cmd_gloadmodule(ServerInstance);
+               mycommand2 = new cmd_gunloadmodule(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(mycommand2);
        }
        
        virtual ~ModuleGlobalLoad()
@@ -110,7 +112,7 @@ class ModuleGlobalLoadFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleGlobalLoad(Me);
        }