Fix for bug #415, affects only trunk (wish i'd known this before i started!)

[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 49c04a9465cc3679284026c9efd2dde02fa144ea..1159febf8620ffaf9dff17c8b62c4269d0873f26 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,15 +90,15 @@ class ModuleCensor : public Module
  
  public:
        ModuleCensor(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                /* Read the configuration file on startup.
                 */
-               OnRehash("");
+               OnRehash(NULL,"");
                cu = new CensorUser(ServerInstance);
                cc = new CensorChannel(ServerInstance);
-               ServerInstance->AddMode(cu, 'G');
-               ServerInstance->AddMode(cc, 'G');
+               if (!ServerInstance->AddMode(cu, 'G') || !ServerInstance->AddMode(cc, 'G'))
+                       throw ModuleException("Could not add new modes!");
        }
 
        void Implements(char* List)
@@ -112,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)
@@ -132,6 +130,9 @@ class ModuleCensor : public Module
        // format of a config entry is <badword text="shit" replace="poo">
        virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
+               if (!IS_LOCAL(user))
+                       return 0;
+
                bool active = false;
 
                if (target_type == TYPE_USER)
@@ -147,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);
                        }
                }
@@ -159,7 +166,7 @@ class ModuleCensor : public Module
                return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
        
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                /*
                 * reload our config file on rehash - we must destroy and re-allocate the classes
@@ -167,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()
@@ -183,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" void * init_module( void )
-{
-       return new ModuleCensorFactory;
-}
+MODULE_INIT(ModuleCensor)