X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=420163a74b5377e07972b9c08032fd662bf69df8;hb=8df3d792bc99d9dd73db7a601ebe8d4a397c3522;hp=b79e126a3e5658b0f8cb03f0eb295b7d585eb36f;hpb=35b70631f0532a5828b04a8e0c02092a285f331a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index b79e126a3..420163a74 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -1,10 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2006, 2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2006-2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2013, 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 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, 2008-2009 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -60,31 +64,26 @@ public:
 			if (!c->GetExtBanStatus(user, 'B').check(!c->IsModeSet(bc)))
 			{
 				// If the message is a CTCP then we skip it unless it is
-				// an ACTION in which case we strip the prefix and suffix.
-				std::string::const_iterator text_begin = details.text.begin();
-				std::string::const_iterator text_end = details.text.end();
-				if (details.text[0] == '\1')
+				// an ACTION in which case we just check against the body.
+				std::string ctcpname;
+				std::string message(details.text);
+				if (details.IsCTCP(ctcpname, message))
 				{
 					// If the CTCP is not an action then skip it.
-					if (details.text.compare(0, 8, "\1ACTION ", 8))
+					if (!irc::equals(ctcpname, "ACTION"))
 						return MOD_RES_PASSTHRU;
-
-					// Skip the CTCP message characters.
-					text_begin += 8;
-					if (*details.text.rbegin() == '\1')
-						text_end -= 1;
 				}
 
 				// If the message is shorter than the minimum length
 				// then we don't need to do anything else.
-				size_t length = std::distance(text_begin, text_end);
+				size_t length = message.length();
 				if (length < minlen)
 					return MOD_RES_PASSTHRU;
 
 				// Count the characters to see how many upper case and
 				// ignored (non upper or lower) characters there are.
 				size_t upper = 0;
-				for (std::string::const_iterator iter = text_begin; iter != text_end; ++iter)
+				for (std::string::const_iterator iter = message.begin(); iter != message.end(); ++iter)
 				{
 					unsigned char chr = static_cast<unsigned char>(*iter);
 					if (uppercase.test(chr))