extern time_t TIME -> InspIRCd::Time()

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

diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index 5f980750bc9d3c10c4308b56704ab1b62c291040..c863d799850868d3991dc3d9d11490139b72a55f 100644 (file)
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -15,7 +15,6 @@
  */
 
 #include "inspircd.h"
-#include "message.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
@@ -23,13 +22,6 @@
 #include "helperfuncs.h"
 #include "commands/cmd_whois.h"
 
-extern InspIRCd* ServerInstance;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern ModuleList modules;
-extern FactoryList factory;
-extern time_t TIME;
-
 const char* Spacify(char* n)
 {
        static char x[MAXBUF];
@@ -40,7 +32,7 @@ const char* Spacify(char* n)
        return x;
 }
 
-void do_whois(userrec* user, userrec* dest,unsigned long signon, unsigned long idle, const char* nick)
+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
        if (dest->registered == REG_ALL)
@@ -68,7 +60,7 @@ void do_whois(userrec* user, userrec* dest,unsigned long signon, unsigned long i
                }
                else
                {
-                       user->WriteServ("312 %s %s %s :%s",user->nick, dest->nick, dest->server, GetServerDescription(dest->server).c_str());
+                       user->WriteServ("312 %s %s %s :%s",user->nick, dest->nick, dest->server, ServerInstance->GetServerDescription(dest->server).c_str());
                }
                if (*dest->awaymsg)
                {
@@ -85,7 +77,7 @@ void do_whois(userrec* user, userrec* dest,unsigned long signon, unsigned long i
                if (!strcasecmp(user->server,dest->server))
                {
                        // idle time and signon line can only be sent if youre on the same server (according to RFC)
-                       user->WriteServ("317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-TIME), dest->signon);
+                       user->WriteServ("317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-ServerInstance->Time()), dest->signon);
                }
                else
                {
@@ -107,10 +99,10 @@ void cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
        if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
                return;
 
-       dest = Find(parameters[0]);
+       dest = ServerInstance->FindNick(parameters[0]);
        if (dest)
        {
-               do_whois(user,dest,0,0,parameters[0]);
+               do_whois(this->ServerInstance, user,dest,0,0,parameters[0]);
        }
        else
        {
@@ -119,3 +111,4 @@ void cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
                user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, parameters[0]);
        }
 }
+