Made SANICK not collide the user (theres no need to in the new 1.1 now we have return...

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

diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index 09e8eea65c47dae0a525ff548ece3565f6d5305f..d48d1a10c46a3dcbd1569f62d33195157f41e417 100644 (file)
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -15,21 +15,11 @@
  */
 
 #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"
 
-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 +30,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)
@@ -85,7 +75,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
                {
@@ -96,27 +86,37 @@ void do_whois(userrec* user, userrec* dest,unsigned long signon, unsigned long i
        }
        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;
 }