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, 7 insertions, 21 deletions

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index b8f7f2415..2205ed03d 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -56,32 +56,18 @@ class ModuleOperChans : public Module
 		oc = new OperChans(ServerInstance);
 		if (!ServerInstance->Modes->AddMode(oc))
 			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnUserPreJoin };
+		Implementation eventlist[] = { I_OnCheckBan };
 		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
 
-	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+	virtual int OnCheckBan(User* user, Channel* chan)
 	{
-		if (!IS_OPER(user))
-		{
-			if (chan)
-			{
-				if (chan->IsModeSet('O'))
-				{
-					user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
-					return 1;
-				}
-			}
-		}
-		else
-		{
-			if (chan && chan->IsExtBanned(user->oper, 'O'))
-			{
-				user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  chan->name.c_str());
-				return 1;
-			}
-		}
+		if (IS_OPER(user))
+			return chan->GetExtBanStatus(user->oper, 'O');
+
+		if (chan->IsModeSet('O'))
+			return -1;
 
 		return 0;
 	}