X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=21e08470f7518694756d0e9a99b128de4ffc5927;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=be366411eeb5df407aeeffc7b99a9a66df140fb8;hpb=eedbc9c88e6cd4dfdc31a813e4826ff84a1ae4f5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index be366411e..21e08470f 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,15 +49,17 @@ 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("");
+		OnRehash(NULL,"");
 		bc = new BlockCaps(ServerInstance);
-		ServerInstance->AddMode(bc, 'P');
+		if (!ServerInstance->AddMode(bc, 'P'))
+			throw ModuleException("Could not add new modes!");
 	}
 
 	void Implements(char* List)
@@ -69,32 +67,28 @@ public:
 		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1;
 	}
 
-	virtual void OnRehash(const std::string &param)
+	virtual void OnRehash(userrec* user, const std::string &param)
 	{
 		ReadConf();
 	}
 
 	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;
-				const char* i = text.c_str();
-				for (; *i; i++)
+				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 +106,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.");
@@ -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)