X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=c229ef7529350a2000e79b06352489469e047f02;hb=52671661f8fdca0b61aec8009b4bc7de9bc00166;hp=662bdc865ab93cf7245ac27b50bb3a8419cff274;hpb=38ca8be9a3881a3cb3cf6864e67b779ffbab6874;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp index 662bdc865..c229ef752 100644 --- a/src/modules/m_blockcaps.cpp +++ b/src/modules/m_blockcaps.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -11,13 +11,9 @@ * --------------------------------------------------- */ -#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 @@ -25,23 +21,23 @@ class BlockCaps : public ModeHandler { public: - BlockCaps(InspIRCd* Instance) : ModeHandler(Instance, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { } + BlockCaps(InspIRCd* Instance) : ModeHandler(Instance, 'B', 0, 0, false, MODETYPE_CHANNEL, false) { } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) { if (adding) { - if (!channel->IsModeSet('P')) + if (!channel->IsModeSet('B')) { - channel->SetMode('P',true); + channel->SetMode('B',true); return MODEACTION_ALLOW; } } else { - if (channel->IsModeSet('P')) + if (channel->IsModeSet('B')) { - channel->SetMode('P',false); + channel->SetMode('B',false); return MODEACTION_ALLOW; } } @@ -53,49 +49,52 @@ class BlockCaps : public ModeHandler class ModuleBlockCAPS : public Module { BlockCaps* bc; - float percent; + int percent; unsigned int minlen; + char capsmap[256]; public: - ModuleBlockCAPS(InspIRCd* Me) : Module::Module(Me) + ModuleBlockCAPS(InspIRCd* Me) : Module(Me) { OnRehash(NULL,""); bc = new BlockCaps(ServerInstance); - if (!ServerInstance->AddMode(bc, 'P')) + 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); } - void Implements(char* List) - { - List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1; - } - virtual void OnRehash(userrec* user, const std::string ¶m) + virtual void OnRehash(User* user, const std::string ¶m) { 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) { - ServerInstance->Log(DEBUG, "*** " + ConvToStr( ( 20 * 100 / 26) )); 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) { - float caps = 0; + return 0; + } + + if (c->IsModeSet('B')) + { + int caps = 0; for (std::string::iterator i = text.begin(); i != text.end(); i++) + caps += capsmap[(unsigned char)*i]; + if ( ((caps*100)/(int)text.length()) >= percent ) { - if ( (*i >= 'A') && (*i <= 'Z')) - caps++; - } - if ( ((caps / text.length()) * 100) >= percent ) - { - user->WriteServ( "404 %s %s :Can't send all-CAPS to channel (+P set)", user->nick, c->name); + 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->name, percent, minlen); return 1; } } @@ -103,7 +102,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); } @@ -112,52 +111,35 @@ public: { ConfigReader Conf(ServerInstance); percent = Conf.ReadInteger("blockcaps", "percent", "100", 0, true); - minlen = Conf.ReadInteger("blockcaps", "minlen", "0", 0, true); - if (percent < 0 || percent > 100) + 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); + for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++) + capsmap[(unsigned char)*n] = 1; + 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); + delete bc; } virtual Version GetVersion() { - return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION); - } -}; - - -class ModuleBlockCAPSFactory : public ModuleFactory -{ - public: - ModuleBlockCAPSFactory() - { - } - - ~ModuleBlockCAPSFactory() - { + return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION); } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleBlockCAPS(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleBlockCAPSFactory; -} +MODULE_INIT(ModuleBlockCAPS)