X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=8b0c73ce3707f243524d9d45ba25da2969ab746e;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=72e0823db769f4b82278a2375f5694305cfe6bdf;hpb=1ea65ff796732e20e3243fa213b3ddc3ebb16724;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp index 72e0823db..8b0c73ce3 100644 --- a/src/modules/m_blockcaps.cpp +++ b/src/modules/m_blockcaps.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,93 +11,82 @@ * --------------------------------------------------- */ -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" -#include "mode.h" -/* $ModDesc: Provides support for channel mode +P to block all-CAPS channel messages and notices */ +/* $ModDesc: Provides support to block all-CAPS channel messages and notices */ /** Handles the +P channel mode */ -class BlockCaps : public ModeHandler +class BlockCaps : public SimpleChannelModeHandler { public: - BlockCaps(InspIRCd* Instance) : ModeHandler(Instance, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { } - - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) - { - if (adding) - { - if (!channel->IsModeSet('P')) - { - channel->SetMode('P',true); - return MODEACTION_ALLOW; - } - } - else - { - if (channel->IsModeSet('P')) - { - channel->SetMode('P',false); - return MODEACTION_ALLOW; - } - } - - return MODEACTION_DENY; - } + BlockCaps(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'B') { } }; class ModuleBlockCAPS : public Module { - BlockCaps* bc; + BlockCaps bc; int percent; unsigned int minlen; char capsmap[256]; public: - - ModuleBlockCAPS(InspIRCd* Me) : Module::Module(Me) + + ModuleBlockCAPS(InspIRCd* Me) : Module(Me), bc(Me) { - OnRehash(NULL,""); - bc = new BlockCaps(ServerInstance); - if (!ServerInstance->AddMode(bc, 'P')) + 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); } - void Implements(char* List) + virtual void On005Numeric(std::string &output) { - List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1; + ServerInstance->AddExtBanChar('B'); } - virtual void OnRehash(userrec* user, const std::string ¶m) + virtual void OnRehash(User* user) { ReadConf(); } - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { if (target_type == TYPE_CHANNEL) { if ((!IS_LOCAL(user)) || (text.length() < minlen)) return 0; - chanrec* c = (chanrec*)dest; + Channel* c = (Channel*)dest; - if (c->IsModeSet('P')) + if (CHANOPS_EXEMPT(ServerInstance, 'B') && c->GetStatus(user) == STATUS_OP) + { + return 0; + } + + if (c->IsModeSet('B') || c->GetExtBanStatus(user, 'B') < 0) { int caps = 0; + const char* actstr = "\1ACTION "; + int act = 0; + for (std::string::iterator i = text.begin(); i != text.end(); i++) { - //if ( (*i >= 'A') && (*i <= 'Z')) - if (capsmap[(unsigned char)*i]) - caps++; + /* Smart fix for suggestion from Jobe, ignore CTCP ACTION (part of /ME) */ + if (*actstr && *i == *actstr++ && act != -1) + { + act++; + continue; + } + else + act = -1; + + caps += capsmap[(unsigned char)*i]; } - ServerInstance->Log(DEBUG, "<******> Percent caps: " + ConvToStr( ((caps*100)/(int)text.length()) ) + "% >= " + ConvToStr(percent) + "%"); if ( ((caps*100)/(int)text.length()) >= percent ) { - user->WriteServ( "404 %s %s :Can't send all-CAPS to channel (+P set)", user->nick, c->name); + 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); return 1; } } @@ -105,7 +94,7 @@ public: return 0; } - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + 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); } @@ -114,58 +103,34 @@ public: { ConfigReader Conf(ServerInstance); percent = Conf.ReadInteger("blockcaps", "percent", "100", 0, true); - minlen = Conf.ReadInteger("blockcaps", "minlen", "0", 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); + memset(capsmap, 0, sizeof(capsmap)); for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++) capsmap[(unsigned char)*n] = 1; - if (percent < 0 || percent > 100) + if (percent < 1 || percent > 100) { - ServerInstance->Log(DEFAULT, " out of range, setting to default of 100."); + ServerInstance->Logs->Log("CONFIG",DEFAULT, " out of range, setting to default of 100."); percent = 100; } - if (minlen < 0 || minlen > MAXBUF-1) + if (minlen < 1 || minlen > MAXBUF-1) { - ServerInstance->Log(DEFAULT, " out of range, setting to default of 0."); - minlen = 0; + ServerInstance->Logs->Log("CONFIG",DEFAULT, " out of range, setting to default of 1."); + minlen = 1; } } virtual ~ModuleBlockCAPS() { - ServerInstance->Modes->DelMode(bc); - DELETE(bc); + ServerInstance->Modes->DelMode(&bc); } virtual Version GetVersion() { - return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION); + return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION); } }; - -class ModuleBlockCAPSFactory : public ModuleFactory -{ - public: - ModuleBlockCAPSFactory() - { - } - - ~ModuleBlockCAPSFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleBlockCAPS(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleBlockCAPSFactory; -} +MODULE_INIT(ModuleBlockCAPS)