X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globalload.cpp;h=b71f29fcccef6527c2fdc50b27ec5bfdbec867c0;hb=f9fd78c01623514a060c607534fc52cb73140200;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..b71f29fcc 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -1,17 +1,26 @@
-/*       +------------------------------------+
- *       | 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"
 
@@ -24,7 +33,6 @@ class CommandGloadmodule : public Command
 	{
 		flags_needed = 'o';
 		syntax = "<modulename> [servermask]";
-		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
@@ -36,11 +44,11 @@ class CommandGloadmodule : public Command
 			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());
+				user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Module successfully loaded.");
 			}
 			else
 			{
-				user->WriteNumeric(974, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
+				user->WriteNumeric(ERR_CANTLOADMODULE, parameters[0], ServerInstance->Modules->LastError());
 			}
 		}
 		else
@@ -68,21 +76,32 @@ class CommandGunloadmodule : public Command
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
+		if (!ServerInstance->Config->ConfValue("security")->getBool("allowcoreunload") &&
+			InspIRCd::Match(parameters[0], "core_*.so", ascii_case_insensitive_map))
+		{
+			user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "You cannot unload core commands!");
+			return CMD_FAILURE;
+		}
+
 		std::string servername = parameters.size() > 1 ? parameters[1] : "*";
 
 		if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername))
 		{
 			Module* m = ServerInstance->Modules->Find(parameters[0]);
-			if (m && ServerInstance->Modules->Unload(m))
+			if (m)
 			{
-				ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
-				user->SendText(":%s 973 %s %s :Module successfully unloaded.",
-					ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), parameters[0].c_str());
+				if (ServerInstance->Modules->Unload(m))
+				{
+					ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
+					user->WriteRemoteNumeric(973, parameters[0], "Module successfully unloaded.");
+				}
+				else
+				{
+					user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], ServerInstance->Modules->LastError());
+				}
 			}
 			else
-			{
-				user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
-			}
+				user->WriteRemoteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "No such module");
 		}
 		else
 			ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)",parameters[0].c_str(), user->nick.c_str());
@@ -113,7 +132,16 @@ 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->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY RELOADED BY '%s'", parameters[0].c_str(), user->nick.c_str());
+				ServerInstance->Parser.CallHandler("RELOADMODULE", parameters, user);
+			}
+			else
+			{
+				user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Could not find module by that name");
+				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());
@@ -137,20 +165,12 @@ class ModuleGlobalLoad : public Module
 	ModuleGlobalLoad()
 		: cmd1(this), cmd2(this), cmd3(this)
 	{
-		ServerInstance->AddCommand(&cmd1);
-		ServerInstance->AddCommand(&cmd2);
-		ServerInstance->AddCommand(&cmd3);
 	}
 
-	~ModuleGlobalLoad()
-	{
-	}
-
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Allows global loading of a module.", VF_COMMON | VF_VENDOR);
 	}
 };
 
 MODULE_INIT(ModuleGlobalLoad)
-