X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=0d76c9c84d914cc82272b3f4fcd3ebd19eafea1c;hb=6bc3d71946b339a5a10ca621b029fe8a5b180d68;hp=7c98fc7711192279a0ff57c87ee8917b7181beb6;hpb=3944d6cf0dbdb5afb714d3b027db0314ff830636;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 7c98fc771..0d76c9c84 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -2,13 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *                <omster@gmail.com>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -56,49 +52,75 @@ class BlockCaps : public ModeHandler
 
 class ModuleBlockCAPS : public Module
 {
-	
 	BlockCaps* bc;
+	unsigned int percent;
+	unsigned int minlen;
 public:
 	
 	ModuleBlockCAPS(InspIRCd* Me) : Module::Module(Me)
 	{
-		
+		OnRehash("");
 		bc = new BlockCaps(ServerInstance);
 		ServerInstance->AddMode(bc, 'P');
 	}
 
 	void Implements(char* List)
 	{
-		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1;
+	}
+
+	virtual void OnRehash(const std::string &param)
+	{
+		ReadConf();
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+	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)
 		{
 			chanrec* c = (chanrec*)dest;
 
 			if (c->IsModeSet('P'))
 			{
-				const char* i = text.c_str();
-				for (; *i; i++)
+				int caps = 0;
+				for (std::string::iterator i = text.begin(); i != text.end(); i++)
+				{
+					if ( (*i >= 'A') && (*i <= 'Z'))
+						caps++;
+				}
+				if ( (caps * 100 / text.size()) >= percent )
 				{
-					if (((*i != ' ') && (*i != '\t')) && ((*i < 'A') || (*i > 'Z')))
-					{
-						return 0;
-					}
+					user->WriteServ( "404 %s %s :Can't send all-CAPS to channel (+P set)", user->nick, c->name);
+					return 1;
 				}
-				
-				user->WriteServ( "404 %s %s :Can't send all-CAPS to channel (+P set)", user->nick, c->name);
-				return 1;
 			}
 		}
 		return 0;
 	}
 
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		return OnUserPreMessage(user,dest,target_type,text,status);
+		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
+	}
+
+	void ReadConf()
+	{
+		ConfigReader Conf(ServerInstance);
+		percent = Conf.ReadInteger("blockcaps", "percent", "100", 0, true);
+		minlen = Conf.ReadInteger("blockcaps", "minlen", "0", 0, true);
+		if (percent < 0 || percent > 100)
+		{
+			ServerInstance->Log(DEFAULT, "<blockcaps:percent> out of range, setting to default of 100.");
+			percent = 100;
+		}
+		if (minlen < 0 || minlen > MAXBUF-1)
+		{
+			ServerInstance->Log(DEFAULT, "<blockcaps:minlen> out of range, setting to default of 0.");
+			minlen = 0;
+		}
 	}
 
 	virtual ~ModuleBlockCAPS()
@@ -109,7 +131,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
+		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };