Replace hardcoded mode letters, part 3

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

diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp
index 8caae0a961bada8281296af786d1c27617f90cb7..50df8a782c47a1baada86220593f8017d2129bd8 100644 (file)
--- a/src/modules/m_channelban.cpp
+++ b/src/modules/m_channelban.cpp
@@ -1,56 +1,73 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Implements extban +b j: - matching channel bans */
+#include "inspircd.h"
 
 class ModuleBadChannelExtban : public Module
 {
- private:
  public:
-       ModuleBadChannelExtban(InspIRCd* Me) : Module(Me)
+       void init() CXX11_OVERRIDE
        {
                Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       virtual ~ModuleBadChannelExtban()
+       Version GetVersion() CXX11_OVERRIDE
        {
+               return Version("Extban 'j' - channel status/join ban", VF_OPTCOMMON|VF_VENDOR);
        }
 
-       virtual Version GetVersion()
+       ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE
        {
-               return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
-       }
-
-       virtual int OnCheckBan(User *user, Channel *c)
-       {
-               int rv = 0;
-               for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+               if ((mask.length() > 2) && (mask[0] == 'j') && (mask[1] == ':'))
                {
-                       rv = banmatch_reduce(rv, c->GetExtBanStatus(i->first->name, 'j'));
+                       std::string rm = mask.substr(2);
+                       char status = 0;
+                       ModeHandler* mh = ServerInstance->Modes->FindPrefix(rm[0]);
+                       if (mh)
+                       {
+                               rm = mask.substr(3);
+                               status = mh->GetModeChar();
+                       }
+                       for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+                       {
+                               if (InspIRCd::Match((**i).name, rm))
+                               {
+                                       if (status)
+                                       {
+                                               Membership* memb = (**i).GetUser(user);
+                                               if (memb && memb->hasMode(status))
+                                                       return MOD_RES_DENY;
+                                       }
+                                       else
+                                               return MOD_RES_DENY;
+                               }
+                       }
                }
-
-               return rv;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual void On005Numeric(std::string &output)
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               ServerInstance->AddExtBanChar('j');
+               tokens["EXTBAN"].push_back('j');
        }
 };
 
-
 MODULE_INIT(ModuleBadChannelExtban)
-