Remove more text<->binary IP conversions, making code more IPv4/IPv6 independent

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

diff --git a/src/modules/m_operinvex.cpp b/src/modules/m_operinvex.cpp
index 5085cfc63379ab9053211874a58337858bc54027..5cd7ab3c6e6b5810bfc71991595fa66547f74d5d 100644 (file)
--- a/src/modules/m_operinvex.cpp
+++ b/src/modules/m_operinvex.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.
@@ -18,23 +18,23 @@
 
 /* $ModDesc: Implements extban/invex +I O: - opertype bans */
 
-class ModuleGecosBan : public Module
+class ModuleOperInvex : public Module
 {
  private:
  public:
-       ModuleGecosBan(InspIRCd* Me) : Module(Me)
+       ModuleOperInvex(InspIRCd* Me) : Module(Me)
        {
-               Implementation eventlist[] = { I_OnUserPreJoin, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric, I_OnCheckInvite };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
-       virtual ~ModuleGecosBan()
+       virtual ~ModuleOperInvex()
        {
        }
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON|VF_VENDOR, API_VERSION);
        }
 
        virtual int OnCheckInvite(User *user, Channel *c)
@@ -55,21 +55,11 @@ class ModuleGecosBan : public Module
                return 0;
        }
 
-       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) || !IS_OPER(user))
-                       return 0;
-
-               if (!c)
+               if (!IS_OPER(user))
                        return 0;
-
-               if (c->IsExtBanned(user->oper, 'O'))
-               {
-                       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->oper, 'O');
        }
 
        virtual void On005Numeric(std::string &output)
@@ -79,5 +69,5 @@ class ModuleGecosBan : public Module
 };
 
 
-MODULE_INIT(ModuleGecosBan)
+MODULE_INIT(ModuleOperInvex)