X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_channelban.cpp;h=f1679bd5d26dc4d6d8515598453957ec2b9dc6c8;hb=ad797e3a77c69791c02db6d238817d3e23821dec;hp=1987a982eb53099d5ab9bdc961126e17873d91d7;hpb=4ab1c43c1eee708fc50a4808f714a731891b75e8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp
index 1987a982e..f1679bd5d 100644
--- a/src/modules/m_channelban.cpp
+++ b/src/modules/m_channelban.cpp
@@ -1,6 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   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>
  *
@@ -20,45 +25,31 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Implements extban +b j: - matching channel bans */
-
 class ModuleBadChannelExtban : public Module
 {
  public:
-	void init() CXX11_OVERRIDE
-	{
-		Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Extban 'j' - channel status/join ban", VF_OPTCOMMON|VF_VENDOR);
+		return Version("Adds the j: extended ban which checks whether users are in a channel matching the specified glob pattern.", VF_OPTCOMMON|VF_VENDOR);
 	}
 
 	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE
 	{
 		if ((mask.length() > 2) && (mask[0] == 'j') && (mask[1] == ':'))
 		{
-			std::string rm = mask.substr(2);
+			std::string rm(mask, 2);
 			char status = 0;
-			ModeHandler* mh = ServerInstance->Modes->FindPrefix(rm[0]);
+			const PrefixMode* const mh = ServerInstance->Modes->FindPrefix(rm[0]);
 			if (mh)
 			{
-				rm = mask.substr(3);
+				rm.assign(mask, 3, std::string::npos);
 				status = mh->GetModeChar();
 			}
-			for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+			for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); i++)
 			{
-				if (InspIRCd::Match((**i).name, rm))
+				if (InspIRCd::Match((*i)->chan->name, rm))
 				{
-					if (status)
-					{
-						Membership* memb = (**i).GetUser(user);
-						if (memb && memb->hasMode(status))
-							return MOD_RES_DENY;
-					}
-					else
+					if ((!status) || ((*i)->HasMode(mh)))
 						return MOD_RES_DENY;
 				}
 			}