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 72e0823db769f4b82278a2375f5694305cfe6bdf..e984087d8bdae9df4eeea27291ddd399bc78284c 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -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;
                                }
                        }