This is better now.

[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 ef3c1cb5dd55ec3f6d3a61f9f3a3eae45ffd69af..d3dcf13dd95fdb4cfe6e2399196c93cd5dae731e 100644 (file)
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -23,53 +23,90 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "inspircd.h"
-#include "helperfuncs.h"
 
-extern InspIRCd *ServerInstance;
-        
+/** Handle /GLOADMODULE
+ */
 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]))
                {
                        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
                {
                        user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                       return CMD_FAILURE;
                }
        }
 };
 
+/** Handle /GUNLOADMODULE
+ */
 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]))
                {
                        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
                {
                        user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                       return CMD_FAILURE;
+               }
+       }
+};
+
+/** Handle /GRELOADMODULE
+ */
+class cmd_greloadmodule : public command_t
+{
+ public:
+       cmd_greloadmodule (InspIRCd* Instance) : command_t(Instance, "GRELOADMODULE", 'o', 1)
+       {
+               this->source = "m_globalload.so";
+               syntax = "<modulename>";
+       }
+
+       CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+       {
+               if (!ServerInstance->UnloadModule(parameters[0]))
+               {
+                       user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                       return CMD_FAILURE;
+               }
+
+               if (!ServerInstance->LoadModule(parameters[0]))
+               {
+                       user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
+                       return CMD_FAILURE;
                }
+
+               ServerInstance->WriteOpers("*** MODULE '%s' GLOBALLY RELOADED BY '%s'",parameters[0],user->nick);
+               user->WriteServ("975 %s %s :Module successfully loaded.",user->nick, parameters[0]);
+               
+               return CMD_SUCCESS;
        }
 };
 
@@ -77,15 +114,18 @@ class ModuleGlobalLoad : public Module
 {
        cmd_gloadmodule *mycommand;
        cmd_gunloadmodule *mycommand2;
-       Server *Srv;
+       cmd_greloadmodule *mycommand3;
+       
  public:
        ModuleGlobalLoad(InspIRCd* Me) : Module::Module(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);
+               mycommand3 = new cmd_greloadmodule(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(mycommand2);
+               ServerInstance->AddCommand(mycommand3);
        }
        
        virtual ~ModuleGlobalLoad()
@@ -94,7 +134,7 @@ class ModuleGlobalLoad : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
        }
 };