m_spanningtree Refuse topic changes that would result in desync

[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..cd7698d69564d2104650e8710d701798d8c20ef2 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -34,7 +34,7 @@ class BlockCaps : public SimpleChannelModeHandler
 class ModuleBlockCAPS : public Module
 {
        BlockCaps bc;
-       int percent;
+       unsigned int percent;
        unsigned int minlen;
        char capsmap[256];
 
@@ -63,7 +63,7 @@ public:
 
                        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 +72,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;
                                }
                        }