X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=0b5736f6406b627c046a8545a9d2e867c24d85b7;hb=4132a44396d8fa3d23f87b5cbea5b928aa09769f;hp=0a64a75b55683a8b6314b4fc65f9196f082826a2;hpb=f62654a6859998f9d63eb22702c572d5ebcff15c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 0a64a75b5..0b5736f64 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -21,25 +21,21 @@
 
 
 #include "inspircd.h"
-
-
-/** Handles the +B channel mode
- */
-class BlockCaps : public SimpleChannelModeHandler
-{
- public:
-	BlockCaps(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcaps", 'B') { }
-};
+#include "modules/exemption.h"
 
 class ModuleBlockCAPS : public Module
 {
-	BlockCaps bc;
+	CheckExemption::EventProvider exemptionprov;
+	SimpleChannelModeHandler bc;
 	unsigned int percent;
 	unsigned int minlen;
-	char capsmap[256];
+	std::bitset<UCHAR_MAX> lowercase;
+	std::bitset<UCHAR_MAX> uppercase;
 
 public:
-	ModuleBlockCAPS() : bc(this)
+	ModuleBlockCAPS()
+		: exemptionprov(this)
+		, bc(this, "blockcaps", 'B')
 	{
 	}
 
@@ -48,33 +44,61 @@ public:
 		tokens["EXTBAN"].push_back('B');
 	}
 
-	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
-		if (target_type == TYPE_CHANNEL)
+		if (target.type == MessageTarget::TYPE_CHANNEL)
 		{
-			if ((!IS_LOCAL(user)) || (text.length() < minlen))
+			if (!IS_LOCAL(user))
 				return MOD_RES_PASSTHRU;
 
-			Channel* c = (Channel*)dest;
-			ModResult res = ServerInstance->OnCheckExemption(user,c,"blockcaps");
+			Channel* c = target.Get<Channel>();
+			ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcaps");
 
 			if (res == MOD_RES_ALLOW)
 				return MOD_RES_PASSTHRU;
 
 			if (!c->GetExtBanStatus(user, 'B').check(!c->IsModeSet(bc)))
 			{
-				std::string::size_type caps = 0;
-				unsigned int offset = 0;
-				// Ignore the beginning of the text if it's a CTCP ACTION (/me)
-				if (!text.compare(0, 8, "\1ACTION ", 8))
-					offset = 8;
+				// 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')
+				{
+					// If the CTCP is not an action then skip it.
+					if (details.text.compare(0, 8, "\1ACTION ", 8))
+						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);
+				if (length < minlen)
+					return MOD_RES_PASSTHRU;
 
-				for (std::string::const_iterator i = text.begin() + offset; i != text.end(); ++i)
-					caps += capsmap[(unsigned char)*i];
+				// 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)
+				{
+					unsigned char chr = static_cast<unsigned char>(*iter);
+					if (uppercase.test(chr))
+						upper += 1;
+					else if (!lowercase.test(chr))
+						length -= 1;
+				}
 
-				if (((caps * 100) / text.length()) >= percent)
+				// Calculate the percentage which is upper case. If the
+				// message was entirely symbols then it can't contain
+				// any upper case letters.
+				if (length > 0 && round((upper * 100) / length) >= percent)
 				{
-					user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s :Your message cannot contain more than %d%% capital letters if it's longer than %d characters", c->name.c_str(), percent, minlen);
+					user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, InspIRCd::Format("Your message cannot contain %d%% or more capital letters if it's longer than %d characters", percent, minlen));
 					return MOD_RES_DENY;
 				}
 			}
@@ -87,10 +111,16 @@ public:
 		ConfigTag* tag = ServerInstance->Config->ConfValue("blockcaps");
 		percent = tag->getInt("percent", 100, 1, 100);
 		minlen = tag->getInt("minlen", 1, 1, ServerInstance->Config->Limits.MaxLine);
-		std::string hmap = tag->getString("capsmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
-		memset(capsmap, 0, sizeof(capsmap));
-		for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
-			capsmap[(unsigned char)*n] = 1;
+
+		lowercase.reset();
+		const std::string lower = tag->getString("lowercase", "abcdefghijklmnopqrstuvwxyz");
+		for (std::string::const_iterator iter = lower.begin(); iter != lower.end(); ++iter)
+			lowercase.set(static_cast<unsigned char>(*iter));
+
+		uppercase.reset();
+		const std::string upper = tag->getString("uppercase", tag->getString("capsmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZ"));
+		for (std::string::const_iterator iter = upper.begin(); iter != upper.end(); ++iter)
+			uppercase.set(static_cast<unsigned char>(*iter));
 	}
 
 	Version GetVersion() CXX11_OVERRIDE