Add <options:exemptchanops> support to m_censor and m_blockcaps, and tidy up the checks in {block,strip}color, and remove an uneeded abs() on the "flowing backwards" warning.

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

1 files changed, 7 insertions, 0 deletions

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 94ac8d113..4eaf1e3b4 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -140,7 +140,14 @@ class ModuleCensor : public Module
 		if (target_type == TYPE_USER)
 			active = ((User*)dest)->IsModeSet('G');
 		else if (target_type == TYPE_CHANNEL)
+		{
 			active = ((Channel*)dest)->IsModeSet('G');
+			Channel* c = (Channel*)dest;
+			if (CHANOPS_EXEMPT(ServerInstance, 'G') && c->GetStatus(user) == STATUS_OP)
+			{
+				return 0;
+			}
+		}
 
 		if (!active)
 			return 0;