Fix for bug found by danieldg, where remote nicks were truncated to NICKMAX, but...

[user/henk/code/inspircd.git] / src / commands / cmd_whois.cpp

diff --git a/src/commands/cmd_whois.cpp b/src/commands/cmd_whois.cpp
index 8afc2352567c11a68cc08959a911f40463b0dba4..d732bd7715e9651140c47c984c9738dd3822b312 100644 (file)
--- a/src/commands/cmd_whois.cpp
+++ b/src/commands/cmd_whois.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -27,7 +27,7 @@ void do_whois(InspIRCd* ServerInstance, User* user, User* dest,unsigned long sig
        if (dest->registered == REG_ALL)
        {
                ServerInstance->SendWhoisLine(user, dest, 311, "%s %s %s %s * :%s",user->nick.c_str(), dest->nick.c_str(), dest->ident.c_str(), dest->dhost.c_str(), dest->fullname.c_str());
-               if (user == dest || IS_OPER(user))
+               if (user == dest || user->HasPrivPermission("users/auspex"))
                {
                        ServerInstance->SendWhoisLine(user, dest, 378, "%s %s :is connecting from %s@%s %s", user->nick.c_str(), dest->nick.c_str(), dest->ident.c_str(), dest->host.c_str(), dest->GetIPString());
                }
@@ -45,7 +45,7 @@ void do_whois(InspIRCd* ServerInstance, User* user, User* dest,unsigned long sig
                                ServerInstance->SendWhoisLine(user, dest, 319, "%s %s :%s",user->nick.c_str(), dest->nick.c_str(), cl.c_str());
                        }
                }
-               if (*ServerInstance->Config->HideWhoisServer && !IS_OPER(user))
+               if (*ServerInstance->Config->HideWhoisServer && !user->HasPrivPermission("servers/auspex"))
                {
                        ServerInstance->SendWhoisLine(user, dest, 312, "%s %s %s :%s",user->nick.c_str(), dest->nick.c_str(), ServerInstance->Config->HideWhoisServer, ServerInstance->Config->Network);
                }
@@ -64,9 +64,9 @@ void do_whois(InspIRCd* ServerInstance, User* user, User* dest,unsigned long sig
                        ServerInstance->SendWhoisLine(user, dest, 313, "%s %s :is %s %s on %s",user->nick.c_str(), dest->nick.c_str(), (strchr("AEIOUaeiou",dest->oper[0]) ? "an" : "a"),irc::Spacify(dest->oper.c_str()), ServerInstance->Config->Network);
                }
 
-               if (user == dest || IS_OPER(user))
+               if (user == dest || user->HasPrivPermission("users/auspex"))
                {
-                       if (dest->modes[UM_SNOMASK] != 0)
+                       if (dest->IsModeSet('s') != 0)
                        {
                                ServerInstance->SendWhoisLine(user, dest, 379, "%s %s :is using modes +%s +%s", user->nick.c_str(), dest->nick.c_str(), dest->FormatModes(), dest->FormatNoticeMasks());
                        }
@@ -137,7 +137,7 @@ CmdResult CommandWhois::Handle (const std::vector<std::string>& parameters, User
                 */
                if (IS_LOCAL(dest) && (!*ServerInstance->Config->HideWhoisServer || parameters.size() > 1))
                {
-                       idle = abs((dest->idle_lastmsg)-ServerInstance->Time());
+                       idle = abs((long)((dest->idle_lastmsg)-ServerInstance->Time()));
                        signon = dest->signon;
                }
 
@@ -154,3 +154,4 @@ CmdResult CommandWhois::Handle (const std::vector<std::string>& parameters, User
        return CMD_SUCCESS;
 }
 
+