X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=0a64a75b55683a8b6314b4fc65f9196f082826a2;hb=df4afba6c23c939af1013582c94138832017af4e;hp=7a696035aa340c7c3e1afab756bbd2eae9b5cba9;hpb=c4d6ce8c5e1802e5b834d5845e31c3adf7700585;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp index 7a696035a..0a64a75b5 100644 --- a/src/modules/m_blockcaps.cpp +++ b/src/modules/m_blockcaps.cpp @@ -1,22 +1,29 @@ -/* +------------------------------------+ - * | 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) 2006, 2008 Craig Edwards + * Copyright (C) 2006-2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2006 Oliver Lupton * - * 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: Provides support to block all-CAPS channel messages and notices */ +#include "inspircd.h" -/** Handles the +P channel mode +/** Handles the +B channel mode */ class BlockCaps : public SimpleChannelModeHandler { @@ -27,31 +34,21 @@ class BlockCaps : public SimpleChannelModeHandler class ModuleBlockCAPS : public Module { BlockCaps bc; - int percent; + unsigned int percent; unsigned int minlen; char capsmap[256]; -public: +public: ModuleBlockCAPS() : bc(this) { - OnRehash(NULL); - if (!ServerInstance->Modes->AddMode(&bc)) - throw ModuleException("Could not add new modes!"); - Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_On005Numeric }; - ServerInstance->Modules->Attach(eventlist, this, 4); - } - - virtual void On005Numeric(std::string &output) - { - ServerInstance->AddExtBanChar('B'); } - virtual void OnRehash(User* user) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - ReadConf(); + tokens["EXTBAN"].push_back('B'); } - virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE { if (target_type == TYPE_CHANNEL) { @@ -59,34 +56,25 @@ public: return MOD_RES_PASSTHRU; Channel* c = (Channel*)dest; + ModResult res = ServerInstance->OnCheckExemption(user,c,"blockcaps"); - if (CHANOPS_EXEMPT('B') && c->GetPrefixValue(user) == OP_VALUE) - { + if (res == MOD_RES_ALLOW) return MOD_RES_PASSTHRU; - } - if (!c->GetExtBanStatus(user, 'B').check(!c->IsModeSet('B'))) + if (!c->GetExtBanStatus(user, 'B').check(!c->IsModeSet(bc))) { - int caps = 0; - const char* actstr = "\1ACTION "; - int act = 0; - - for (std::string::iterator i = text.begin(); i != text.end(); i++) - { - /* Smart fix for suggestion from Jobe, ignore CTCP ACTION (part of /ME) */ - if (*actstr && *i == *actstr++ && act != -1) - { - act++; - continue; - } - else - act = -1; + std::string::size_type caps = 0; + unsigned int offset = 0; + // Ignore the beginning of the text if it's a CTCP ACTION (/me) + if (!text.compare(0, 8, "\1ACTION ", 8)) + offset = 8; + for (std::string::const_iterator i = text.begin() + offset; i != text.end(); ++i) caps += capsmap[(unsigned char)*i]; - } - if ( ((caps*100)/(int)text.length()) >= percent ) + + if (((caps * 100) / text.length()) >= percent) { - user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Your message cannot contain more than %d%% capital letters if it's longer than %d characters", user->nick.c_str(), c->name.c_str(), percent, minlen); + user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s :Your message cannot contain more than %d%% capital letters if it's longer than %d characters", c->name.c_str(), percent, minlen); return MOD_RES_DENY; } } @@ -94,41 +82,20 @@ public: return MOD_RES_PASSTHRU; } - virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) - { - return OnUserPreMessage(user,dest,target_type,text,status,exempt_list); - } - - void ReadConf() + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ConfigReader Conf; - percent = Conf.ReadInteger("blockcaps", "percent", "100", 0, true); - minlen = Conf.ReadInteger("blockcaps", "minlen", "1", 0, true); - std::string hmap = Conf.ReadValue("blockcaps", "capsmap", 0); - if (hmap.empty()) - hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + ConfigTag* tag = ServerInstance->Config->ConfValue("blockcaps"); + percent = tag->getInt("percent", 100, 1, 100); + minlen = tag->getInt("minlen", 1, 1, ServerInstance->Config->Limits.MaxLine); + std::string hmap = tag->getString("capsmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); memset(capsmap, 0, sizeof(capsmap)); for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++) capsmap[(unsigned char)*n] = 1; - if (percent < 1 || percent > 100) - { - ServerInstance->Logs->Log("CONFIG",DEFAULT, " out of range, setting to default of 100."); - percent = 100; - } - if (minlen < 1 || minlen > MAXBUF-1) - { - ServerInstance->Logs->Log("CONFIG",DEFAULT, " out of range, setting to default of 1."); - minlen = 1; - } - } - - virtual ~ModuleBlockCAPS() - { } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("Provides support to block all-CAPS channel messages and notices", VF_COMMON|VF_VENDOR,API_VERSION); + return Version("Provides support to block all-CAPS channel messages and notices", VF_VENDOR); } };