From a15f95e58613619100cc1a6093fab3d0149a1e96 Mon Sep 17 00:00:00 2001 From: aquanight Date: Wed, 21 May 2008 23:15:40 +0000 Subject: Implement Bug #533, Oper type-specific autojoins for m_operjoin via git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9789 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_operjoin.cpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'src/modules') diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp index 21f9aae30..42415faa2 100644 --- a/src/modules/m_operjoin.cpp +++ b/src/modules/m_operjoin.cpp @@ -20,6 +20,7 @@ class ModuleOperjoin : public Module private: std::string operChan; std::vector operChans; + std::map > operTypeChans; // Channels specific to an oper type. bool override; int tokenize(const std::string &str, std::vector &tokens) @@ -60,6 +61,18 @@ class ModuleOperjoin : public Module if (!operChan.empty()) tokenize(operChan,operChans); + std::map >().swap(operTypeChans); + + int olines = conf->Enumerate("type"); + for (int index = 0; index < olines; ++index) + { + std::string chanList = conf->ReadValue("type", "autojoin", index); + if (!chanList.empty()) + { + tokenize(chanList, operTypeChans[conf->ReadValue("type", "name", index)]); + } + } + delete conf; } @@ -80,6 +93,20 @@ class ModuleOperjoin : public Module for(std::vector::iterator it = operChans.begin(); it != operChans.end(); it++) if (ServerInstance->IsChannel(it->c_str())) Channel::JoinUser(ServerInstance, user, it->c_str(), override, "", false, ServerInstance->Time()); + + std::map >::iterator i = operTypeChans.find(user->oper); + + if (i != operTypeChans.end()) + { + const std::vector& list = i->second; + for (std::vector::const_iterator it = list.begin(); it != list.end(); ++it) + { + if (ServerInstance->IsChannel(it->c_str())) + { + Channel::JoinUser(ServerInstance, user, it->c_str(), override, "", false, ServerInstance->Time()); + } + } + } } }; -- cgit v1.2.3