Merge tag 'v2.0.25' into master.

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

diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp
index ed5c1cda04f1b9f70595e25bba9a11caca7e40d1..c2fac75773bb1bb9efdfed2e93b90a608ea47925 100644 (file)
--- a/src/coremods/core_whois.cpp
+++ b/src/coremods/core_whois.cpp
@@ -177,10 +177,10 @@ void CommandWhois::DoWhois(LocalUser* user, User* dest, unsigned long signon, un
 {
        WhoisContextImpl whois(user, dest, lineevprov);
 
-       whois.SendLine(311, dest->ident, dest->dhost, '*', dest->fullname);
+       whois.SendLine(311, dest->ident, dest->GetDisplayedHost(), '*', dest->fullname);
        if (whois.IsSelfWhois() || user->HasPrivPermission("users/auspex"))
        {
-               whois.SendLine(378, InspIRCd::Format("is connecting from %s@%s %s", dest->ident.c_str(), dest->host.c_str(), dest->GetIPString().c_str()));
+               whois.SendLine(378, InspIRCd::Format("is connecting from %s@%s %s", dest->ident.c_str(), dest->GetRealHost().c_str(), dest->GetIPString().c_str()));
        }
 
        SendChanList(whois);
@@ -211,11 +211,11 @@ void CommandWhois::DoWhois(LocalUser* user, User* dest, unsigned long signon, un
        {
                if (dest->IsModeSet(snomaskmode))
                {
-                       whois.SendLine(379, InspIRCd::Format("is using modes +%s %s", dest->FormatModes(), snomaskmode->GetUserParameter(dest).c_str()));
+                       whois.SendLine(379, InspIRCd::Format("is using modes %s %s", dest->GetModeLetters().c_str(), snomaskmode->GetUserParameter(dest).c_str()));
                }
                else
                {
-                       whois.SendLine(379, InspIRCd::Format("is using modes +%s", dest->FormatModes()));
+                       whois.SendLine(379, InspIRCd::Format("is using modes %s", dest->GetModeLetters().c_str()));
                }
        }