X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globalload.cpp;h=c9a4231ddbb14298b8d45ec00c72ab7f48309b3a;hb=7aab0d12db670fea68a258d9ae2b05ea5c4615be;hp=229a79b97f4254dc86e2233e9d919e42dea158a2;hpb=069a2ef21425007d092342c8c11ec28da2f410d7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 229a79b97..c9a4231dd 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -22,7 +22,8 @@ class CommandGloadmodule : public Command
  public:
 	CommandGloadmodule(Module* Creator) : Command(Creator,"GLOADMODULE", 1)
 	{
-		flags_needed = 'o'; syntax = "<modulename> [servermask]";
+		flags_needed = 'o';
+		syntax = "<modulename> [servermask]";
 		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
 
@@ -30,7 +31,7 @@ class CommandGloadmodule : public Command
 	{
 		std::string servername = parameters.size() > 1 ? parameters[1] : "*";
 
-		if (InspIRCd::Match(ServerInstance->Config->ServerName, servername))
+		if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername))
 		{
 			if (ServerInstance->Modules->Load(parameters[0].c_str()))
 			{
@@ -61,19 +62,22 @@ class CommandGunloadmodule : public Command
  public:
 	CommandGunloadmodule(Module* Creator) : Command(Creator,"GUNLOADMODULE", 1)
 	{
-		flags_needed = 'o'; syntax = "<modulename> [servermask]";
+		flags_needed = 'o';
+		syntax = "<modulename> [servermask]";
 	}
 
 	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))
+		if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername))
 		{
-			if (ServerInstance->Modules->Unload(parameters[0].c_str()))
+			Module* m = ServerInstance->Modules->Find(parameters[0]);
+			if (m && ServerInstance->Modules->Unload(m))
 			{
 				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());
+				user->SendText(":%s 973 %s %s :Module successfully unloaded.",
+					ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), parameters[0].c_str());
 			}
 			else
 			{
@@ -92,6 +96,25 @@ class CommandGunloadmodule : public Command
 	}
 };
 
+class GReloadModuleWorker : public HandlerBase1<void, bool>
+{
+ public:
+	const std::string nick;
+	const std::string name;
+	const std::string uid;
+	GReloadModuleWorker(const std::string& usernick, const std::string& uuid, const std::string& modn)
+		: nick(usernick), name(modn), uid(uuid) {}
+	void Call(bool result)
+	{
+		ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY RELOADED BY '%s'%s", name.c_str(), nick.c_str(), result ? "" : " (failed here)");
+		User* user = ServerInstance->FindNick(uid);
+		if (user)
+			user->WriteNumeric(975, "%s %s :Module %ssuccessfully reloaded.",
+				user->nick.c_str(), name.c_str(), result ? "" : "un");
+		ServerInstance->GlobalCulls.AddItem(this);
+	}
+};
+
 /** Handle /GRELOADMODULE
  */
 class CommandGreloadmodule : public Command
@@ -106,22 +129,16 @@ class CommandGreloadmodule : public Command
 	{
 		std::string servername = parameters.size() > 1 ? parameters[1] : "*";
 
-		if (InspIRCd::Match(ServerInstance->Config->ServerName, servername))
+		if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), 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()))
+			Module* m = ServerInstance->Modules->Find(parameters[0]);
+			if (m)
+				ServerInstance->Modules->Reload(m, new GReloadModuleWorker(user->nick, user->uuid, parameters[0]));
+			else
 			{
-				ok = false;
-				user->WriteNumeric(974, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
+				user->WriteNumeric(975, "%s %s :Could not find module by that name", user->nick.c_str(), parameters[0].c_str());
+				return CMD_FAILURE;
 			}
-			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());
@@ -142,21 +159,21 @@ class ModuleGlobalLoad : public Module
 	CommandGreloadmodule cmd3;
 
  public:
-	ModuleGlobalLoad(InspIRCd* Me)
-		: Module(Me), cmd1(this), cmd2(this), cmd3(this)
+	ModuleGlobalLoad()
+		: cmd1(this), cmd2(this), cmd3(this)
 	{
 		ServerInstance->AddCommand(&cmd1);
 		ServerInstance->AddCommand(&cmd2);
 		ServerInstance->AddCommand(&cmd3);
 	}
 
-	virtual ~ModuleGlobalLoad()
+	~ModuleGlobalLoad()
 	{
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Allows global loading of a module.", VF_COMMON | VF_VENDOR);
 	}
 };