From bd12e3a4e6501496f6eeb7aeb5245162020d6e6c Mon Sep 17 00:00:00 2001
From: danieldg
Date: Sat, 14 Mar 2009 20:48:43 +0000
Subject: Extban rework: allow exceptions to override bans on join

Move all bans that prevent a user from joining the channel to OnCheckBan,
then stack their return results to allow an exception to override a ban.

This does not make join exceptions override any other exception like mute.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11222 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/modules/m_services_account.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'src/modules/m_services_account.cpp')

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index a763e8e68..59e7ec2e4 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -116,7 +116,7 @@ class ModuleServicesAccount : public Module
 		if (!ServerInstance->Modes->AddMode(m1) || !ServerInstance->Modes->AddMode(m2) || !ServerInstance->Modes->AddMode(m3) || !ServerInstance->Modes->AddMode(m4) || !ServerInstance->Modes->AddMode(m5))
 			throw ModuleException("Some other module has claimed our modes!");
 
-		Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin,
+		Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, I_OnCheckBan,
 			I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick };
 
 		ServerInstance->Modules->Attach(eventlist, this, 10);
@@ -186,7 +186,7 @@ class ModuleServicesAccount : public Module
 
 			if (account)
 			{
-				if (c->IsExtBanned(*account, 'M'))
+				if (c->GetExtBanStatus(*account, 'M') < 0)
 				{
 					// may not speak (text is deliberately vague, so they don't know which restriction to evade)
 					user->WriteNumeric(477, ""+std::string(user->nick)+" "+std::string(c->name)+" :You may not speak in this channel");
@@ -208,6 +208,14 @@ class ModuleServicesAccount : public Module
 		return 0;
 	}
 
+	virtual int OnCheckBan(User* user, Channel* chan)
+	{
+		std::string* account;
+		if (!user->GetExt("accountname", account))
+			return 0;
+		return chan->GetExtBanStatus(*account, 'R');
+	}
+
 	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
@@ -239,16 +247,6 @@ class ModuleServicesAccount : public Module
 					return 1;
 				}
 			}
-
-			if (account)
-			{
-				if (chan->IsExtBanned(*account, 'R'))
-				{
-					// may not join
-					user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  chan->name.c_str());
-					return 1;
-				}
-			}
 		}
 		return 0;
 	}
-- 
cgit v1.3.1-10-gc9f91