Replace OnAccessCheck with OnPreMode to remove a number of redundant checks

[user/henk/code/inspircd.git] / src / modules / m_channelban.cpp

diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp
index def17bdb5981a682f00c32bc1942c2f90d5cc6be..727ab15a39b05c898df0f2eea86c09c7771ad4ff 100644 (file)
--- a/src/modules/m_channelban.cpp
+++ b/src/modules/m_channelban.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -21,41 +21,31 @@ class ModuleBadChannelExtban : public Module
  public:
        ModuleBadChannelExtban(InspIRCd* Me) : Module(Me)
        {
-               Implementation eventlist[] = { I_OnUserPreJoin, I_On005Numeric };
+               Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       virtual ~ModuleBadChannelExtban()
+       ~ModuleBadChannelExtban()
        {
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
                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)
+       ModResult OnCheckBan(User *user, Channel *c)
        {
-               if (!IS_LOCAL(user))
-                       return 0;
-
-               if (!c)
-                       return 0;
-
-
+               ModResult rv;
                for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
                {
-                       if (c->IsExtBanned(i->first->name, 'j'))
-                       {
-                               user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  c->name.c_str());
-                               return 1;
-                       }
+                       rv = rv + c->GetExtBanStatus((*i)->name, 'j');
                }
 
-               return 0;
+               return rv;
        }
 
-       virtual void On005Numeric(std::string &output)
+       void On005Numeric(std::string &output)
        {
                ServerInstance->AddExtBanChar('j');
        }