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))
* does, and use the second one, otherwise, use the only paramter. -- djGrrr
*/
if (pcnt > 1)
- {
- dest = ServerInstance->FindNick(parameters[1]);
- }
- else
- {
- dest = ServerInstance->FindNick(parameters[0]);
- }
+ userindex = 1;
+
+ dest = ServerInstance->FindNick(parameters[userindex]);
if (dest)
{
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;
}