1 files changed, 63 insertions, 80 deletions

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 7146ee068..fa780427c 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -21,83 +21,79 @@
 
 
 #include "inspircd.h"
-
-/* $ModDesc: Provides support to block all-CAPS channel messages and notices */
-
-
-/** 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;
-	int percent;
+	CheckExemption::EventProvider exemptionprov;
+	SimpleChannelModeHandler bc;
+	unsigned int percent;
 	unsigned int minlen;
-	char capsmap[256];
-public:
+	std::bitset<UCHAR_MAX> lowercase;
+	std::bitset<UCHAR_MAX> uppercase;
 
-	ModuleBlockCAPS() : bc(this)
-	{
-	}
-
-	void init()
-	{
-		OnRehash(NULL);
-		ServerInstance->Modules->AddService(bc);
-		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
-	virtual void On005Numeric(std::string &output)
+public:
+	ModuleBlockCAPS()
+		: exemptionprov(this)
+		, bc(this, "blockcaps", 'B')
 	{
-		ServerInstance->AddExtBanChar('B');
 	}
 
-	virtual void OnRehash(User* user)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		ReadConf();
+		tokens["EXTBAN"].push_back('B');
 	}
 
-	virtual ModResult 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)
+		if (target.type == MessageTarget::TYPE_CHANNEL)
 		{
-			if ((!IS_LOCAL(user)) || (text.length() < minlen) || (text == "\1ACTION\1") || (text == "\1ACTION"))
+			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('B')))
+			if (!c->GetExtBanStatus(user, 'B').check(!c->IsModeSet(bc)))
 			{
-				int caps = 0;
-				const char* actstr = "\1ACTION ";
-				int act = 0;
+				// If the message is a CTCP then we skip it unless it is
+				// 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 (!irc::equals(ctcpname, "ACTION"))
+						return MOD_RES_PASSTHRU;
+				}
 
-				for (std::string::iterator i = text.begin(); i != text.end(); i++)
+				// If the message is shorter than the minimum length
+				// then we don't need to do anything else.
+				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 = message.begin(); iter != message.end(); ++iter)
 				{
-					/* Smart fix for suggestion from Jobe, ignore CTCP ACTION (part of /ME) */
-					if (*actstr && *i == *actstr++ && act != -1)
-					{
-						act++;
-						continue;
-					}
-					else
-						act = -1;
-
-					caps += capsmap[(unsigned char)*i];
+					unsigned char chr = static_cast<unsigned char>(*iter);
+					if (uppercase.test(chr))
+						upper += 1;
+					else if (!lowercase.test(chr))
+						length -= 1;
 				}
-				if ( ((caps*100)/(int)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 %s :Your message cannot contain more than %d%% capital letters if it's longer than %d characters", user->nick.c_str(), 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;
 				}
 			}
@@ -105,37 +101,24 @@ public:
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ModResult 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);
-	}
-
-	void ReadConf()
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("blockcaps");
-		percent = tag->getInt("percent", 100);
-		minlen = tag->getInt("minlen", 1);
-		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;
-		if (percent < 1 || percent > 100)
-		{
-			ServerInstance->Logs->Log("CONFIG",DEFAULT, "<blockcaps:percent> out of range, setting to default of 100.");
-			percent = 100;
-		}
-		if (minlen < 1 || minlen > MAXBUF-1)
-		{
-			ServerInstance->Logs->Log("CONFIG",DEFAULT, "<blockcaps:minlen> out of range, setting to default of 1.");
-			minlen = 1;
-		}
-	}
-
-	virtual ~ModuleBlockCAPS()
-	{
+		percent = tag->getUInt("percent", 100, 1, 100);
+		minlen = tag->getUInt("minlen", 1, 1, ServerInstance->Config->Limits.MaxLine);
+
+		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));
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides support to block all-CAPS channel messages and notices", VF_VENDOR);
 	}