X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_exemptchanops.cpp;h=b1d7b35dfc31aa2066649c81a961723af2b3e829;hb=f020429fd33ec1a7bf1114b2db1b2fd5d6bc1650;hp=f4a8c5d5ac7fba86327666abc6966eb41f6a7b54;hpb=d1f2a430501aec8bc893647dc1049b8499e1caf6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp index f4a8c5d5a..b1d7b35df 100644 --- a/src/modules/m_exemptchanops.cpp +++ b/src/modules/m_exemptchanops.cpp @@ -1,20 +1,25 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2010 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009-2010 Daniel De Graaf * - * 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" -#include "u_listmode.h" -/* $ModDesc: Provides the ability to allow channel operators to be exempt from certain modes. */ +#include "inspircd.h" +#include "listmode.h" +#include "modules/exemption.h" /** Handles channel mode +X */ @@ -23,110 +28,112 @@ class ExemptChanOps : public ListModeBase public: ExemptChanOps(Module* Creator) : ListModeBase(Creator, "exemptchanops", 'X', "End of channel exemptchanops list", 954, 953, false, "exemptchanops") { } - bool ValidateParam(User* user, Channel* chan, std::string &word) - { - if ((word.length() > 35) || (word.empty())) + bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE { + std::string::size_type p = word.find(':'); + if (p == std::string::npos) + { + user->WriteNumeric(Numerics::InvalidModeParameter(chan, this, word, "Invalid exemptchanops entry, format is :")); + return false; + } + + std::string restriction(word, 0, p); + // If there is a '-' in the restriction string ignore it and everything after it + // to support "auditorium-vis" and "auditorium-see" in m_auditorium + p = restriction.find('-'); + if (p != std::string::npos) + restriction.erase(p); + + if (!ServerInstance->Modes->FindMode(restriction, MODETYPE_CHANNEL)) { - user->WriteNumeric(955, "%s %s %s :word is too %s for exemptchanops list",user->nick.c_str(), chan->name.c_str(), word.c_str(), (word.empty() ? "short" : "long")); + user->WriteNumeric(Numerics::InvalidModeParameter(chan, this, word, "Unknown restriction")); return false; } return true; } - bool TellListTooLong(User* user, Channel* chan, std::string &word) + void TellListTooLong(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE { - user->WriteNumeric(959, "%s %s %s :Channel exemptchanops list is full", user->nick.c_str(), chan->name.c_str(), word.c_str()); - return true; + user->WriteNumeric(959, chan->name, word, "Channel exemptchanops list is full"); } - void TellAlreadyOnList(User* user, Channel* chan, std::string &word) + void TellAlreadyOnList(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE { - user->WriteNumeric(957, "%s %s :The word %s is already on the exemptchanops list",user->nick.c_str(), chan->name.c_str(), word.c_str()); + user->WriteNumeric(957, chan->name, InspIRCd::Format("The word %s is already on the exemptchanops list", word.c_str())); } - void TellNotSet(User* user, Channel* chan, std::string &word) + void TellNotSet(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE { - user->WriteNumeric(958, "%s %s :No such exemptchanops word is set",user->nick.c_str(), chan->name.c_str()); + user->WriteNumeric(958, chan->name, "No such exemptchanops word is set"); } }; -class ModuleExemptChanOps : public Module +class ExemptHandler : public CheckExemption::EventListener { - ExemptChanOps ec; - std::string defaults; - public: - - ModuleExemptChanOps() : ec(this) - { - } - - void init() - { - ServerInstance->Modules->AddService(ec); - ec.DoImplements(this); - Implementation eventlist[] = { I_OnChannelDelete, I_OnChannelRestrictionApply, I_OnRehash, I_OnSyncChannel }; - ServerInstance->Modules->Attach(eventlist, this, 4); - - OnRehash(NULL); - } - - Version GetVersion() - { - return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR); - } - - void OnRehash(User* user) + ExemptChanOps ec; + ExemptHandler(Module* me) + : CheckExemption::EventListener(me) + , ec(me) { - defaults = ServerInstance->Config->ConfValue("exemptchanops")->getString("defaults"); - ec.DoRehash(); } - void OnCleanup(int target_type, void* item) + PrefixMode* FindMode(const std::string& mid) { - ec.DoCleanup(target_type, item); - } + if (mid.length() == 1) + return ServerInstance->Modes->FindPrefixMode(mid[0]); - void OnSyncChannel(Channel* chan, Module* proto, void* opaque) - { - ec.DoSyncChannel(chan, proto, opaque); + ModeHandler* mh = ServerInstance->Modes->FindMode(mid, MODETYPE_CHANNEL); + return mh ? mh->IsPrefixMode() : NULL; } - ModResult OnChannelRestrictionApply(User* user, Channel* chan, const char* restriction) + ModResult OnCheckExemption(User* user, Channel* chan, const std::string& restriction) CXX11_OVERRIDE { unsigned int mypfx = chan->GetPrefixValue(user); - irc::spacesepstream defaultstream(defaults); - char minmode = 0; - std::string current; + std::string minmode; - while (defaultstream.GetToken(current)) - { - std::string::size_type pos = current.find(':'); - if (pos == std::string::npos) - continue; - if (current.substr(pos+1) == restriction) - minmode = current[0]; - } - modelist* list = ec.extItem.get(chan); + ListModeBase::ModeList* list = ec.GetList(chan); if (list) { - for (modelist::iterator i = list->begin(); i != list->end(); ++i) + for (ListModeBase::ModeList::iterator i = list->begin(); i != list->end(); ++i) { - std::string::size_type pos = i->mask.find(':'); + std::string::size_type pos = (*i).mask.find(':'); if (pos == std::string::npos) continue; - if (i->mask.substr(pos+1) == restriction) - minmode = i->mask[0]; + if (!i->mask.compare(0, pos, restriction)) + minmode.assign(i->mask, pos + 1, std::string::npos); } } - ModeHandler* mh = ServerInstance->Modes->FindMode(minmode, MODETYPE_CHANNEL); + PrefixMode* mh = FindMode(minmode); if (mh && mypfx >= mh->GetPrefixRank()) return MOD_RES_ALLOW; + if (mh || minmode == "*") + return MOD_RES_DENY; + return MOD_RES_PASSTHRU; } }; +class ModuleExemptChanOps : public Module +{ + ExemptHandler eh; + + public: + ModuleExemptChanOps() : eh(this) + { + } + + Version GetVersion() CXX11_OVERRIDE + { + return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR); + } + + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + { + eh.ec.DoRehash(); + } +}; + MODULE_INIT(ModuleExemptChanOps)