X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globalload.cpp;h=e8ea11378477d2b3d1138fd541b9817ca387a941;hb=02c6ce1ad09a7471a6b03dc00bac4b843d157489;hp=c552cb346b2cbef7b3de17704413ed4fc915f3c7;hpb=d0b4bb3811458aa335857514e4cbb95d5c84f433;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index c552cb346..e8ea11378 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -2,64 +2,67 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 /* $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"
-#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]);
+
+			/* route it! */
+			return CMD_SUCCESS;
 		}
 		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
+			 *
+			 * 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;
 		}
 	}
 };
 
+/** 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]))
 		{
@@ -67,9 +70,43 @@ class cmd_gunloadmodule : public command_t
 			user->WriteServ("973 %s %s :Module successfully unloaded.",user->nick, parameters[0]);
 		}
 		else
+		{
+			/* 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_SUCCESS;
+	}
+};
+
+/** 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;
+	cmd_greloadmodule *mycommand3;
 	
  public:
-	ModuleGlobalLoad(InspIRCd* Me) : Module::Module(Me)
+	ModuleGlobalLoad(InspIRCd* Me) : Module(Me)
 	{
 		
-		mycommand = new cmd_gloadmodule();
-		mycommand2 = new cmd_gunloadmodule();
+		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);
 	}
 };
 
@@ -118,7 +158,7 @@ class ModuleGlobalLoadFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleGlobalLoadFactory;
 }