Change match direction of extbans to allow stacking

This allows you create stacked bans like:
	+b m:r:*bot* to mute anyone with bot in their gecos
	+e S:j:+#staff to allow voices in #staff to use color

It also deprecates extban M, which can be implemented using m:R:

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

1 files changed, 26 insertions, 7 deletions

diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp
index 727ab15a3..387aeb2b9 100644
--- a/src/modules/m_channelban.cpp
+++ b/src/modules/m_channelban.cpp
@@ -31,18 +31,37 @@ class ModuleBadChannelExtban : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Extban 'j' - channel status/join ban", VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
-	ModResult OnCheckBan(User *user, Channel *c)
+	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
 	{
-		ModResult rv;
-		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+		if (mask[0] == 'j' && mask[1] == ':')
 		{
-			rv = rv + c->GetExtBanStatus((*i)->name, 'j');
+			std::string rm = mask.substr(2);
+			char status = 0;
+			ModeHandler* mh = ServerInstance->Modes->FindPrefix(rm[0]);
+			if (mh)
+			{
+				rm = mask.substr(3);
+				status = mh->GetModeChar();
+			}
+			for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+			{
+				if (InspIRCd::Match((**i).name, rm))
+				{
+					if (status)
+					{
+						Membership* memb = c->GetUser(user);
+						if (memb->hasMode(status))
+							return MOD_RES_DENY;
+					}
+					else
+						return MOD_RES_DENY;
+				}
+			}
 		}
-
-		return rv;
+		return MOD_RES_PASSTHRU;
 	}
 
 	void On005Numeric(std::string &output)