X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=e984087d8bdae9df4eeea27291ddd399bc78284c;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=058336fb37f1c3aeacbabb4a9b4ef2f3f1f3056c;hpb=42d5b9571eff06b0c33093dc9118c29f9603fd2b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 058336fb3..e984087d8 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -53,8 +53,9 @@ class BlockCaps : public ModeHandler
 class ModuleBlockCAPS : public Module
 {
 	BlockCaps* bc;
-	unsigned int percent;
+	int percent;
 	unsigned int minlen;
+	char capsmap[256];
 public:
 	
 	ModuleBlockCAPS(InspIRCd* Me) : Module::Module(Me)
@@ -77,24 +78,21 @@ public:
 
 	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		if (text.size() < minlen)
-			return 0;
-
 		if (target_type == TYPE_CHANNEL)
 		{
+			if ((!IS_LOCAL(user)) || (text.length() < minlen))
+				return 0;
+
 			chanrec* c = (chanrec*)dest;
 
 			if (c->IsModeSet('P'))
 			{
 				int caps = 0;
 				for (std::string::iterator i = text.begin(); i != text.end(); i++)
+					caps += capsmap[(unsigned char)*i];
+				if ( ((caps*100)/(int)text.length()) >= percent )
 				{
-					if ( (*i >= 'A') && (*i <= 'Z'))
-						caps++;
-				}
-				if ( (caps * 100 / text.size()) >= percent )
-				{
-					user->WriteServ( "404 %s %s :Can't send all-CAPS to channel (+P set)", user->nick, c->name);
+					user->WriteServ( "404 %s %s :Your line cannot be more than %d%% capital letters if it is %d or more letters long", user->nick, c->name, percent, minlen);
 					return 1;
 				}
 			}
@@ -112,6 +110,12 @@ public:
 		ConfigReader Conf(ServerInstance);
 		percent = Conf.ReadInteger("blockcaps", "percent", "100", 0, true);
 		minlen = Conf.ReadInteger("blockcaps", "minlen", "0", 0, true);
+		std::string hmap = Conf.ReadValue("blockcaps", "capsmap", 0);
+		if (hmap.empty())
+			hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+		memset(&capsmap, 0, 255);
+		for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
+			capsmap[(unsigned char)*n] = 1;
 		if (percent < 0 || percent > 100)
 		{
 			ServerInstance->Log(DEFAULT, "<blockcaps:percent> out of range, setting to default of 100.");