dz is determined to crash your ircd :P

[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 fc2c55a96a0e307b9614e0e7e007ea9f142b5f36..1159febf8620ffaf9dff17c8b62c4269d0873f26 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#define _CRT_SECURE_NO_DEPRECATE
+#define _SCL_SECURE_NO_DEPRECATE
+
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 typedef std::map<irc::string,irc::string> censor_t;
 
@@ -110,8 +110,8 @@ class ModuleCensor : public Module
        {
                ServerInstance->Modes->DelMode(cu);
                ServerInstance->Modes->DelMode(cc);
-               DELETE(cu);
-               DELETE(cc);
+               delete cu;
+               delete cc;
        }
 
        virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace)
@@ -174,13 +174,15 @@ class ModuleCensor : public Module
                 */
                ConfigReader* MyConf = new ConfigReader(ServerInstance);
                censors.clear();
+
                for (int index = 0; index < MyConf->Enumerate("badword"); index++)
                {
                        irc::string pattern = (MyConf->ReadValue("badword","text",index)).c_str();
                        irc::string replace = (MyConf->ReadValue("badword","replace",index)).c_str();
                        censors[pattern] = replace;
                }
-               DELETE(MyConf);
+
+               delete MyConf;
        }
        
        virtual Version GetVersion()
@@ -190,28 +192,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" DllExport void * init_module( void )
-{
-       return new ModuleCensorFactory;
-}
+MODULE_INIT(ModuleCensor)