X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globalload.cpp;h=2280572d749c5845b4bc216b32149fd7328c17f0;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=ca5bdda7e3ee1622de9694753ea59a0fb6da0fb6;hpb=fea1a27cb96a114f698eedcf90401b78406108fb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index ca5bdda7e..2280572d7 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -2,20 +2,15 @@
  *       | 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>
@@ -23,69 +18,109 @@ 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);
+			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]))
 		{
-			WriteOpers("*** MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0],user->nick);
+			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;
+	}
+};
+
 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()
@@ -94,7 +129,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);
 	}
 };
 
@@ -110,7 +145,7 @@ class ModuleGlobalLoadFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleGlobalLoad(Me);
 	}