Fix crash on propogation after routed squit has reached it's destination. Thx HiroP.

[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 9d2a26191d5b72e522df767e1a8f726bb49bf739..37c23566db27ce1ca2a9c97abf96fd9c29ccf50f 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -11,12 +11,13 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
+#define _CRT_SECURE_NO_DEPRECATE
+#define _SCL_SECURE_NO_DEPRECATE
+
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 typedef std::map<irc::string,irc::string> censor_t;
 
@@ -92,15 +93,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)
@@ -118,11 +119,11 @@ class ModuleCensor : public Module
 
        virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace)
        {
-               if ((pattern != "") && (text != ""))
+               if ((!pattern.empty()) && (!text.empty()))
                {
-                       while (text.find(pattern) != irc::string::npos)
+                       std::string::size_type pos;
+                       while ((pos = text.find(pattern)) != irc::string::npos)
                        {
-                               int pos = text.find(pattern);
                                text.erase(pos,pattern.length());
                                text.insert(pos,replace);
                        }
@@ -132,30 +133,34 @@ 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)
+                       active = ((userrec*)dest)->IsModeSet('G');
+               else if (target_type == TYPE_CHANNEL)
+                       active = ((chanrec*)dest)->IsModeSet('G');
+
+               if (!active)
+                       return 0;
+
                irc::string text2 = text.c_str();
                for (censor_t::iterator index = censors.begin(); index != censors.end(); index++)
                { 
                        if (text2.find(index->first) != irc::string::npos)
                        {
-                               if (target_type == TYPE_USER)
-                               {
-                                       userrec* t = (userrec*)dest;
-                                       active = t->IsModeSet('G');
-                               }
-                               else if (target_type == TYPE_CHANNEL)
+                               if (index->second.empty())
                                {
-                                       chanrec* t = (chanrec*)dest;
-                                       active = t->IsModeSet('G');
+                                       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;
                                }
                                
-                               if (active)
-                               {
-                                       this->ReplaceLine(text2,index->first,index->second);
-                                       text = text2.c_str();
-                               }
+                               this->ReplaceLine(text2,index->first,index->second);
                        }
                }
+               text = text2.c_str();
                return 0;
        }
        
@@ -164,7 +169,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
@@ -209,7 +214,7 @@ class ModuleCensorFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleCensorFactory;
 }