Eliminate duplicate names between user and channel modes

[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 7d57466cd2ba33f417b9f7e8b8d1c94d15e5be1b..1a3030c0be0a4355f28a7d25e7d9437ecbc71065 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-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -19,39 +19,31 @@ class ModuleServerBan : public Module
 {
  private:
  public:
-       ModuleServerBan(InspIRCd* Me) : Module(Me)
-       {
-               Implementation eventlist[] = { I_OnUserPreJoin, I_On005Numeric };
+       ModuleServerBan()       {
+               Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       virtual ~ModuleServerBan()
+       ~ModuleServerBan()
        {
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
-               return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+               return Version("Extban 's' - server ban",VF_OPTCOMMON|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->server, 's'))
+               if (mask[0] == 's' && 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->server, 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('s');
        }