Merge pull request #1141 from SaberUK/master+windows-purge

[user/henk/code/inspircd.git] / src / modules / m_blockcaps.cpp

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index ca34840ea928a8f65de10c5eceb71f6f9f7d80d7..6e67cb3095efc6c3610326553b0389ae2f172b1f 100644 (file)
--- 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;
-       int percent;
+       unsigned int percent;
        unsigned int minlen;
        char capsmap[256];
 
 public:
-       ModuleBlockCAPS() : bc(this)
+       ModuleBlockCAPS()
+               : exemptionprov(this)
+               , bc(this)
        {
        }
 
@@ -56,14 +60,15 @@ 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;
 
                        if (!c->GetExtBanStatus(user, 'B').check(!c->IsModeSet(bc)))
                        {
-                               int caps = 0;
+                               std::string::size_type caps = 0;
                                unsigned int offset = 0;
                                // Ignore the beginning of the text if it's a CTCP ACTION (/me)
                                if (!text.compare(0, 8, "\1ACTION ", 8))
@@ -72,9 +77,9 @@ public:
                                for (std::string::const_iterator i = text.begin() + offset; i != text.end(); ++i)
                                        caps += capsmap[(unsigned char)*i];
 
-                               if ( ((caps*100)/(int)text.length()) >= percent )
+                               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;
                                }
                        }