X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_denychans.cpp;h=9d9296c25065403299e831f13330ff780ef189a1;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=ab92ae911094e6c0152b250fde7deaa007e06907;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp index ab92ae911..9d9296c25 100644 --- a/src/modules/m_denychans.cpp +++ b/src/modules/m_denychans.cpp @@ -1,16 +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 Daniel De Graaf + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2005 Craig Edwards * - * 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: Implements config tags which allow blocking of joins to channels */ @@ -18,19 +27,20 @@ class ModuleDenyChannels : public Module { public: - ModuleDenyChannels() { + void init() + { Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 2); + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } virtual void OnRehash(User* user) { - ConfigReader Conf; /* check for redirect validity and loops/chains */ - for (int i =0; i < Conf.Enumerate("badchan"); i++) + ConfigTagList tags = ServerInstance->Config->ConfTags("badchan"); + for (ConfigIter i = tags.first; i != tags.second; ++i) { - std::string name = Conf.ReadValue("badchan","name",i); - std::string redirect = Conf.ReadValue("badchan","redirect",i); + std::string name = i->second->getString("name"); + std::string redirect = i->second->getString("redirect"); if (!redirect.empty()) { @@ -42,14 +52,15 @@ class ModuleDenyChannels : public Module throw ModuleException("Invalid badchan redirect, not a channel"); } - for (int j =0; j < Conf.Enumerate("badchan"); j++) + for (ConfigIter j = tags.first; j != tags.second; ++j) { - if (InspIRCd::Match(redirect, Conf.ReadValue("badchan","name",j))) + if (InspIRCd::Match(redirect, j->second->getString("name"))) { bool goodchan = false; - for (int k =0; k < Conf.Enumerate("goodchan"); k++) + ConfigTagList goodchans = ServerInstance->Config->ConfTags("badchan"); + for (ConfigIter k = goodchans.first; k != goodchans.second; ++k) { - if (InspIRCd::Match(redirect, Conf.ReadValue("goodchan","name",k))) + if (InspIRCd::Match(redirect, k->second->getString("name"))) goodchan = true; } @@ -66,35 +77,32 @@ class ModuleDenyChannels : public Module } } - virtual ~ModuleDenyChannels() - { - } - virtual Version GetVersion() { return Version("Implements config tags which allow blocking of joins to channels", VF_VENDOR); } - virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) + ModResult OnUserPreJoin(User* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) { - ConfigReader Conf; - for (int j =0; j < Conf.Enumerate("badchan"); j++) + ConfigTagList tags = ServerInstance->Config->ConfTags("badchan"); + for (ConfigIter j = tags.first; j != tags.second; ++j) { - if (InspIRCd::Match(cname, Conf.ReadValue("badchan","name",j))) + if (InspIRCd::Match(cname, j->second->getString("name"))) { - if (IS_OPER(user) && Conf.ReadFlag("badchan","allowopers",j)) + if (user->IsOper() && j->second->getBool("allowopers")) { return MOD_RES_PASSTHRU; } else { - std::string reason = Conf.ReadValue("badchan","reason",j); - std::string redirect = Conf.ReadValue("badchan","redirect",j); + std::string reason = j->second->getString("reason"); + std::string redirect = j->second->getString("redirect"); - for (int i = 0; i < Conf.Enumerate("goodchan"); i++) + ConfigTagList goodchans = ServerInstance->Config->ConfTags("goodchan"); + for (ConfigIter i = goodchans.first; i != goodchans.second; ++i) { - if (InspIRCd::Match(cname, Conf.ReadValue("goodchan", "name", i))) + if (InspIRCd::Match(cname, i->second->getString("name"))) { return MOD_RES_PASSTHRU; } @@ -106,13 +114,13 @@ class ModuleDenyChannels : public Module Channel *newchan = ServerInstance->FindChan(redirect); if ((!newchan) || (!(newchan->IsModeSet('L')))) { - user->WriteNumeric(926, "%s %s :Channel %s is forbidden, redirecting to %s: %s",user->nick.c_str(),cname,cname,redirect.c_str(), reason.c_str()); - Channel::JoinUser(user,redirect.c_str(),false,"",false,ServerInstance->Time()); + user->WriteNumeric(926, "%s %s :Channel %s is forbidden, redirecting to %s: %s",user->nick.c_str(),cname.c_str(),cname.c_str(),redirect.c_str(), reason.c_str()); + Channel::JoinUser(user, redirect, false, "", false, ServerInstance->Time()); return MOD_RES_DENY; } } - user->WriteNumeric(926, "%s %s :Channel %s is forbidden: %s",user->nick.c_str(),cname,cname,reason.c_str()); + user->WriteNumeric(926, "%s %s :Channel %s is forbidden: %s",user->nick.c_str(),cname.c_str(),cname.c_str(),reason.c_str()); return MOD_RES_DENY; } }