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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/modules/m_muteban.cpp b/src/modules/m_muteban.cpp
index de31fb275..11c87976b 100644
--- a/src/modules/m_muteban.cpp
+++ b/src/modules/m_muteban.cpp
@@ -41,7 +41,7 @@ class ModuleQuietBan : public Module
 
 		if (target_type == TYPE_CHANNEL)
 		{
-			if (((Channel *)dest)->IsExtBanned(user, 'm'))
+			if (((Channel *)dest)->GetExtBanStatus(user, 'm') < 0)
 			{
 				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Cannot send to " + ((Channel *)dest)->name + ", as you are muted");
 				return 1;
@@ -58,7 +58,7 @@ class ModuleQuietBan : public Module
 
 		if (target_type == TYPE_CHANNEL)
 		{
-			if (((Channel *)dest)->IsExtBanned(user, 'm'))
+			if (((Channel *)dest)->GetExtBanStatus(user, 'm') < 0)
 			{
 				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Cannot send to " + ((Channel *)dest)->name + ", as you are muted");
 				return 1;