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_gecosban.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'src/modules/m_gecosban.cpp') diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp index 5147a2eb9..934501f41 100644 --- a/src/modules/m_gecosban.cpp +++ b/src/modules/m_gecosban.cpp @@ -21,7 +21,7 @@ class ModuleGecosBan : public Module public: ModuleGecosBan(InspIRCd* Me) : Module(Me) { - Implementation eventlist[] = { I_OnUserPreJoin, I_On005Numeric }; + Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric }; ServerInstance->Modules->Attach(eventlist, this, 2); } @@ -34,21 +34,9 @@ class ModuleGecosBan : public Module return Version("$Id$", VF_COMMON|VF_VENDOR, API_VERSION); } - 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)) - return 0; - - if (!c) - return 0; - - if (c->IsExtBanned(user->fullname, 'r')) - { - 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->fullname, 'r'); } virtual void On005Numeric(std::string &output) -- cgit v1.2.3