Fix potential for duplicate SID if the SID is auto generated.

[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 93c5ecd492bff8cc133b632e18d83a44aa0e0e22..21e08470f7518694756d0e9a99b128de4ffc5927 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 */
 
@@ -58,7 +54,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,13 +85,10 @@ public:
                        {
                                int caps = 0;
                                for (std::string::iterator i = text.begin(); i != text.end(); i++)
-                               {
-                                       if (capsmap[(unsigned char)*i])
-                                               caps++;
-                               }
+                                       caps += capsmap[(unsigned char)*i];
                                if ( ((caps*100)/(int)text.length()) >= percent )
                                {
-                                       user->WriteServ( "404 %s %s :Your line cannot be more than %d%% capital letters if it is over %d letters long", user->nick, c->name, percent, (int)minlen);
+                                       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;
                                }
                        }
@@ -143,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)