Add config <options:disablehmac> to support disabling of HMAC, and tidy up to detect...

[user/henk/code/inspircd.git] / src / modules / m_blockcaps.cpp

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index b67c496f4a8d469ede055f9dffe01528b9e20cd1..e984087d8bdae9df4eeea27291ddd399bc78284c 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -53,13 +53,14 @@ class BlockCaps : public ModeHandler
 class ModuleBlockCAPS : public Module
 {
        BlockCaps* bc;
-       unsigned int percent;
+       int percent;
        unsigned int minlen;
+       char capsmap[256];
 public:
        
        ModuleBlockCAPS(InspIRCd* Me) : Module::Module(Me)
        {
-               OnRehash("");
+               OnRehash(NULL,"");
                bc = new BlockCaps(ServerInstance);
                if (!ServerInstance->AddMode(bc, 'P'))
                        throw ModuleException("Could not add new modes!");
@@ -70,31 +71,28 @@ public:
                List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1;
        }
 
-       virtual void OnRehash(const std::string &param)
+       virtual void OnRehash(userrec* user, const std::string &param)
        {
                ReadConf();
        }
 
        virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               if (text.size() < minlen)
-                       return 0;
-
                if (target_type == TYPE_CHANNEL)
                {
+                       if ((!IS_LOCAL(user)) || (text.length() < minlen))
+                               return 0;
+
                        chanrec* c = (chanrec*)dest;
 
                        if (c->IsModeSet('P'))
                        {
                                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 * 100 / text.size()) >= 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;
                                }
                        }
@@ -112,6 +110,12 @@ public:
                ConfigReader Conf(ServerInstance);
                percent = Conf.ReadInteger("blockcaps", "percent", "100", 0, true);
                minlen = Conf.ReadInteger("blockcaps", "minlen", "0", 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 < 0 || percent > 100)
                {
                        ServerInstance->Log(DEFAULT, "<blockcaps:percent> out of range, setting to default of 100.");