...because every now and again, i have to do a massive commit.

[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 c8e9884d52c1ff3b661170d7697905eae61b1c59..c60073b7000a108443acfa425a6da2effbf7de79 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-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -17,46 +17,36 @@
 
 class ModuleGecosBan : public Module
 {
- private:
  public:
-       ModuleGecosBan(InspIRCd* Me) : Module(Me)
+       ModuleGecosBan()
        {
-               Implementation eventlist[] = { I_OnUserPreJoin, I_On005Numeric };
+               Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       virtual ~ModuleGecosBan()
+       ~ModuleGecosBan()
        {
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("Extban 'r' - realname (gecos) ban", VF_COMMON|VF_VENDOR);
        }
 
-       virtual int OnUserPreJoin(User *user, Channel *c, const char *cname, std::string &privs, const std::string &key)
+       ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
        {
-               if (!IS_LOCAL(user))
-                       return 0;
-
-               if (!c)
-                       return 0;
-
-               if (c->IsExtBanned(user->fullname, 'r'))
+               if (mask[0] == 'r' && mask[1] == ':')
                {
-                       user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  c->name.c_str());
-                       return 1;
+                       if (InspIRCd::Match(user->fullname, mask.substr(2)))
+                               return MOD_RES_DENY;
                }
-
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual void On005Numeric(std::string &output)
+       void On005Numeric(std::string &output)
        {
                ServerInstance->AddExtBanChar('r');
        }
 };
 
-
 MODULE_INIT(ModuleGecosBan)
-