In the grand tradition of huge fucking commits:

[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 058336fb37f1c3aeacbabb4a9b4ef2f3f1f3056c..167a12bec07722eab197892a9a9438cccda94772 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -11,11 +11,7 @@
  * ---------------------------------------------------
  */
 
-#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 */
 
@@ -27,7 +23,7 @@ class BlockCaps : public ModeHandler
  public:
        BlockCaps(InspIRCd* Instance) : ModeHandler(Instance, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -53,11 +49,12 @@ 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)
+       ModuleBlockCAPS(InspIRCd* Me) : Module(Me)
        {
                OnRehash(NULL,"");
                bc = new BlockCaps(ServerInstance);
@@ -70,31 +67,28 @@ public:
                List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1;
        }
 
-       virtual void OnRehash(userrec* user, const std::string &param)
+       virtual void OnRehash(User* user, const std::string &param)
        {
                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 (text.size() < minlen)
-                       return 0;
-
                if (target_type == TYPE_CHANNEL)
                {
-                       chanrec* c = (chanrec*)dest;
+                       if ((!IS_LOCAL(user)) || (text.length() < minlen))
+                               return 0;
+
+                       Channel* c = (Channel*)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;
                                }
                        }
@@ -102,7 +96,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);
        }
@@ -111,16 +105,22 @@ 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, "<blockcaps:percent> 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, "<blockcaps:minlen> out of range, setting to default of 0.");
-                       minlen = 0;
+                       ServerInstance->Log(DEFAULT, "<blockcaps:minlen> out of range, setting to default of 1.");
+                       minlen = 1;
                }
        }
 
@@ -136,27 +136,4 @@ public:
        }
 };
 
-
-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)