X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=6e67cb3095efc6c3610326553b0389ae2f172b1f;hb=6de3017e2cda445bfd9e6b460a35eae7fc199148;hp=0a64a75b55683a8b6314b4fc65f9196f082826a2;hpb=8f5efbc7aa33b792e02d01e3288f553e6e98ccaa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 0a64a75b5..6e67cb309 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -21,6 +21,7 @@
 
 
 #include "inspircd.h"
+#include "modules/exemption.h"
 
 
 /** Handles the +B channel mode
@@ -33,13 +34,16 @@ class BlockCaps : public SimpleChannelModeHandler
 
 class ModuleBlockCAPS : public Module
 {
+	CheckExemption::EventProvider exemptionprov;
 	BlockCaps bc;
 	unsigned int percent;
 	unsigned int minlen;
 	char capsmap[256];
 
 public:
-	ModuleBlockCAPS() : bc(this)
+	ModuleBlockCAPS()
+		: exemptionprov(this)
+		, bc(this)
 	{
 	}
 
@@ -56,7 +60,8 @@ public:
 				return MOD_RES_PASSTHRU;
 
 			Channel* c = (Channel*)dest;
-			ModResult res = ServerInstance->OnCheckExemption(user,c,"blockcaps");
+			ModResult res;
+			FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (user, c, "blockcaps"));
 
 			if (res == MOD_RES_ALLOW)
 				return MOD_RES_PASSTHRU;
@@ -74,7 +79,7 @@ public:
 
 				if (((caps * 100) / text.length()) >= percent)
 				{
-					user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s :Your message cannot contain more than %d%% capital letters if it's longer than %d characters", 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;
 				}
 			}