cgiirc: Pass hosts to WEBIRC command on rehash. No fucking wonder this never worked...

[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 e1a31b2b73c8b09c966f43ca502fdbf1b9d047eb..eeb5c751dbbaf3f0f32721a72839da912ab58fee 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,7 +21,7 @@ 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);
        }
 
@@ -31,28 +31,18 @@ class ModuleBadChannelExtban : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR,API_VERSION);
+               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;
-
-
+               int rv = 0;
                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 = banmatch_reduce(rv, c->GetExtBanStatus(i->first->name, 'j'));
                }
 
-               return 0;
+               return rv;
        }
 
        virtual void On005Numeric(std::string &output)