We were already sending FMODE +nt after each channel creation to keep services happy...

[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 509352741c85574e60c0f8bbf7f3476a353b95c1..2f5807c53c774360345645d79631bb3bf2047050 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #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 */
@@ -52,41 +52,49 @@ class BlockCaps : public ModeHandler
 
 class ModuleBlockCAPS : public Module
 {
-       
        BlockCaps* bc;
+       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);
-               ServerInstance->AddMode(bc, 'P');
+               if (!ServerInstance->AddMode(bc, 'P'))
+                       throw ModuleException("Could not add new modes!");
        }
 
        void Implements(char* List)
        {
-               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1;
+       }
+
+       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 (target_type == TYPE_CHANNEL)
                {
+                       if ((!IS_LOCAL(user)) || (text.length() < minlen))
+                               return 0;
+
                        chanrec* c = (chanrec*)dest;
 
                        if (c->IsModeSet('P'))
                        {
-                               const char* i = text.c_str();
-                               for (; *i; i++)
+                               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 != ' ') && (*i != '\t')) && ((*i < 'A') || (*i > 'Z')))
-                                       {
-                                               return 0;
-                                       }
+                                       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;
                                }
-                               
-                               user->WriteServ( "404 %s %s :Can't send all-CAPS to channel (+P set)", user->nick, c->name);
-                               return 1;
                        }
                }
                return 0;
@@ -97,6 +105,29 @@ public:
                return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
 
+       void ReadConf()
+       {
+               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.");
+                       percent = 100;
+               }
+               if (minlen < 0 || minlen > MAXBUF-1)
+               {
+                       ServerInstance->Log(DEFAULT, "<blockcaps:minlen> out of range, setting to default of 0.");
+                       minlen = 0;
+               }
+       }
+
        virtual ~ModuleBlockCAPS()
        {
                ServerInstance->Modes->DelMode(bc);
@@ -129,7 +160,7 @@ class ModuleBlockCAPSFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleBlockCAPSFactory;
 }