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

[user/henk/code/inspircd.git] / src / modules / m_censor.cpp

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 3b7545b58e4c2ab7f41fdcf8e5e81fc555d2d0fa..27bb3b7411d9de795ff3f5644484371688da3df6 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -11,11 +11,9 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#define _CRT_SECURE_NO_DEPRECATE
+#define _SCL_SECURE_NO_DEPRECATE
+
 #include "inspircd.h"
 
 typedef std::map<irc::string,irc::string> censor_t;
@@ -92,7 +90,7 @@ class ModuleCensor : public Module
  
  public:
        ModuleCensor(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                /* Read the configuration file on startup.
                 */
@@ -150,6 +148,12 @@ class ModuleCensor : public Module
                { 
                        if (text2.find(index->first) != irc::string::npos)
                        {
+                               if (index->second.empty())
+                               {
+                                       user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked", user->nick, ((chanrec*)dest)->name, index->first.c_str());
+                                       return 1;
+                               }
+                               
                                this->ReplaceLine(text2,index->first,index->second);
                        }
                }
@@ -186,28 +190,4 @@ class ModuleCensor : public Module
        
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleCensorFactory : public ModuleFactory
-{
- public:
-       ModuleCensorFactory()
-       {
-       }
-       
-       ~ModuleCensorFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleCensor(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleCensorFactory;
-}
+MODULE_INIT(ModuleCensor)