Now with added ANGRY MONKEYS.

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

diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index e44757e6dc79230022392f41002e5d17856ebbeb..efa8b44aabba78665d4b6f42370a5456c359cab5 100644 (file)
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -43,12 +43,12 @@ const char* Spacify(char* n)
 void do_whois(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
-       if (dest->registered == 7)
+       if (dest->registered == REG_ALL)
        {
                WriteServ(user->fd,"311 %s %s %s %s * :%s",user->nick, dest->nick, dest->ident, dest->dhost, dest->fullname);
                if ((user == dest) || (*user->oper))
                {
-                       WriteServ(user->fd,"378 %s %s :is connecting from *@%s %s",user->nick, dest->nick, dest->host, inet_ntoa(dest->ip4));
+                       WriteServ(user->fd,"378 %s %s :is connecting from *@%s %s",user->nick, dest->nick, dest->host, dest->GetIPString());
                }
                std::string cl = chlist(dest,user);
                if (cl.length())
@@ -104,8 +104,9 @@ void do_whois(userrec* user, userrec* dest,unsigned long signon, unsigned long i
 void cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
 {
        userrec *dest;
-       if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-1,0))
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
                return;
+
        dest = Find(parameters[0]);
        if (dest)
        {