Replace strip/blockcolor tags with <options:exemptchanops>, sexy string of modes to exempt chanops from (currently Sc are supported).

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

3 files changed, 14 insertions, 22 deletions

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 1bc530b9b..6e728c311 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -341,6 +341,14 @@ bool ValidateModeLists(ServerConfig* conf, const char* tag, const char* value, V
 	return true;
 }
 
+bool ValidateExemptChanOps(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+{
+	memset(conf->ExemptChanOps, 0, 256);
+	for (const unsigned char* x = (const unsigned char*)data.GetString(); *x; ++x)
+		conf->ExemptChanOps[*x] = true;
+	return true;
+}
+
 bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
 	conf->WhoWasMaxKeep = conf->GetInstance()->Duration(data.GetString());
@@ -567,6 +575,7 @@ void ServerConfig::Read(bool bail, userrec* user)
 	static char debug[MAXBUF];	/* Temporary buffer for debugging value */
 	static char maxkeep[MAXBUF];	/* Temporary buffer for WhoWasMaxKeep value */
 	static char hidemodes[MAXBUF];	/* Modes to not allow listing from users below halfop */
+	static char exemptchanops[MAXBUF];	/* Exempt channel ops from these modes */
 	int rem = 0, add = 0;		/* Number of modules added, number of modules removed */
 	std::ostringstream errstr;	/* String stream containing the error output */
 
@@ -613,6 +622,7 @@ void ServerConfig::Read(bool bail, userrec* user)
 		{"options",	"announceinvites", "1",			new ValueContainerBool (&this->AnnounceInvites),	DT_BOOLEAN, NoValidation},
 		{"options",	"hostintopic",	"1",			new ValueContainerBool (&this->FullHostInTopic),	DT_BOOLEAN, NoValidation},
 		{"options",	"hidemodes",	"",			new ValueContainerChar (hidemodes),			DT_CHARPTR, ValidateModeLists},
+		{"options",	"exemptchanops","",			new ValueContainerChar (exemptchanops),			DT_CHARPTR, ValidateExemptChanOps},
 		{"pid",		"file",		"",			new ValueContainerChar (this->PID),			DT_CHARPTR, NoValidation},
 		{"whowas",	"groupsize",	"10",			new ValueContainerInt  (&this->WhoWasGroupSize),	DT_INTEGER, NoValidation},
 		{"whowas",	"maxgroups",	"10240",		new ValueContainerInt  (&this->WhoWasMaxGroups),	DT_INTEGER, NoValidation},
diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index a40d4ebd3..219637fb9 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -61,23 +61,14 @@ class ModuleBlockColour : public Module
 		bc = new BlockColor(ServerInstance);
 		if (!ServerInstance->AddMode(bc, 'c'))
 			throw ModuleException("Could not add new modes!");
-
-		OnRehash(NULL, "");
 	}
 
 	void Implements(char* List)
 	{
-		List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
 	}
 
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
-	{
-		ConfigReader Conf(ServerInstance);
-
-		AllowChanOps = Conf.ReadFlag("blockcolor", "allowchanops", 0);
-	}
-
 	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
@@ -86,7 +77,7 @@ class ModuleBlockColour : public Module
 			
 			if(c->IsModeSet('c'))
 			{
-				if (!AllowChanOps || AllowChanOps && c->GetStatus(user) != STATUS_OP)
+				if (!CHANOPS_EXEMPT(ServerInstance, 'c') || CHANOPS_EXEMPT(ServerInstance, 'c') && c->GetStatus(user) != STATUS_OP)
 				{
 					for (std::string::iterator i = text.begin(); i != text.end(); i++)
 					{
diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index e2f7482a9..76bc56ef5 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -92,8 +92,6 @@ class ModuleStripColor : public Module
  public:
 	ModuleStripColor(InspIRCd* Me) : Module::Module(Me)
 	{
-		OnRehash(NULL, "");
-
 		usc = new UserStripColor(ServerInstance);
 		csc = new ChannelStripColor(ServerInstance);
 
@@ -103,7 +101,7 @@ class ModuleStripColor : public Module
 
 	void Implements(char* List)
 	{
-		List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
 	}
 
 	virtual ~ModuleStripColor()
@@ -164,13 +162,6 @@ class ModuleStripColor : public Module
 		}
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
-	{
-		ConfigReader Conf(ServerInstance);
-
-		AllowChanOps = Conf.ReadFlag("stripcolor", "allowchanops", 0);
-	}
-	
 	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (!IS_LOCAL(user))
@@ -188,7 +179,7 @@ class ModuleStripColor : public Module
 
 			// check if we allow ops to bypass filtering, if we do, check if they're opped accordingly.
 			// note: short circut logic here, don't wreck it. -- w00t
-			if (!AllowChanOps || AllowChanOps && t->GetStatus(user) != STATUS_OP)
+			if (!CHANOPS_EXEMPT(ServerInstance, 'S') || CHANOPS_EXEMPT(ServerInstance, 'S') && t->GetStatus(user) != STATUS_OP)
 				active = t->IsModeSet('S');
 		}