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))
+ if (user == dest || IS_OPER(user))
{
ServerInstance->SendWhoisLine(user, dest, 378, "%s %s :is connecting from %s@%s %s", user->nick, dest->nick, dest->ident, dest->host, dest->GetIPString());
}
ServerInstance->SendWhoisLine(user, dest, 319, "%s %s :%s",user->nick, dest->nick, cl.c_str());
}
}
- if (*ServerInstance->Config->HideWhoisServer && !(*user->oper))
+ if (*ServerInstance->Config->HideWhoisServer && !IS_OPER(user))
{
ServerInstance->SendWhoisLine(user, dest, 312, "%s %s %s :%s",user->nick, dest->nick, ServerInstance->Config->HideWhoisServer, ServerInstance->Config->Network);
}
ServerInstance->SendWhoisLine(user, dest, 312, "%s %s %s :%s",user->nick, dest->nick, dest->server, ServerInstance->GetServerDescription(dest->server).c_str());
}
- if (*dest->awaymsg)
+ if (IS_AWAY(dest))
{
ServerInstance->SendWhoisLine(user, dest, 301, "%s %s :%s",user->nick, dest->nick, dest->awaymsg);
}
- if (*dest->oper)
+ if (IS_OPER(dest))
{
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);
}
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
{
return new cmd_whois(Instance);
}
CmdResult cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
{
userrec *dest;
+ int userindex = 0;
unsigned long idle = 0, signon = 0;
if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
return CMD_SUCCESS;
- dest = ServerInstance->FindNick(parameters[0]);
+
+ /*
+ * If 2 paramters are specified (/whois nick nick), ignore the first one like spanningtree
+ * does, and use the second one, otherwise, use the only paramter. -- djGrrr
+ */
+ if (pcnt > 1)
+ userindex = 1;
+
+ dest = ServerInstance->FindNick(parameters[userindex]);
if (dest)
{
/*
- * Determine whether to show idletime. We show it if:
- * If user is local and hidewhois is turned off, or
- * param[0] == param[1].
- *
- * The assumption here (not a huge one) is that cmd_whois is only ever invoked
- * remotely! Keep that in mind! -- w00t
+ * Okay. Umpteenth attempt at doing this, so let's re-comment...
+ * For local users (/w localuser), we show idletime if hidewhois is disabled
+ * For local users (/w localuser localuser), we always show idletime, hence pcnt > 1 check.
+ * For remote users (/w remoteuser), we do NOT show idletime
+ * For remote users (/w remoteuser remoteuser), spanningtree will handle calling do_whois, so we can ignore this case.
+ * Thanks to djGrrr for not being impatient while I have a crap day coding. :p -- w00t
*/
- if ((IS_LOCAL(dest) && !*ServerInstance->Config->HideWhoisServer) || pcnt > 1)
+ if (IS_LOCAL(dest) && (!*ServerInstance->Config->HideWhoisServer || pcnt > 1))
{
- if (pcnt > 1)
- {
- /*
- * if it looks like a remote whois, make sure it is one.
- * this stops things like /whois foo bar to get foo's
- * idletime without a proper remote request. -- w00t
- */
- if (!strcmp(parameters[0], parameters[1]))
- {
- /* this really is safe, we're only called for local users .. */
- idle = abs((dest->idle_lastmsg)-ServerInstance->Time());
- signon = dest->signon;
- }
- }
+ idle = abs((dest->idle_lastmsg)-ServerInstance->Time());
+ signon = dest->signon;
}
- do_whois(this->ServerInstance, user,dest,signon,idle,parameters[0]);
+ do_whois(this->ServerInstance, user,dest,signon,idle,parameters[userindex]);
}
else
{
/* no such nick/channel */
- user->WriteServ("401 %s %s :No such nick/channel",user->nick, *parameters[0] ? parameters[0] : "*");
- user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, *parameters[0] ? parameters[0] : "*");
+ user->WriteServ("401 %s %s :No such nick/channel",user->nick, *parameters[userindex] ? parameters[userindex] : "*");
+ user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, *parameters[userindex] ? parameters[userindex] : "*");
return CMD_FAILURE;
}