Use an oper priv instead of a config flag for overriding nonicks.

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

diff --git a/src/coremods/core_who.cpp b/src/coremods/core_who.cpp
index 196bf0479181da4a4bc4249b0ce3457a24d033de..29feefc2ba8c095173968ba004c99b9138b11f22 100644 (file)
--- a/src/coremods/core_who.cpp
+++ b/src/coremods/core_who.cpp
@@ -74,7 +74,7 @@ class CommandWho : public Command
         * @param user The user issuing the command
         * @return A value from CmdResult to indicate command success or failure.
         */
-       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE;
        bool whomatch(User* cuser, User* user, const char* matchtext);
 };
 
@@ -146,10 +146,10 @@ bool CommandWho::whomatch(User* cuser, User* user, const char* matchtext)
                        match = InspIRCd::Match(user->awaymsg, matchtext);
                else if (opt_time)
                {
-                       long seconds = InspIRCd::Duration(matchtext);
+                       time_t seconds = ServerInstance->Time() - InspIRCd::Duration(matchtext);
 
                        // Okay, so time matching, we want all users connected `seconds' ago
-                       if (user->signon >= ServerInstance->Time() - seconds)
+                       if (user->signon >= seconds)
                                match = true;
                }
 
@@ -166,8 +166,8 @@ bool CommandWho::whomatch(User* cuser, User* user, const char* matchtext)
                if (!match)
                        match = InspIRCd::Match(user->nick, matchtext);
 
-               /* Don't allow server name matches if HideWhoisServer is enabled, unless the command user has the priv */
-               if (!match && (ServerInstance->Config->HideWhoisServer.empty() || cuser->HasPrivPermission("users/auspex")))
+               /* Don't allow server name matches if HideServer is enabled, unless the command user has the priv */
+               if (!match && (ServerInstance->Config->HideServer.empty() || cuser->HasPrivPermission("users/auspex")))
                        match = InspIRCd::Match(user->server->GetName(), matchtext);
 
                return match;
@@ -199,8 +199,8 @@ void CommandWho::SendWhoLine(User* user, const std::vector<std::string>& parms,
        Numeric::Numeric wholine(RPL_WHOREPLY);
        wholine.push(memb ? memb->chan->name : "*").push(u->ident);
        wholine.push(u->GetHost(opt_showrealhost));
-       if (!ServerInstance->Config->HideWhoisServer.empty() && !user->HasPrivPermission("servers/auspex"))
-               wholine.push(ServerInstance->Config->HideWhoisServer);
+       if (!ServerInstance->Config->HideServer.empty() && !user->HasPrivPermission("servers/auspex"))
+               wholine.push(ServerInstance->Config->HideServer);
        else
                wholine.push(u->server->GetName());
 
@@ -305,11 +305,11 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *
                                        opt_away = true;
                                        break;
                                case 'l':
-                                       if (user->HasPrivPermission("users/auspex") || ServerInstance->Config->HideWhoisServer.empty())
+                                       if (user->HasPrivPermission("users/auspex") || ServerInstance->Config->HideServer.empty())
                                                opt_local = true;
                                        break;
                                case 'f':
-                                       if (user->HasPrivPermission("users/auspex") || ServerInstance->Config->HideWhoisServer.empty())
+                                       if (user->HasPrivPermission("users/auspex") || ServerInstance->Config->HideServer.empty())
                                                opt_far = true;
                                        break;
                                case 't':