X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globalload.cpp;h=9a0074cb40164b50e2f1cc95aeb01a721d70be2c;hb=0b3a4371c504c45c8a4504d114efb2ca674374e0;hp=db081057a29c0f6c5614ae4a6567ac9b721964be;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index db081057a..9a0074cb4 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -1,16 +1,27 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2011 Jackmcbarn <jackmcbarn@jackmcbarn.no-ip.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 John Brooks <john.brooks@dereferenced.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 /* $ModDesc: Allows global loading of a module. */
 
 #include "inspircd.h"
@@ -96,6 +107,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
@@ -113,7 +143,13 @@ class CommandGreloadmodule : public Command
 		if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername))
 		{
 			Module* m = ServerInstance->Modules->Find(parameters[0]);
-			ServerInstance->Modules->Reload(m, NULL);
+			if (m)
+				ServerInstance->Modules->Reload(m, new GReloadModuleWorker(user->nick, user->uuid, parameters[0]));
+			else
+			{
+				user->WriteNumeric(975, "%s %s :Could not find module by that name", user->nick.c_str(), parameters[0].c_str());
+				return CMD_FAILURE;
+			}
 		}
 		else
 			ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBAL RELOAD BY '%s' (not reloaded here)",parameters[0].c_str(), user->nick.c_str());