X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_exemptchanops.cpp;h=1f3dd3afbefb2cb03f58ea90fd96ff88a7865a12;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=df5ec4bf3a010a722a16aeac02be3fd6fbf95cdd;hpb=37b9455f70ad2fd919aa83a2c96a1e4764a3b25a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp index df5ec4bf3..1f3dd3afb 100644 --- a/src/modules/m_exemptchanops.cpp +++ b/src/modules/m_exemptchanops.cpp @@ -1,18 +1,24 @@ -/* +------------------------------------+ - * | 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" +#include "listmode.h" /* $ModDesc: Provides the ability to allow channel operators to be exempt from certain modes. */ @@ -25,6 +31,7 @@ class ExemptChanOps : public ListModeBase bool ValidateParam(User* user, Channel* chan, std::string &word) { + // TODO actually make sure there's a prop for this if ((word.length() > 35) || (word.empty())) { 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")); @@ -34,10 +41,9 @@ class ExemptChanOps : public ListModeBase return true; } - bool TellListTooLong(User* user, Channel* chan, std::string &word) + void TellListTooLong(User* user, Channel* chan, std::string &word) { user->WriteNumeric(959, "%s %s %s :Channel exemptchanops list is full", user->nick.c_str(), chan->name.c_str(), word.c_str()); - return true; } void TellAlreadyOnList(User* user, Channel* chan, std::string &word) @@ -51,83 +57,92 @@ class ExemptChanOps : public ListModeBase } }; -class ModuleExemptChanOps : public Module +class ExemptHandler : public HandlerBase3 { + public: ExemptChanOps ec; + ExemptHandler(Module* me) : ec(me) {} + + ModeHandler* FindMode(const std::string& mid) + { + if (mid.length() == 1) + return ServerInstance->Modes->FindMode(mid[0], MODETYPE_CHANNEL); + for(char c='A'; c < 'z'; c++) + { + ModeHandler* mh = ServerInstance->Modes->FindMode(c, MODETYPE_CHANNEL); + if (mh && mh->name == mid) + return mh; + } + return NULL; + } + + ModResult Call(User* user, Channel* chan, const std::string& restriction) + { + unsigned int mypfx = chan->GetPrefixValue(user); + std::string minmode; + + ListModeBase::ModeList* list = ec.GetList(chan); + + if (list) + { + for (ListModeBase::ModeList::iterator i = list->begin(); i != list->end(); ++i) + { + std::string::size_type pos = (*i).mask.find(':'); + if (pos == std::string::npos) + continue; + if ((*i).mask.substr(0,pos) == restriction) + minmode = (*i).mask.substr(pos + 1); + } + } + + ModeHandler* mh = FindMode(minmode); + if (mh && mypfx >= mh->GetPrefixRank()) + return MOD_RES_ALLOW; + if (mh || minmode == "*") + return MOD_RES_DENY; + + return ServerInstance->HandleOnCheckExemption.Call(user, chan, restriction); + } +}; + +class ModuleExemptChanOps : public Module +{ std::string defaults; + ExemptHandler eh; public: - - ModuleExemptChanOps() : ec(this) + ModuleExemptChanOps() : eh(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); + ServerInstance->Modules->AddService(eh.ec); + Implementation eventlist[] = { I_OnRehash, I_OnSyncChannel }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + ServerInstance->OnCheckExemption = &eh; OnRehash(NULL); } - Version GetVersion() + ~ModuleExemptChanOps() { - return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR); + ServerInstance->OnCheckExemption = &ServerInstance->HandleOnCheckExemption; } - void OnRehash(User* user) + Version GetVersion() { - defaults = ServerInstance->Config->ConfValue("exemptchanops")->getString("defaults"); - ec.DoRehash(); + return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR); } - void OnCleanup(int target_type, void* item) + void OnRehash(User* user) { - ec.DoCleanup(target_type, item); + eh.ec.DoRehash(); } void OnSyncChannel(Channel* chan, Module* proto, void* opaque) { - ec.DoSyncChannel(chan, proto, opaque); - } - - ModResult OnChannelRestrictionApply(User* user, Channel* chan, const char* restriction) - { - unsigned int mypfx = chan->GetPrefixValue(user); - irc::spacesepstream defaultstream(defaults); - char minmode = 0; - std::string current; - - 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); - - if (list) - { - for (modelist::iterator i = list->begin(); i != list->end(); ++i) - { - 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]; - } - } - - ModeHandler* mh = ServerInstance->Modes->FindMode(minmode, MODETYPE_CHANNEL); - if (mh && mypfx >= mh->GetPrefixRank()) - return MOD_RES_ALLOW; - if (mh || minmode == '*') - return MOD_RES_DENY; - return MOD_RES_PASSTHRU; + eh.ec.DoSyncChannel(chan, proto, opaque); } };