Remove InspIRCd* parameters and fields

[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 19b12d34cdd88cb4219688f1219e438de093ffe3..e8e9215b4eaab87a2a478dd9a34d3f9b437ae6e2 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.
@@ -22,54 +22,28 @@ class ModuleOperInvex : public Module
 {
  private:
  public:
-       ModuleOperInvex(InspIRCd* Me) : Module(Me)
-       {
-               Implementation eventlist[] = { I_OnUserPreJoin, I_On005Numeric, I_OnCheckInvite };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+       ModuleOperInvex()       {
+               Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       virtual ~ModuleOperInvex()
+       ~ModuleOperInvex()
        {
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON|VF_VENDOR, API_VERSION);
+               return Version("ExtBan 'O' - oper type ban", VF_COMMON|VF_VENDOR);
        }
 
-       virtual int OnCheckInvite(User *user, Channel *c)
+       ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
        {
-               if (!IS_LOCAL(user) || !IS_OPER(user))
-                       return 0;
-
-               Module* ExceptionModule = ServerInstance->Modules->Find("m_inviteexception.so");
-               if (ExceptionModule)
+               if (mask[0] == 'O' && mask[1] == ':')
                {
-                       if (ListModeRequest(this, ExceptionModule, user->oper, 'O', c).Send())
-                       {
-                               // Oper type is exempt
-                               return 1;
-                       }
+                       if (IS_OPER(user) && InspIRCd::Match(user->oper, mask.substr(2)))
+                               return MOD_RES_DENY;
                }
-
-               return 0;
-       }
-
-       virtual int OnUserPreJoin(User *user, Channel *c, const char *cname, std::string &privs, const std::string &key)
-       {
-               if (!IS_LOCAL(user) || !IS_OPER(user))
-                       return 0;
-
-               if (!c)
-                       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 MOD_RES_PASSTHRU;
        }
 
        virtual void On005Numeric(std::string &output)