X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=893981283bf01f29a4abe2bf4f2df0f7a966ce04;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;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..893981283 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -11,11 +11,7 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
-#include "mode.h"
 
 /* $ModDesc: Provides support for channel mode +P to block all-CAPS channel messages and notices */
 
@@ -53,11 +49,12 @@ 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)
+	ModuleBlockCAPS(InspIRCd* Me) : Module(Me)
 	{
 		OnRehash(NULL,"");
 		bc = new BlockCaps(ServerInstance);
@@ -77,24 +74,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;
 				}
 			}
@@ -111,16 +105,22 @@ public:
 	{
 		ConfigReader Conf(ServerInstance);
 		percent = Conf.ReadInteger("blockcaps", "percent", "100", 0, true);
-		minlen = Conf.ReadInteger("blockcaps", "minlen", "0", 0, true);
-		if (percent < 0 || percent > 100)
+		minlen = Conf.ReadInteger("blockcaps", "minlen", "1", 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 < 1 || percent > 100)
 		{
 			ServerInstance->Log(DEFAULT, "<blockcaps:percent> out of range, setting to default of 100.");
 			percent = 100;
 		}
-		if (minlen < 0 || minlen > MAXBUF-1)
+		if (minlen < 1 || minlen > MAXBUF-1)
 		{
-			ServerInstance->Log(DEFAULT, "<blockcaps:minlen> out of range, setting to default of 0.");
-			minlen = 0;
+			ServerInstance->Log(DEFAULT, "<blockcaps:minlen> out of range, setting to default of 1.");
+			minlen = 1;
 		}
 	}
 
@@ -136,27 +136,4 @@ public:
 	}
 };
 
-
-class ModuleBlockCAPSFactory : public ModuleFactory
-{
- public:
-	ModuleBlockCAPSFactory()
-	{
-	}
-	
-	~ModuleBlockCAPSFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleBlockCAPS(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleBlockCAPSFactory;
-}
+MODULE_INIT(ModuleBlockCAPS)