Move UNLOADMODULE handler into core_loadmodule

2 files changed, 71 insertions, 71 deletions

diff --git a/src/coremods/core_loadmodule.cpp b/src/coremods/core_loadmodule.cpp
index 458a8cd6f..4ee5da1ec 100644
--- a/src/coremods/core_loadmodule.cpp
+++ b/src/coremods/core_loadmodule.cpp
@@ -53,4 +53,74 @@ CmdResult CommandLoadmodule::Handle (const std::vector<std::string>& parameters,
 	}
 }
 
-COMMAND_INIT(CommandLoadmodule)
+/** Handle /UNLOADMODULE.
+ */
+class CommandUnloadmodule : public Command
+{
+ public:
+	/** Constructor for unloadmodule.
+	 */
+	CommandUnloadmodule(Module* parent)
+		: Command(parent,"UNLOADMODULE", 1)
+	{
+		flags_needed = 'o';
+		syntax = "<modulename>";
+	}
+
+	/** Handle command.
+	 * @param parameters The parameters to the command
+	 * @param user The user issuing the command
+	 * @return A value from CmdResult to indicate command success or failure.
+	 */
+	CmdResult Handle(const std::vector<std::string>& parameters, User* user);
+};
+
+CmdResult CommandUnloadmodule::Handle(const std::vector<std::string>& parameters, User* user)
+{
+	if (!ServerInstance->Config->ConfValue("security")->getBool("allowcoreunload") &&
+		InspIRCd::Match(parameters[0], "cmd_*.so", ascii_case_insensitive_map))
+	{
+		user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s :You cannot unload core commands!", parameters[0].c_str());
+		return CMD_FAILURE;
+	}
+
+	if (parameters[0] == "cmd_unloadmodule.so" || parameters[0] == "cmd_loadmodule.so")
+	{
+		user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s :You cannot unload module loading commands!", parameters[0].c_str());
+		return CMD_FAILURE;
+	}
+
+	Module* m = ServerInstance->Modules->Find(parameters[0]);
+	if (m && ServerInstance->Modules->Unload(m))
+	{
+		ServerInstance->SNO->WriteGlobalSno('a', "MODULE UNLOADED: %s unloaded %s", user->nick.c_str(), parameters[0].c_str());
+		user->WriteNumeric(RPL_UNLOADEDMODULE, "%s :Module successfully unloaded.", parameters[0].c_str());
+	}
+	else
+	{
+		user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s :%s", parameters[0].c_str(),
+			m ? ServerInstance->Modules->LastError().c_str() : "No such module");
+		return CMD_FAILURE;
+	}
+
+	return CMD_SUCCESS;
+}
+
+class CoreModLoadModule : public Module
+{
+	CommandLoadmodule cmdloadmod;
+	CommandUnloadmodule cmdunloadmod;
+
+ public:
+	CoreModLoadModule()
+		: cmdloadmod(this), cmdunloadmod(this)
+	{
+	}
+
+	Version GetVersion()
+	{
+		return Version("Provides the LOADMODULE and UNLOADMODULE commands", VF_VENDOR|VF_CORE);
+	}
+};
+
+MODULE_INIT(CoreModLoadModule)
diff --git a/src/coremods/core_unloadmodule.cpp b/src/coremods/core_unloadmodule.cpp
deleted file mode 100644
index 5d11e0256..000000000
--- a/src/coremods/core_unloadmodule.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *
- * 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/>.
- */
-
-
-#include "inspircd.h"
-
-/** Handle /UNLOADMODULE.
- */
-class CommandUnloadmodule : public Command
-{
- public:
-	/** Constructor for unloadmodule.
-	 */
-	CommandUnloadmodule ( Module* parent) : Command(parent,"UNLOADMODULE",1) { flags_needed = 'o'; syntax = "<modulename>"; }
-	/** Handle command.
-	 * @param parameters The parameters to the command
-	 * @param user The user issuing the command
-	 * @return A value from CmdResult to indicate command success or failure.
-	 */
-	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
-};
-
-CmdResult CommandUnloadmodule::Handle (const std::vector<std::string>& parameters, User *user)
-{
-	if (!ServerInstance->Config->ConfValue("security")->getBool("allowcoreunload") &&
-		InspIRCd::Match(parameters[0], "cmd_*.so", ascii_case_insensitive_map))
-	{
-		user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s :You cannot unload core commands!", parameters[0].c_str());
-		return CMD_FAILURE;
-	}
-
-	if (parameters[0] == "cmd_unloadmodule.so" || parameters[0] == "cmd_loadmodule.so")
-	{
-		user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s :You cannot unload module loading commands!", parameters[0].c_str());
-		return CMD_FAILURE;
-	}
-
-	Module* m = ServerInstance->Modules->Find(parameters[0]);
-	if (m && ServerInstance->Modules->Unload(m))
-	{
-		ServerInstance->SNO->WriteGlobalSno('a', "MODULE UNLOADED: %s unloaded %s", user->nick.c_str(), parameters[0].c_str());
-		user->WriteNumeric(RPL_UNLOADEDMODULE, "%s :Module successfully unloaded.", parameters[0].c_str());
-	}
-	else
-	{
-		user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s :%s", parameters[0].c_str(),
-			m ? ServerInstance->Modules->LastError().c_str() : "No such module");
-		return CMD_FAILURE;
-	}
-
-	return CMD_SUCCESS;
-}
-
-COMMAND_INIT(CommandUnloadmodule)