Improve X-line text consistency.

[user/henk/code/inspircd.git] / src / coremods / core_xline / core_xline.cpp

diff --git a/src/coremods/core_xline/core_xline.cpp b/src/coremods/core_xline/core_xline.cpp
index 7fa7da0197369fb412955489fb1e261473e11443..aa19bad34b9118feb21130383fed316f47b49d0b 100644 (file)
--- a/src/coremods/core_xline/core_xline.cpp
+++ b/src/coremods/core_xline/core_xline.cpp
@@ -28,7 +28,7 @@ bool InsaneBan::MatchesEveryone(const std::string& mask, MatcherBase& test, User
        if (insane->getBool(confkey))
                return false;
 
-       float itrigger = insane->getFloat("trigger", 95.5);
+       float itrigger = insane->getFloat("trigger", 95.5, 0.0, 100.0);
 
        long matches = test.Run(mask);
 
@@ -46,8 +46,8 @@ bool InsaneBan::MatchesEveryone(const std::string& mask, MatcherBase& test, User
 
 bool InsaneBan::IPHostMatcher::Check(User* user, const std::string& mask) const
 {
-       return ((InspIRCd::Match(user->MakeHost(), mask, ascii_case_insensitive_map)) ||
-                       (InspIRCd::Match(user->MakeHostIP(), mask, ascii_case_insensitive_map)));
+       return ((InspIRCd::MatchCIDR(user->MakeHost(), mask, ascii_case_insensitive_map)) ||
+                       (InspIRCd::MatchCIDR(user->MakeHostIP(), mask, ascii_case_insensitive_map)));
 }
 
 class CoreModXLine : public Module
@@ -66,21 +66,21 @@ class CoreModXLine : public Module
 
        ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE
        {
-               // Check Q-Lines (for local nick changes only, remote servers have our Q-Lines to enforce themselves)
+               // Check Q-lines (for local nick changes only, remote servers have our Q-lines to enforce themselves)
 
                XLine* xline = ServerInstance->XLines->MatchesLine("Q", newnick);
                if (!xline)
                        return MOD_RES_PASSTHRU; // No match
 
-               // A Q-Line matched the new nick, tell opers if the user is registered
+               // A Q-line matched the new nick, tell opers if the user is registered
                if (user->registered == REG_ALL)
                {
-                       ServerInstance->SNO->WriteGlobalSno('a', "Q-Lined nickname %s from %s: %s",
+                       ServerInstance->SNO->WriteGlobalSno('a', "Q-lined nickname %s from %s: %s",
                                newnick.c_str(), user->GetFullRealHost().c_str(), xline->reason.c_str());
                }
 
                // Send a numeric because if we deny then the core doesn't reply anything
-               user->WriteNumeric(ERR_ERRONEUSNICKNAME, "%s :Invalid nickname: %s", newnick.c_str(), xline->reason.c_str());
+               user->WriteNumeric(ERR_ERRONEUSNICKNAME, newnick, InspIRCd::Format("Invalid nickname: %s", xline->reason.c_str()));
                return MOD_RES_DENY;
        }