This file *BROKEN AGAIN* in windows builds (VC9) - uint_16t and uint_32t do not exist...

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

diff --git a/src/modules/m_serverban.cpp b/src/modules/m_serverban.cpp
index e6fda051cfffec7828db19b3997f23b4ce49c7e9..241ac1ce3236a5cb04805035b310f65fa9f1f794 100644 (file)
--- a/src/modules/m_serverban.cpp
+++ b/src/modules/m_serverban.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.
@@ -21,7 +21,7 @@ class ModuleServerBan : public Module
  public:
        ModuleServerBan(InspIRCd* Me) : Module(Me)
        {
-               Implementation eventlist[] = { I_OnUserPreJoin, I_On005Numeric };
+               Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
@@ -31,25 +31,12 @@ class ModuleServerBan : public Module
 
        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->server, 's'))
-               {
-                       // 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->server, 's');
        }
 
        virtual void On005Numeric(std::string &output)