Make rehashing messages more consistent.

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

diff --git a/src/coremods/core_stats.cpp b/src/coremods/core_stats.cpp
index 06602b28864f918e4398a8b35c29d49ff3561a42..918d59ab7dcc89b8d45c150b34ac30dd960163dd 100644 (file)
--- a/src/coremods/core_stats.cpp
+++ b/src/coremods/core_stats.cpp
@@ -36,14 +36,15 @@ class CommandStats : public Command
        void DoStats(Stats::Context& stats);
 
  public:
-       /** Constructor for stats.
-        */
+       /** STATS characters which non-opers can request. */
+       std::string userstats;
+
        CommandStats(Module* Creator)
                : Command(Creator, "STATS", 1, 2)
                , statsevprov(Creator, "event/stats")
        {
                allow_empty_last_param = false;
-               syntax = "<stats-symbol> [<servername>]";
+               syntax = "<symbol> [<servername>]";
        }
 
        /** Handle command.
@@ -77,7 +78,7 @@ void CommandStats::DoStats(Stats::Context& stats)
        User* const user = stats.GetSource();
        const char statschar = stats.GetSymbol();
 
-       bool isPublic = ServerInstance->Config->UserStats.find(statschar) != std::string::npos;
+       bool isPublic = userstats.find(statschar) != std::string::npos;
        bool isRemoteOper = IS_REMOTE(user) && (user->IsOper());
        bool isLocalOperWithPrivs = IS_LOCAL(user) && user->HasPrivPermission("servers/auspex");
 
@@ -377,7 +378,7 @@ void CommandStats::DoStats(Stats::Context& stats)
 
 CmdResult CommandStats::Handle(User* user, const Params& parameters)
 {
-       if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName)
+       if (parameters.size() > 1 && !irc::equals(parameters[1], ServerInstance->Config->ServerName))
        {
                // Give extra penalty if a non-oper does /STATS <remoteserver>
                LocalUser* localuser = IS_LOCAL(user);
@@ -408,6 +409,12 @@ class CoreModStats : public Module
        {
        }
 
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+       {
+               ConfigTag* security = ServerInstance->Config->ConfValue("security");
+               cmd.userstats = security->getString("userstats");
+       }
+
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides the STATS command", VF_CORE | VF_VENDOR);