Add config <options:disablehmac> to support disabling of HMAC, and tidy up to detect...

[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 a108f45c6f3090637184750f1b5f52d06df00036..3b7545b58e4c2ab7f41fdcf8e5e81fc555d2d0fa 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -33,17 +33,17 @@ class CensorUser : public ModeHandler
        {
                if (adding)
                {
-                       if (!channel->IsModeSet('G'))
+                       if (!dest->IsModeSet('G'))
                        {
-                               channel->SetMode('G',true);
+                               dest->SetMode('G',true);
                                return MODEACTION_ALLOW;
                        }
                }
                else
                {
-                       if (channel->IsModeSet('G'))
+                       if (dest->IsModeSet('G'))
                        {
-                               channel->SetMode('G',false);
+                               dest->SetMode('G',false);
                                return MODEACTION_ALLOW;
                        }
                }
@@ -65,7 +65,7 @@ class CensorChannel : public ModeHandler
                {
                        if (!channel->IsModeSet('G'))
                        {
-                               channel->SetMode('G',false);
+                               channel->SetMode('G',true);
                                return MODEACTION_ALLOW;
                        }
                }
@@ -96,11 +96,11 @@ class ModuleCensor : public Module
        {
                /* 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 +118,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 +132,28 @@ 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)
-                               {
-                                       chanrec* t = (chanrec*)dest;
-                                       active = t->IsModeSet('G');
-                               }
-                               
-                               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 +162,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