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

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

diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp
index 49ca17fe0cc72a94cd40a14636df65433e1c3f60..6ecd413422569873704055ce168305b60b361559 100644 (file)
--- a/src/modules/m_gecosban.cpp
+++ b/src/modules/m_gecosban.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -15,52 +15,36 @@
 
 /* $ModDesc: Implements extban +b r: - realname (gecos) bans */
 
-class ModuleNickBan : public Module
+class ModuleGecosBan : public Module
 {
  private:
  public:
-       ModuleNickBan(InspIRCd* Me) : Module(Me)
+       ModuleGecosBan(InspIRCd* Me) : Module(Me)
        {
-               Implementation eventlist[] = { I_OnUserPreJoin, I_On005Numeric };
+               Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       virtual ~ModuleNickBan()
+       virtual ~ModuleGecosBan()
        {
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,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;
-
-               if (c->IsExtBanned(user->fullname, 'r'))
-               {
-                       // XXX: send a numeric here
-                       user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Cannot join " + c->name + ", as you match a ban");
-                       return 1;
-               }
-
-               return 0;
+               return c->GetExtBanStatus(user->fullname, 'r');
        }
 
        virtual void On005Numeric(std::string &output)
        {
-               if (output.find(" EXTBAN=:") == std::string::npos)
-                       output.append(" EXTBAN=:r");
-               else
-                       output.insert(output.find(" EXTBAN=:") + 9, "r");
+               ServerInstance->AddExtBanChar('r');
        }
 };
 
 
-MODULE_INIT(ModuleNickBan)
+MODULE_INIT(ModuleGecosBan)