X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=d12bc193225bbade732b1dc028bc40cf77ceb86b;hb=78fa4165c90088523e623ab2b64ca0db0d19def0;hp=5df02da1ef172fd606043b896b412cc6053eca65;hpb=7f9c6c5118261eac40d9bae22ac2c0ede670512d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp index 5df02da1e..d12bc1932 100644 --- a/src/modules/m_operjoin.cpp +++ b/src/modules/m_operjoin.cpp @@ -1,23 +1,28 @@ -// operjoin module by typobox43 - -using namespace std; +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ +#include "inspircd.h" #include "users.h" #include "channels.h" #include "modules.h" -#include "inspircd.h" - /* $ModDesc: Forces opers to join the specified channel(s) on oper-up */ - - class ModuleOperjoin : public Module { private: std::string operChan; - ConfigReader* conf; - + std::vector operChans; int tokenize(const string &str, std::vector &tokens) { @@ -39,12 +44,9 @@ class ModuleOperjoin : public Module } public: - ModuleOperjoin(InspIRCd* Me) - : Module::Module(Me) + ModuleOperjoin(InspIRCd* Me) : Module(Me) { - - conf = new ConfigReader(ServerInstance); - operChan = conf->ReadValue("operjoin", "channel", 0); + OnRehash(NULL, ""); } void Implements(char* List) @@ -52,15 +54,20 @@ class ModuleOperjoin : public Module List[I_OnPostOper] = List[I_OnRehash] = 1; } - virtual void OnRehash(const std::string ¶meter) + virtual void OnRehash(userrec* user, const std::string ¶meter) { + ConfigReader* conf = new ConfigReader(ServerInstance); + + operChan = conf->ReadValue("operjoin", "channel", 0); + operChans.clear(); + if (!operChan.empty()) + tokenize(operChan,operChans); + DELETE(conf); - conf = new ConfigReader(ServerInstance); } virtual ~ModuleOperjoin() { - DELETE(conf); } virtual Version GetVersion() @@ -70,36 +77,14 @@ class ModuleOperjoin : public Module virtual void OnPostOper(userrec* user, const std::string &opertype) { - if(operChan != "") - { - std::vector operChans; - tokenize(operChan,operChans); - for(std::vector::iterator it = operChans.begin(); it != operChans.end(); it++) - chanrec::JoinUser(ServerInstance, user, it->c_str(), false); - } - - } - -}; - -class ModuleOperjoinFactory : public ModuleFactory -{ - public: - ModuleOperjoinFactory() - { - } + if (!IS_LOCAL(user)) + return; - ~ModuleOperjoinFactory() - { + for(std::vector::iterator it = operChans.begin(); it != operChans.end(); it++) + if (ServerInstance->IsChannel(it->c_str())) + chanrec::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true)); } - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleOperjoin(Me); - } }; -extern "C" void * init_module( void ) -{ - return new ModuleOperjoinFactory; -} +MODULE_INIT(ModuleOperjoin)