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 72e0823db769f4b82278a2375f5694305cfe6bdf..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 */
@@ -58,7 +58,7 @@ class ModuleBlockCAPS : public Module
        char capsmap[256];
 public:
        
-       ModuleBlockCAPS(InspIRCd* Me) : Module::Module(Me)
+       ModuleBlockCAPS(InspIRCd* Me) : Module(Me)
        {
                OnRehash(NULL,"");
                bc = new BlockCaps(ServerInstance);
@@ -89,15 +89,10 @@ public:
                        {
                                int caps = 0;
                                for (std::string::iterator i = text.begin(); i != text.end(); i++)
-                               {
-                                       //if ( (*i >= 'A') && (*i <= 'Z'))
-                                       if (capsmap[(unsigned char)*i])
-                                               caps++;
-                               }
-                               ServerInstance->Log(DEBUG, "<******> Percent caps: " + ConvToStr( ((caps*100)/(int)text.length())  ) + "% >= " + ConvToStr(percent) + "%");
+                                       caps += capsmap[(unsigned char)*i];
                                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->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;
                                }
                        }
@@ -165,7 +160,7 @@ class ModuleBlockCAPSFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleBlockCAPSFactory;
 }