X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_channelban.cpp;h=08b994566019e3683fded6f8c6daa50b04e2b729;hb=d38595e7e14e7509e744d33df657d50d00cc201f;hp=eeb5c751dbbaf3f0f32721a72839da912ab58fee;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp
index eeb5c751d..08b994566 100644
--- a/src/modules/m_channelban.cpp
+++ b/src/modules/m_channelban.cpp
@@ -1,56 +1,66 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2013 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012, 2014-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   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)
-	{
-		Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
-	}
-
-	virtual ~ModuleBadChannelExtban()
+	Version GetVersion() CXX11_OVERRIDE
 	{
+		return Version("Adds the j extended ban which checks whether users are in a channel matching the specified glob pattern.", 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, 2);
+			char status = 0;
+			const PrefixMode* const mh = ServerInstance->Modes->FindPrefix(rm[0]);
+			if (mh)
+			{
+				rm.assign(mask, 3, std::string::npos);
+				status = mh->GetModeChar();
+			}
+			for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); i++)
+			{
+				if (InspIRCd::Match((*i)->chan->name, rm))
+				{
+					if ((!status) || ((*i)->HasMode(mh)))
+						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)
-