The last commit never happened.

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

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index c4a69cc10dfd4e5f90ee4dbd09737b3f84c43911..3c16b013d0550aba81666a84608b2fb70331df2a 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -70,7 +70,8 @@ class ModuleChanFilter : public Module
                : Module::Module(Me)
        {
                cf = new ChanFilter(ServerInstance);
-               ServerInstance->AddMode(cf, 'g');
+               if (!ServerInstance->AddMode(cf, 'g'))
+                       throw ModuleException("Could not add new modes!");
        }
 
        void Implements(char* List) 
@@ -84,13 +85,16 @@ class ModuleChanFilter : public Module
                cf->DoChannelDelete(chan);
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                cf->DoRehash();
        }
 
        virtual int ProcessMessages(userrec* user,chanrec* chan,std::string &text)
        {
+               if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP)
+                       return 0;
+
                // Create a copy of the string in irc::string
                irc::string line = text.c_str();
 
@@ -108,6 +112,7 @@ class ModuleChanFilter : public Module
                                }
                        }
                }
+
                return 0;
        }