X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_autoop.cpp;h=6bc5f464c375d6697a3ce93bab938fba04ec1826;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=5dc54fba67bde35c7075717272f1b865a531ca54;hpb=04cfaea87edd1b4b742cb607ea69ece760c460aa;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp index 5dc54fba6..6bc5f464c 100644 --- a/src/modules/m_autoop.cpp +++ b/src/modules/m_autoop.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) 2011 Jackmcbarn + * Copyright (C) 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 support for the +w channel mode, autoop list */ +#include "inspircd.h" +#include "listmode.h" /** Handles +w channel mode */ @@ -24,6 +29,20 @@ class AutoOpList : public ListModeBase AutoOpList(Module* Creator) : ListModeBase(Creator, "autoop", 'w', "End of Channel Access List", 910, 911, true) { levelrequired = OP_VALUE; + tidy = false; + } + + 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 AccessCheck(User* source, Channel* channel, std::string ¶meter, bool adding) @@ -32,77 +51,88 @@ class AutoOpList : public ListModeBase if (pos == 0 || pos == std::string::npos) return adding ? MOD_RES_DENY : MOD_RES_PASSTHRU; unsigned int mylevel = channel->GetPrefixValue(source); - while (pos > 0) + std::string mid = parameter.substr(0, pos); + ModeHandler* mh = FindMode(mid); + + if (adding && (!mh || !mh->GetPrefixRank())) + { + source->WriteNumeric(415, "%s %s :Cannot find prefix mode '%s' for autoop", + source->nick.c_str(), mid.c_str(), mid.c_str()); + return MOD_RES_DENY; + } + else if (!mh) + return MOD_RES_PASSTHRU; + + std::string dummy; + if (mh->AccessCheck(source, channel, dummy, true) == MOD_RES_DENY) + return MOD_RES_DENY; + if (mh->GetLevelRequired() > mylevel) { - pos--; - ModeHandler* mh = ServerInstance->Modes->FindMode(parameter[pos], MODETYPE_CHANNEL); - if (adding && !mh) - return MOD_RES_DENY; - else if (!mh) - continue; - - std::string dummy; - if (mh->AccessCheck(source, channel, dummy, true) == MOD_RES_DENY) - return MOD_RES_DENY; - if (mh->GetLevelRequired() > mylevel) - return MOD_RES_DENY; + source->WriteNumeric(482, "%s %s :You must be able to set mode '%s' to include it in an autoop", + source->nick.c_str(), channel->name.c_str(), mid.c_str()); + return MOD_RES_DENY; } return MOD_RES_PASSTHRU; } }; - class ModuleAutoOp : public Module { AutoOpList mh; -public: + public: ModuleAutoOp() : mh(this) + { + } + + void init() CXX11_OVERRIDE { ServerInstance->Modules->AddService(mh); mh.DoImplements(this); - - Implementation list[] = { I_OnUserPreJoin, }; - ServerInstance->Modules->Attach(list, this, 1); } - ModResult OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven) + void OnPostJoin(Membership *memb) CXX11_OVERRIDE { - if (!chan) - return MOD_RES_PASSTHRU; + if (!IS_LOCAL(memb->user)) + return; - modelist* list = mh.extItem.get(chan); + ListModeBase::ModeList* list = mh.GetList(memb->chan); if (list) { - for (modelist::iterator it = list->begin(); it != list->end(); it++) + std::string modeline("+"); + std::vector modechange; + modechange.push_back(memb->chan->name); + for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++) { std::string::size_type colon = it->mask.find(':'); if (colon == std::string::npos) continue; - if (chan->CheckBan(user, it->mask.substr(colon+1))) - privs += it->mask.substr(0, colon); + if (memb->chan->CheckBan(memb->user, it->mask.substr(colon+1))) + { + ModeHandler* given = mh.FindMode(it->mask.substr(0, colon)); + if (given && given->GetPrefixRank()) + modeline.push_back(given->GetModeChar()); + } } + modechange.push_back(modeline); + for(std::string::size_type i = modeline.length(); i > 1; --i) // we use "i > 1" instead of "i" so we skip the + + modechange.push_back(memb->user->nick); + if(modechange.size() >= 3) + ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient); } - - return MOD_RES_PASSTHRU; - } - - void OnCleanup(int target_type, void* item) - { - mh.DoCleanup(target_type, item); } - void OnSyncChannel(Channel* chan, Module* proto, void* opaque) + void OnSyncChannel(Channel* chan, Module* proto, void* opaque) CXX11_OVERRIDE { mh.DoSyncChannel(chan, proto, opaque); } - void OnRehash(User* user) + void OnRehash(User* user) CXX11_OVERRIDE { mh.DoRehash(); } - Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { return Version("Provides support for the +w channel mode", VF_VENDOR); }