X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globalload.cpp;h=f65e01d883f44bf5c4392b761f42d928c73b371d;hb=df4f0dc888a2a24e7f8b42a1c21670679e633506;hp=ca945b496c8d90404f61e2c65f41fbad05c73b9b;hpb=9c3a20c15123c4812c236f33418c1fdfe74c3ff2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index ca945b496..f65e01d88 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -13,11 +13,10 @@
 
 /* $ModDesc: Allows global loading of a module. */
 
-#include <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /** Handle /GLOADMODULE
  */
@@ -43,7 +42,10 @@ class cmd_gloadmodule : public command_t
 		else
 		{
 			user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
-			/* XXX - returning CMD_FAILURE here could potentially mean half the net loads it, half doesn't. pass it on anyway? -- w00t */
+			/* XXX - returning CMD_FAILURE here could potentially mean half the net loads it, half doesn't. pass it on anyway? -- w00t
+			 *
+			 * Returning CMD_SUCCESS would have the same effect, just with less servers. Someone should update this module to properly
+			 * pass the success/failure for each server to the caller (or to all opers) -Special */
 			return CMD_FAILURE;
 		}
 	}
@@ -66,15 +68,13 @@ class cmd_gunloadmodule : public command_t
 		{
 			ServerInstance->WriteOpers("*** MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0],user->nick);
 			user->WriteServ("973 %s %s :Module successfully unloaded.",user->nick, parameters[0]);
-			/* route it! */
-			return CMD_SUCCESS;
 		}
 		else
 		{
-			/* XXX - see above note about returning CMD_FAILURE here -- w00t */
+			/* Return CMD_SUCCESS so the module will be unloaded on any servers it is loaded on - this is a seperate case entirely from loading -Special */
 			user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
-			return CMD_FAILURE;
 		}
+		return CMD_SUCCESS;
 	}
 };
 
@@ -117,7 +117,7 @@ class ModuleGlobalLoad : public Module
 	cmd_greloadmodule *mycommand3;
 	
  public:
-	ModuleGlobalLoad(InspIRCd* Me) : Module::Module(Me)
+	ModuleGlobalLoad(InspIRCd* Me) : Module(Me)
 	{
 		
 		mycommand = new cmd_gloadmodule(ServerInstance);
@@ -134,31 +134,8 @@ class ModuleGlobalLoad : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
-	}
-};
-
-
-class ModuleGlobalLoadFactory : public ModuleFactory
-{
- public:
-	ModuleGlobalLoadFactory()
-	{
-	}
-	
-	~ModuleGlobalLoadFactory()
-	{
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleGlobalLoad(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleGlobalLoadFactory;
-}
+MODULE_INIT(ModuleGlobalLoad)