X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globalload.cpp;h=d3dcf13dd95fdb4cfe6e2399196c93cd5dae731e;hb=bcac49dca78631687975771c6d0a76b595171664;hp=229a77256e0238bd118859d5af2b6e81efe84d5a;hpb=0757a4a495daabf661ac3b7ab79f0a5ee423abe8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 229a77256..d3dcf13dd 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -23,51 +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]))
 		{
-			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;
 		}
 	}
 };
 
+/** 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]))
 		{
-			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;
+		}
+	}
+};
+
+/** 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;
 	}
 };
 
@@ -75,15 +114,18 @@ class ModuleGlobalLoad : public Module
 {
 	cmd_gloadmodule *mycommand;
 	cmd_gunloadmodule *mycommand2;
-	Server *Srv;
+	cmd_greloadmodule *mycommand3;
+	
  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);
+		mycommand3 = new cmd_greloadmodule(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
+		ServerInstance->AddCommand(mycommand2);
+		ServerInstance->AddCommand(mycommand3);
 	}
 	
 	virtual ~ModuleGlobalLoad()
@@ -92,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);
 	}
 };
 
@@ -108,7 +150,7 @@ class ModuleGlobalLoadFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleGlobalLoad(Me);
 	}