Tweak to numeric 378: is connecting from ident@host

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

diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index 58328b3cc095d331b8021fe8a5e9e591c79b8ec5..192e2822c1975b80957b4e394a33a87ca07892ab 100644 (file)
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -20,13 +20,13 @@
 
 void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned long signon, unsigned long idle, const char* nick)
 {
-       // bug found by phidjit - were able to whois an incomplete connection if it had sent a NICK or USER
+       /* check if the user is registered first, can't whois unknown connections */
        if (dest->registered == REG_ALL)
        {
                ServerInstance->SendWhoisLine(user, dest, 311, "%s %s %s %s * :%s",user->nick, dest->nick, dest->ident, dest->dhost, dest->fullname);
                if ((user == dest) || (*user->oper))
                {
-                       ServerInstance->SendWhoisLine(user, dest, 378, "%s %s :is connecting from *@%s %s",user->nick, dest->nick, dest->host, dest->GetIPString());
+                       ServerInstance->SendWhoisLine(user, dest, 378, "%s %s :is connecting from %s@%s %s", user->nick, dest->nick, dest->ident, dest->host, dest->GetIPString());
                }
                std::string cl = dest->ChannelList(user);
                if (cl.length())
@@ -56,10 +56,9 @@ void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned lo
                {
                        ServerInstance->SendWhoisLine(user, dest, 313, "%s %s :is %s %s on %s",user->nick, dest->nick, (strchr("AEIOUaeiou",*dest->oper) ? "an" : "a"),irc::Spacify(dest->oper), ServerInstance->Config->Network);
                }
-               if ((!signon) && (!idle))
-               {
-                       FOREACH_MOD(I_OnWhois,OnWhois(user,dest));
-               }
+
+               FOREACH_MOD(I_OnWhois,OnWhois(user,dest));
+
                if (!strcasecmp(user->server,dest->server))
                {
                        // idle time and signon line can only be sent if youre on the same server (according to RFC)