X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_blockcaps.cpp;h=cd7698d69564d2104650e8710d701798d8c20ef2;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=29e481c1e85777718a4e20fcae07b74effd76d4e;hpb=31f1e7ad092f8bf16ee653cc105eea4a769650ca;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp index 29e481c1e..cd7698d69 100644 --- a/src/modules/m_blockcaps.cpp +++ b/src/modules/m_blockcaps.cpp @@ -1,136 +1,101 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/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 { public: - BlockCaps(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'B') { } + BlockCaps(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcaps", 'B') { } }; class ModuleBlockCAPS : public Module { - BlockCaps* bc; - int percent; + BlockCaps bc; + unsigned int percent; unsigned int minlen; char capsmap[256]; + public: - - ModuleBlockCAPS(InspIRCd* Me) : Module(Me) + ModuleBlockCAPS() : bc(this) { - OnRehash(NULL,""); - bc = new BlockCaps(ServerInstance); - if (!ServerInstance->Modes->AddMode(bc)) - { - delete bc; - throw ModuleException("Could not add new modes!"); - } - Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 3); } - - virtual void OnRehash(User* user, const std::string ¶m) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - ReadConf(); + tokens["EXTBAN"].push_back('B'); } - virtual int 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) { if ((!IS_LOCAL(user)) || (text.length() < minlen)) - return 0; + return MOD_RES_PASSTHRU; Channel* c = (Channel*)dest; + ModResult res = ServerInstance->OnCheckExemption(user,c,"blockcaps"); - if (CHANOPS_EXEMPT(ServerInstance, 'B') && c->GetStatus(user) == STATUS_OP) - { - return 0; - } + if (res == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; - if (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->WriteServ( "404 %s %s :Your line cannot be more than %d%% capital letters if it is %d or more letters long", user->nick.c_str(), c->name.c_str(), percent, minlen); - return 1; + user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, InspIRCd::Format("Your message cannot contain %d%% or more capital letters if it's longer than %d characters", percent, minlen)); + return MOD_RES_DENY; } } } - return 0; - } - - virtual int 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); + return MOD_RES_PASSTHRU; } - void ReadConf() + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ConfigReader Conf(ServerInstance); - 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"; - memset(&capsmap, 0, 255); + 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() - { - ServerInstance->Modes->DelMode(bc); - delete bc; } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION); + return Version("Provides support to block all-CAPS channel messages and notices", VF_VENDOR); } };