X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=c5dc35fe371b52fc1881a6686716b3fdc2c52772;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=3e97f82877b6c7b85d4e65f69ef18a37a3c96acb;hpb=f3abcf2bcfe36d3389b74caa9eef8582901fbe15;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 3e97f8287..c5dc35fe3 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -1,93 +1,86 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013, 2017, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2018 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Shawn Smith <ShawnSmith0828@gmail.com>
+ *   Copyright (C) 2012 DjSlash <djslash@djslash.org>
+ *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
  *
- * 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: Provides support for unreal-style channel mode +c */
+#include "inspircd.h"
+#include "modules/exemption.h"
 
-/** Handles the +c channel mode
- */
-class BlockColor : public SimpleChannelModeHandler
+class ModuleBlockColor : public Module
 {
+	CheckExemption::EventProvider exemptionprov;
+	SimpleChannelModeHandler bc;
  public:
-	BlockColor(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'c') { }
-};
 
-class ModuleBlockColour : public Module
-{
-	bool AllowChanOps;	
-	BlockColor *bc;
- public:
- 
-	ModuleBlockColour(InspIRCd* Me) : Module(Me)
+	ModuleBlockColor()
+		: exemptionprov(this)
+		, bc(this, "blockcolor", 'c')
 	{
-		bc = new BlockColor(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(bc))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
+	{
+		tokens["EXTBAN"].push_back('c');
+	}
 
-
-	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
-		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
+		if ((target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
-			Channel* c = (Channel*)dest;
+			Channel* c = target.Get<Channel>();
 
-			if (CHANOPS_EXEMPT(ServerInstance, 'c') && c->GetStatus(user) == STATUS_OP)
-			{
-				return 0;
-			}
-			
-			if(c->IsModeSet('c'))
+			ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcolor");
+			if (res == MOD_RES_ALLOW)
+				return MOD_RES_PASSTHRU;
+
+			bool modeset = c->IsModeSet(bc);
+			if (!c->GetExtBanStatus(user, 'c').check(!modeset))
 			{
-				for (std::string::iterator i = text.begin(); i != text.end(); i++)
+				for (std::string::iterator i = details.text.begin(); i != details.text.end(); i++)
 				{
-					switch (*i)
+					// Block all control codes except \001 for CTCP
+					if ((*i >= 0) && (*i < 32) && (*i != 1))
 					{
-						case 2:
-						case 3:
-						case 15:
-						case 21:
-						case 22:
-						case 31:
-							user->WriteNumeric(404, "%s %s :Can't send colours to channel (+c set)",user->nick, c->name);
-							return 1;
-						break;
+						if (modeset)
+							user->WriteNumeric(Numerics::CannotSendTo(c, "messages containing formatting characters", &bc));
+						else
+							user->WriteNumeric(Numerics::CannotSendTo(c, "messages containing formatting characters", 'c', "nocolor"));
+						return MOD_RES_DENY;
 					}
 				}
 			}
 		}
-		return 0;
-	}
-	
-	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-	{
-		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleBlockColour()
-	{
-		ServerInstance->Modes->DelMode(bc);
-		delete bc;
-	}
-	
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Adds channel mode c (blockcolor) which allows channels to block messages which contain IRC formatting codes.",VF_VENDOR);
 	}
 };
 
-MODULE_INIT(ModuleBlockColour)
+MODULE_INIT(ModuleBlockColor)