X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globalload.cpp;h=9a0074cb40164b50e2f1cc95aeb01a721d70be2c;hb=553a8da754c8cd308bad2008018849714e70f9b7;hp=22035178c0ad8dd20466f320ee0a880975a9e914;hpb=929cd28544c59d122a8d36b2b5e3a394aa03108b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp index 22035178c..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-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,9 +31,9 @@ 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); } @@ -31,7 +42,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())) { @@ -48,6 +59,11 @@ class CommandGloadmodule : public Command return CMD_SUCCESS; } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + return ROUTE_BROADCAST; + } }; /** Handle /GUNLOADMODULE @@ -55,9 +71,9 @@ 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]"; } @@ -65,12 +81,14 @@ class CommandGunloadmodule : 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->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 { @@ -82,6 +100,30 @@ class CommandGunloadmodule : public Command return CMD_SUCCESS; } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + return ROUTE_BROADCAST; + } +}; + +class GReloadModuleWorker : public HandlerBase1 +{ + 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 @@ -89,66 +131,60 @@ 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())) - { - 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()); return CMD_SUCCESS; } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + return ROUTE_BROADCAST; + } }; class ModuleGlobalLoad : public Module { - CommandGloadmodule *mycommand; - CommandGunloadmodule *mycommand2; - CommandGreloadmodule *mycommand3; + CommandGloadmodule cmd1; + CommandGunloadmodule cmd2; + CommandGreloadmodule cmd3; public: - ModuleGlobalLoad(InspIRCd* Me) : Module(Me) + ModuleGlobalLoad() + : cmd1(this), cmd2(this), cmd3(this) { - - mycommand = new CommandGloadmodule(ServerInstance); - mycommand2 = new CommandGunloadmodule(ServerInstance); - mycommand3 = new CommandGreloadmodule(ServerInstance); - ServerInstance->AddCommand(mycommand); - ServerInstance->AddCommand(mycommand2); - ServerInstance->AddCommand(mycommand3); - + 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); } };