X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globalload.cpp;h=348984e14ee185b2c9f717f7c03a946aea5c4ff8;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=4992b47afa8f0eec2c26eb820781e2f4eca221e0;hpb=7c0c957577a195b4819e4d7f2c9672d7c7522b0d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 4992b47af..348984e14 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -2,128 +2,163 @@
  *       | 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-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/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 "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /** Handle /GLOADMODULE
  */
-class cmd_gloadmodule : public command_t
+class CommandGloadmodule : public Command
 {
  public:
-	cmd_gloadmodule (InspIRCd* Instance) : command_t(Instance,"GLOADMODULE", 'o', 1)
+	CommandGloadmodule(Module* Creator) : Command(Creator,"GLOADMODULE", 1)
 	{
-		this->source = "m_globalload.so";
-		syntax = "<modulename>";
+		flags_needed = 'o'; syntax = "<modulename> [servermask]";
+		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		if (ServerInstance->LoadModule(parameters[0]))
+		std::string servername = parameters.size() > 1 ? parameters[1] : "*";
+
+		if (InspIRCd::Match(ServerInstance->Config->ServerName, servername))
 		{
-			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;
+			if (ServerInstance->Modules->Load(parameters[0].c_str()))
+			{
+				ServerInstance->SNO->WriteToSnoMask('a', "NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
+				user->WriteNumeric(975, "%s %s :Module successfully loaded.",user->nick.c_str(), parameters[0].c_str());
+			}
+			else
+			{
+				user->WriteNumeric(974, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
+			}
 		}
 		else
-		{
-			user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
-			return CMD_FAILURE;
-		}
+			ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBAL LOAD BY '%s' (not loaded here)",parameters[0].c_str(), user->nick.c_str());
+
+		return CMD_SUCCESS;
+	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
 	}
 };
 
 /** Handle /GUNLOADMODULE
  */
-class cmd_gunloadmodule : public command_t
+class CommandGunloadmodule : public Command
 {
  public:
-	cmd_gunloadmodule (InspIRCd* Instance) : command_t(Instance,"GUNLOADMODULE", 'o', 1)
+	CommandGunloadmodule(Module* Creator) : Command(Creator,"GUNLOADMODULE", 1)
 	{
-		this->source = "m_globalload.so";
-		syntax = "<modulename>";
+		flags_needed = 'o'; syntax = "<modulename> [servermask]";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		if (ServerInstance->UnloadModule(parameters[0]))
+		std::string servername = parameters.size() > 1 ? parameters[1] : "*";
+
+		if (InspIRCd::Match(ServerInstance->Config->ServerName, servername))
 		{
-			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;
+			if (ServerInstance->Modules->Unload(parameters[0].c_str()))
+			{
+				ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
+				user->WriteNumeric(973, "%s %s :Module successfully unloaded.",user->nick.c_str(), parameters[0].c_str());
+			}
+			else
+			{
+				user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
+			}
 		}
 		else
-		{
-			user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
-			return CMD_FAILURE;
-		}
+			ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)",parameters[0].c_str(), user->nick.c_str());
+
+		return CMD_SUCCESS;
+	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
 	}
 };
 
-class ModuleGlobalLoad : public Module
+/** Handle /GRELOADMODULE
+ */
+class CommandGreloadmodule : public Command
 {
-	cmd_gloadmodule *mycommand;
-	cmd_gunloadmodule *mycommand2;
-	
  public:
-	ModuleGlobalLoad(InspIRCd* Me) : Module::Module(Me)
+	CommandGreloadmodule(Module* Creator) : Command(Creator, "GRELOADMODULE", 1)
 	{
-		
-		mycommand = new cmd_gloadmodule(ServerInstance);
-		mycommand2 = new cmd_gunloadmodule(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-		ServerInstance->AddCommand(mycommand2);
+		flags_needed = 'o'; syntax = "<modulename> [servermask]";
 	}
-	
-	virtual ~ModuleGlobalLoad()
+
+	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
 	{
+		std::string servername = parameters.size() > 1 ? parameters[1] : "*";
+
+		if (InspIRCd::Match(ServerInstance->Config->ServerName, servername))
+		{
+			bool ok = true;
+			if (!ServerInstance->Modules->Unload(parameters[0].c_str()))
+			{
+				ok = false;
+				user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
+			}
+			if (!ServerInstance->Modules->Load(parameters[0].c_str()))
+			{
+				ok = false;
+				user->WriteNumeric(974, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
+			}
+			ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY RELOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
+			if (ok)
+				user->WriteNumeric(975, "%s %s :Module successfully loaded.",user->nick.c_str(), parameters[0].c_str());
+		}
+		else
+			ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBAL RELOAD BY '%s' (not reloaded here)",parameters[0].c_str(), user->nick.c_str());
+
+		return CMD_SUCCESS;
 	}
-	
-	virtual Version GetVersion()
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return ROUTE_BROADCAST;
 	}
 };
 
-
-class ModuleGlobalLoadFactory : public ModuleFactory
+class ModuleGlobalLoad : public Module
 {
+	CommandGloadmodule cmd1;
+	CommandGunloadmodule cmd2;
+	CommandGreloadmodule cmd3;
+
  public:
-	ModuleGlobalLoadFactory()
+	ModuleGlobalLoad()
+		: cmd1(this), cmd2(this), cmd3(this)
 	{
+		ServerInstance->AddCommand(&cmd1);
+		ServerInstance->AddCommand(&cmd2);
+		ServerInstance->AddCommand(&cmd3);
 	}
-	
-	~ModuleGlobalLoadFactory()
+
+	virtual ~ModuleGlobalLoad()
 	{
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+
+	virtual Version GetVersion()
 	{
-		return new ModuleGlobalLoad(Me);
+		return Version("Allows global loading of a module.", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
 };
 
+MODULE_INIT(ModuleGlobalLoad)
 
-extern "C" void * init_module( void )
-{
-	return new ModuleGlobalLoadFactory;
-}