Whoops, make /stats s work

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

diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp
index ae3bdb9530ba749df5ebf8e425cab48f9c84cca9..399214d70a7bd590a1aabbbf2077f0580acfa8d9 100644 (file)
--- a/src/cmd_whowas.cpp
+++ b/src/cmd_whowas.cpp
@@ -14,31 +14,37 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "configreader.h"
 #include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_whowas.h"
 
-extern ServerConfig* Config;
-extern irc::whowas::whowas_users whowas;
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_whowas(Instance);
+}
 
-void cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user)
+CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user)
 {
-       irc::whowas::whowas_users::iterator i = whowas.find(parameters[0]);
+       irc::whowas::whowas_users::iterator i = ServerInstance->whowas.find(parameters[0]);
+
+       ServerInstance->Log(DEBUG,"Entered cmd_whowas");
 
-       if (i == whowas.end())
+       if (i == ServerInstance->whowas.end())
        {
-               WriteServ(user->fd,"406 %s %s :There was no such nickname",user->nick,parameters[0]);
+               ServerInstance->Log(DEBUG,"No such nick in whowas");
+               user->WriteServ("406 %s %s :There was no such nickname",user->nick,parameters[0]);
+               user->WriteServ("369 %s %s :End of WHOWAS",user->nick,parameters[0]);
+               return CMD_FAILURE;
        }
        else
        {
+               ServerInstance->Log(DEBUG,"Whowas set found");
                irc::whowas::whowas_set* grp = i->second;
                if (grp->size())
                {
                        for (irc::whowas::whowas_set::iterator ux = grp->begin(); ux != grp->end(); ux++)
                        {
+                               ServerInstance->Log(DEBUG,"Spool whowas entry");
                                irc::whowas::WhoWasGroup* u = *ux;
                                time_t rawtime = u->signon;
                                tm *timeinfo;
@@ -50,22 +56,26 @@ void cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user)
                                strlcpy(b,asctime(timeinfo),MAXBUF);
                                b[24] = 0;
 
-                               WriteServ(user->fd,"314 %s %s %s %s * :%s",user->nick,parameters[0],u->ident,u->dhost,u->gecos);
+                               user->WriteServ("314 %s %s %s %s * :%s",user->nick,parameters[0],u->ident,u->dhost,u->gecos);
                                
                                if(*user->oper)
-                                       WriteServ(user->fd,"379 %s %s :was connecting from *@%s", user->nick, parameters[0], u->host);
+                                       user->WriteServ("379 %s %s :was connecting from *@%s", user->nick, parameters[0], u->host);
                                
-                               if(*Config->HideWhoisServer && !(*user->oper))
-                                       WriteServ(user->fd,"312 %s %s %s :%s",user->nick,parameters[0], Config->HideWhoisServer, b);
+                               if(*ServerInstance->Config->HideWhoisServer && !(*user->oper))
+                                       user->WriteServ("312 %s %s %s :%s",user->nick,parameters[0], ServerInstance->Config->HideWhoisServer, b);
                                else
-                                       WriteServ(user->fd,"312 %s %s %s :%s",user->nick,parameters[0], u->server, b);
+                                       user->WriteServ("312 %s %s %s :%s",user->nick,parameters[0], u->server, b);
                        }
                }
                else
                {
-                       WriteServ(user->fd,"406 %s %s :There was no such nickname",user->nick,parameters[0]);
+                       ServerInstance->Log(DEBUG,"Oops, empty whowas set found");
+                       user->WriteServ("406 %s %s :There was no such nickname",user->nick,parameters[0]);
+                       user->WriteServ("369 %s %s :End of WHOWAS",user->nick,parameters[0]);
+                       return CMD_FAILURE;
                }
        }
-       
-       WriteServ(user->fd,"369 %s %s :End of WHOWAS",user->nick,parameters[0]);
+
+       user->WriteServ("369 %s %s :End of WHOWAS",user->nick,parameters[0]);
+       return CMD_SUCCESS;
 }