*/
#include "inspircd.h"
-#include "message.h"
#include "configreader.h"
#include "users.h"
#include "modules.h"
-#include "commands.h"
-#include "helperfuncs.h"
#include "commands/cmd_whois.h"
+#include "hashcomp.h"
-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];
- strlcpy(x,n,MAXBUF);
- for (char* y = x; *y; y++)
- if (*y == '_')
- *y = ' ';
- 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)
}
if (*dest->oper)
{
- user->WriteServ("313 %s %s :is %s %s on %s",user->nick, dest->nick, (strchr("AEIOUaeiou",*dest->oper) ? "an" : "a"),Spacify(dest->oper), ServerInstance->Config->Network);
+ user->WriteServ("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);
}
if ((!signon) && (!idle))
{
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
{
}
else
{
- user->WriteServ("401 %s %s :No such nick/channel",user->nick, nick);
- user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, nick);
+ user->WriteServ("401 %s %s :No such nick/channel",user->nick, *nick ? nick : "*");
+ user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, *nick ? nick : "*");
}
}
-void cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
+
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+ return new cmd_whois(Instance);
+}
+
+CmdResult cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
{
userrec *dest;
if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
- return;
+ return CMD_SUCCESS;
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
{
/* no such nick/channel */
- user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
- user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, parameters[0]);
+ 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] : "*");
+ return CMD_FAILURE;
}
+
+ return CMD_SUCCESS;
}