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, 4 insertions, 14 deletions

diff --git a/src/modules/m_operinvex.cpp b/src/modules/m_operinvex.cpp
index 19b12d34c..1952d4296 100644
--- a/src/modules/m_operinvex.cpp
+++ b/src/modules/m_operinvex.cpp
@@ -24,7 +24,7 @@ class ModuleOperInvex : public Module
  public:
 	ModuleOperInvex(InspIRCd* Me) : Module(Me)
 	{
-		Implementation eventlist[] = { I_OnUserPreJoin, I_On005Numeric, I_OnCheckInvite };
+		Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric, I_OnCheckInvite };
 		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
@@ -55,21 +55,11 @@ class ModuleOperInvex : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreJoin(User *user, Channel *c, const char *cname, std::string &privs, const std::string &key)
+	virtual int OnCheckBan(User *user, Channel *c)
 	{
-		if (!IS_LOCAL(user) || !IS_OPER(user))
-			return 0;
-
-		if (!c)
+		if (!IS_OPER(user))
 			return 0;
-
-		if (c->IsExtBanned(user->oper, 'O'))
-		{
-			user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  c->name.c_str());
-			return 1;
-		}
-
-		return 0;
+		return c->GetExtBanStatus(user->oper, 'O');
 	}
 
 	virtual void On005Numeric(std::string &output)