summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/inspircd.conf.example2
-rw-r--r--src/modules/m_chanfilter.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/inspircd.conf.example b/docs/inspircd.conf.example
index e37088f10..4a3fa3dca 100644
--- 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 e21ac8ca4..d9e2f84f0 100644
--- 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;
}