X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globalload.cpp;h=2355cc979644005cf251a82c23aa8c77cb68a62e;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=a3e3148468bc7898b545ee0af6829a313e12393e;hpb=2630a87bb13b089e6d0fdcff4bcd0f3a9612e52f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp index a3e314846..2355cc979 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-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2011 Jackmcbarn + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2006-2008 Craig Edwards + * Copyright (C) 2007-2008 Dennis Friis + * Copyright (C) 2006-2007 Robin Burchell + * Copyright (C) 2006 John Brooks * - * 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 . */ -/* $ModDesc: Allows global loading of a module. */ #include "inspircd.h" @@ -20,27 +29,26 @@ class CommandGloadmodule : public Command { public: - CommandGloadmodule (InspIRCd* Instance) : Command(Instance,"GLOADMODULE", "o", 1) + CommandGloadmodule(Module* Creator) : Command(Creator,"GLOADMODULE", 1) { - this->source = "m_globalload.so"; + flags_needed = 'o'; syntax = " [servermask]"; - TRANSLATE3(TR_TEXT, TR_TEXT, TR_END); } CmdResult Handle (const std::vector ¶meters, 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->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 @@ -48,6 +56,11 @@ class CommandGloadmodule : public Command return CMD_SUCCESS; } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + return ROUTE_BROADCAST; + } }; /** Handle /GUNLOADMODULE @@ -55,33 +68,52 @@ class CommandGloadmodule : public Command class CommandGunloadmodule : public Command { public: - CommandGunloadmodule (InspIRCd* Instance) : Command(Instance,"GUNLOADMODULE", "o", 1) + CommandGunloadmodule(Module* Creator) : Command(Creator,"GUNLOADMODULE", 1) { - this->source = "m_globalload.so"; + flags_needed = 'o'; syntax = " [servermask]"; } CmdResult Handle (const std::vector ¶meters, 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, 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->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()); + if (ServerInstance->Modules->Unload(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()); + } + 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->SendText(":%s %03d %s %s :No such module", ServerInstance->Config->ServerName.c_str(), ERR_CANTUNLOADMODULE, user->nick.c_str(), parameters[0].c_str()); } else 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& parameters) + { + return ROUTE_BROADCAST; + } }; /** Handle /GRELOADMODULE @@ -89,38 +121,39 @@ class CommandGunloadmodule : public Command class CommandGreloadmodule : public Command { public: - CommandGreloadmodule (InspIRCd* Instance) : Command(Instance, "GRELOADMODULE", "o", 1) + CommandGreloadmodule(Module* Creator) : Command(Creator, "GRELOADMODULE", 1) { - this->source = "m_globalload.so"; - syntax = " [servermask]"; + flags_needed = 'o'; syntax = " [servermask]"; } CmdResult Handle(const std::vector ¶meters, 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)) { - bool ok = true; - if (!ServerInstance->Modules->Unload(parameters[0].c_str())) + Module* m = ServerInstance->Modules->Find(parameters[0]); + if (m) { - ok = false; - user->WriteNumeric(972, "%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()); + ServerInstance->Parser.CallHandler("RELOADMODULE", parameters, user); } - if (!ServerInstance->Modules->Load(parameters[0].c_str())) + else { - ok = false; - user->WriteNumeric(974, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str()); + user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Could not find module by that name"); + 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()); return CMD_SUCCESS; } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + return ROUTE_BROADCAST; + } }; class ModuleGlobalLoad : public Module @@ -130,23 +163,15 @@ class ModuleGlobalLoad : public Module CommandGreloadmodule cmd3; public: - ModuleGlobalLoad(InspIRCd* Me) - : Module(Me), cmd1(Me), cmd2(Me), cmd3(Me) + ModuleGlobalLoad() + : cmd1(this), cmd2(this), cmd3(this) { - ServerInstance->AddCommand(&cmd1); - ServerInstance->AddCommand(&cmd2); - ServerInstance->AddCommand(&cmd3); } - virtual ~ModuleGlobalLoad() + Version GetVersion() CXX11_OVERRIDE { - } - - virtual Version GetVersion() - { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Allows global loading of a module.", VF_COMMON | VF_VENDOR); } }; MODULE_INIT(ModuleGlobalLoad) -