*/
#include "inspircd.h"
-#include "message.h"
#include "configreader.h"
#include "users.h"
#include "modules.h"
#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];
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)
{
user->WriteServ("378 %s %s :is connecting from *@%s %s",user->nick, dest->nick, dest->host, dest->GetIPString());
}
- std::string cl = chlist(dest,user);
+ std::string cl = dest->ChannelList(user);
if (cl.length())
{
if (cl.length() > 400)
{
- split_chlist(user,dest,cl);
+ user->SplitChanList(dest,cl);
}
else
{
}
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)
{
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
{
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
{
user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, parameters[0]);
}
}
+