X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=06bd91c50ff77daa0d6fd53e6eecd775c037e13f;hb=HEAD;hp=22482faace9bed22f18925c1f6695de6cce1bdb0;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp index 22482faac..06bd91c50 100644 --- a/src/modules/m_operjoin.cpp +++ b/src/modules/m_operjoin.cpp @@ -1,114 +1,72 @@ -/* +------------------------------------+ - * | 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) 2013 Sadie Powell + * Copyright (C) 2012-2014 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2007-2008 Dennis Friis + * Copyright (C) 2006-2007 Craig Edwards + * Copyright (C) 2005 Robin Burchell * - * 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 . */ -#include "inspircd.h" -/* $ModDesc: Forces opers to join the specified channel(s) on oper-up */ +#include "inspircd.h" 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) - { - // skip delimiters at beginning. - std::string::size_type lastPos = str.find_first_not_of(",", 0); - // find first "non-delimiter". - std::string::size_type pos = str.find_first_of(",", lastPos); - - while (std::string::npos != pos || std::string::npos != lastPos) - { - // found a token, add it to the vector. - tokens.push_back(str.substr(lastPos, pos - lastPos)); - // skip delimiters. Note the "not_of" - lastPos = str.find_first_not_of(",", pos); - // find next "non-delimiter" - pos = str.find_first_of(",", lastPos); - } - return tokens.size(); - } - public: - ModuleOperjoin(InspIRCd* Me) : Module(Me) - { - OnRehash(NULL, ""); - Implementation eventlist[] = { I_OnPostOper, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 2); - } - - - virtual void OnRehash(User* user, const std::string ¶meter) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ConfigReader* conf = new ConfigReader(ServerInstance); + ConfigTag* tag = ServerInstance->Config->ConfValue("operjoin"); - operChan = conf->ReadValue("operjoin", "channel", 0); - override = conf->ReadFlag("operjoin", "override", "0", 0); + override = tag->getBool("override", false); + irc::commasepstream ss(tag->getString("channel")); operChans.clear(); - 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; + for (std::string channame; ss.GetToken(channame); ) + operChans.push_back(channame); } - virtual ~ModuleOperjoin() + Version GetVersion() CXX11_OVERRIDE { + return Version("Allows the server administrator to force server operators to join one or more channels when logging into their server operator account.", VF_VENDOR); } - virtual Version GetVersion() + void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE { - return Version("$Id$", VF_VENDOR, API_VERSION); - } - - virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername) - { - if (!IS_LOCAL(user)) + LocalUser* localuser = IS_LOCAL(user); + if (!localuser) return; - for(std::vector::iterator it = operChans.begin(); it != operChans.end(); it++) - if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax)) - Channel::JoinUser(ServerInstance, user, it->c_str(), override, "", false, ServerInstance->Time()); + for (std::vector::const_iterator i = operChans.begin(); i != operChans.end(); ++i) + if (ServerInstance->IsChannel(*i)) + Channel::JoinUser(localuser, *i, override); - std::map >::iterator i = operTypeChans.find(user->oper); - - if (i != operTypeChans.end()) + irc::commasepstream ss(localuser->oper->getConfig("autojoin")); + for (std::string channame; ss.GetToken(channame); ) { - const std::vector& list = i->second; - for (std::vector::const_iterator it = list.begin(); it != list.end(); ++it) - { - if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax)) - { - Channel::JoinUser(ServerInstance, user, it->c_str(), override, "", false, ServerInstance->Time()); - } - } + if (ServerInstance->IsChannel(channame)) + Channel::JoinUser(localuser, channame, override); } } - }; MODULE_INIT(ModuleOperjoin)