X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globalload.cpp;h=470ac1098a4d41f610b0f7b883aaf88bf467ae55;hb=eacd707421be4f2612df9bde4517649061bb062e;hp=ae87451ba0a95cd88e87f453654ed44b6ede9156;hpb=2b8ce39c6ea5e7a22fe39b21756f82051465f143;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp index ae87451ba..470ac1098 100644 --- a/src/modules/m_globalload.cpp +++ b/src/modules/m_globalload.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -14,128 +14,139 @@ /* $ModDesc: Allows global loading of a module. */ #include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "modules.h" /** Handle /GLOADMODULE */ -class cmd_gloadmodule : public command_t +class CommandGloadmodule : public Command { public: - cmd_gloadmodule (InspIRCd* Instance) : command_t(Instance,"GLOADMODULE", 'o', 1) + CommandGloadmodule (InspIRCd* Instance) : Command(Instance,"GLOADMODULE", "o", 1) { this->source = "m_globalload.so"; - syntax = ""; + syntax = " [servermask]"; + TRANSLATE3(TR_TEXT, TR_TEXT, TR_END); } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const std::vector ¶meters, User *user) { - if (ServerInstance->LoadModule(parameters[0])) - { - ServerInstance->WriteOpers("*** NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0],user->nick); - user->WriteServ("975 %s %s :Module successfully loaded.",user->nick, parameters[0]); + std::string servername = parameters.size() > 1 ? parameters[1] : "*"; - /* route it! */ - return CMD_SUCCESS; - } - else + if (InspIRCd::Match(ServerInstance->Config->ServerName, servername)) { - user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError()); - /* XXX - returning CMD_FAILURE here could potentially mean half the net loads it, half doesn't. pass it on anyway? -- w00t - * - * Returning CMD_SUCCESS would have the same effect, just with less servers. Someone should update this module to properly - * pass the success/failure for each server to the caller (or to all opers) -Special */ - return CMD_FAILURE; + 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()); + } + else + { + user->WriteNumeric(974, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str()); + } } + else + ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBAL LOAD BY '%s' (not loaded here)",parameters[0].c_str(), user->nick.c_str()); + + return CMD_SUCCESS; } }; /** Handle /GUNLOADMODULE */ -class cmd_gunloadmodule : public command_t +class CommandGunloadmodule : public Command { public: - cmd_gunloadmodule (InspIRCd* Instance) : command_t(Instance,"GUNLOADMODULE", 'o', 1) + CommandGunloadmodule (InspIRCd* Instance) : Command(Instance,"GUNLOADMODULE", "o", 1) { this->source = "m_globalload.so"; - syntax = ""; + syntax = " [servermask]"; } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const std::vector ¶meters, User *user) { - if (ServerInstance->UnloadModule(parameters[0])) + std::string servername = parameters.size() > 1 ? parameters[1] : "*"; + + if (InspIRCd::Match(ServerInstance->Config->ServerName, servername)) { - ServerInstance->WriteOpers("*** MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0],user->nick); - user->WriteServ("973 %s %s :Module successfully unloaded.",user->nick, parameters[0]); + if (ServerInstance->Modules->Unload(parameters[0].c_str())) + { + 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()); + } + else + { + user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str()); + } } else - { - /* Return CMD_SUCCESS so the module will be unloaded on any servers it is loaded on - this is a seperate case entirely from loading -Special */ - user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError()); - } + ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)",parameters[0].c_str(), user->nick.c_str()); + return CMD_SUCCESS; } }; /** Handle /GRELOADMODULE */ -class cmd_greloadmodule : public command_t +class CommandGreloadmodule : public Command { public: - cmd_greloadmodule (InspIRCd* Instance) : command_t(Instance, "GRELOADMODULE", 'o', 1) + CommandGreloadmodule (InspIRCd* Instance) : Command(Instance, "GRELOADMODULE", "o", 1) { this->source = "m_globalload.so"; - syntax = ""; + syntax = " [servermask]"; } - CmdResult Handle(const char** parameters, int pcnt, userrec *user) + CmdResult Handle(const std::vector ¶meters, User *user) { - if (!ServerInstance->UnloadModule(parameters[0])) - { - user->WriteServ("972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError()); - return CMD_FAILURE; - } + std::string servername = parameters.size() > 1 ? parameters[1] : "*"; - if (!ServerInstance->LoadModule(parameters[0])) + if (InspIRCd::Match(ServerInstance->Config->ServerName, servername)) { - user->WriteServ("974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError()); - return CMD_FAILURE; + if (!ServerInstance->Modules->Unload(parameters[0].c_str())) + { + 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())) + { + user->WriteNumeric(974, "%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()); + 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()); - ServerInstance->WriteOpers("*** MODULE '%s' GLOBALLY RELOADED BY '%s'",parameters[0],user->nick); - user->WriteServ("975 %s %s :Module successfully loaded.",user->nick, parameters[0]); - return CMD_SUCCESS; } }; class ModuleGlobalLoad : public Module { - cmd_gloadmodule *mycommand; - cmd_gunloadmodule *mycommand2; - cmd_greloadmodule *mycommand3; - + CommandGloadmodule *mycommand; + CommandGunloadmodule *mycommand2; + CommandGreloadmodule *mycommand3; + public: ModuleGlobalLoad(InspIRCd* Me) : Module(Me) { - - mycommand = new cmd_gloadmodule(ServerInstance); - mycommand2 = new cmd_gunloadmodule(ServerInstance); - mycommand3 = new cmd_greloadmodule(ServerInstance); + + mycommand = new CommandGloadmodule(ServerInstance); + mycommand2 = new CommandGunloadmodule(ServerInstance); + mycommand3 = new CommandGreloadmodule(ServerInstance); ServerInstance->AddCommand(mycommand); ServerInstance->AddCommand(mycommand2); ServerInstance->AddCommand(mycommand3); + } - + virtual ~ModuleGlobalLoad() { } - + virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } }; MODULE_INIT(ModuleGlobalLoad) +