Add +f (chanfilter) to <options:exemptchanops>

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7019 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/docs/inspircd.conf.example b/docs/inspircd.conf.example
index e37088f10d3573d25885a7034c6d923a641ac029..4a3fa3dcaae227bc9677f4a22bce29517a71ca02 100644 (file)
--- a/docs/inspircd.conf.example
+++ b/docs/inspircd.conf.example
@@ -909,7 +909,7 @@
          quietbursts="yes"
          pingwarning="15"
          allowhalfop="yes"
-        exemptchanops="Sc">
+        exemptchanops="Scf">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#- TIME SYNC OPTIONS -#-#-#-#-#-#-#-#-#-#-#-#
 # Time sychronization options for m_spanningtree linking.             #

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index e21ac8ca41837d98c68048718141d7a995f27075..d9e2f84f05ae6a6a44575f5c5efc793c4508d774 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -92,7 +92,7 @@ class ModuleChanFilter : public Module
 
        virtual int ProcessMessages(userrec* user,chanrec* chan,std::string &text)
        {
-               if (!IS_LOCAL(user))
+               if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'g') && chan->->GetStatus(user) == STATUS_OP)
                        return 0;
 
                // Create a copy of the string in irc::string
@@ -112,6 +112,7 @@ class ModuleChanFilter : public Module
                                }
                        }
                }
+
                return 0;
        }