Jesus, look who's the commit whore today. More header updates, and removal of namespa...

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

diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp
index bb8866239f444c3b1586713452e3a1de5dcd22c2..be3ee0add9eafb0f90ef7b164e50933276a93225 100644 (file)
--- a/src/cmd_whowas.cpp
+++ b/src/cmd_whowas.cpp
@@ -2,44 +2,54 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "configreader.h"
 #include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
-#include "cmd_whowas.h"
+#include "commands/cmd_whowas.h"
 
-extern ServerConfig* Config;
-extern whowas_users whowas;
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_whowas(Instance);
+}
 
-void cmd_whowas::Handle (char **parameters, int pcnt, userrec* user)
+CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user)
 {
-       whowas_users::iterator i = whowas.find(parameters[0]);
+       /* if whowas disabled in config */
+       if (ServerInstance->Config->WhoWasGroupSize == 0 || ServerInstance->Config->WhoWasMaxGroups == 0)
+       {
+               user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
+               return CMD_FAILURE;
+       }
+                        
+       irc::whowas::whowas_users::iterator i = ServerInstance->whowas.find(parameters[0]);
 
-       if (i == whowas.end())
+       ServerInstance->Log(DEBUG,"Entered cmd_whowas");
+
+       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
        {
-               whowas_set* grp = i->second;
+               ServerInstance->Log(DEBUG,"Whowas set found");
+               irc::whowas::whowas_set* grp = i->second;
                if (grp->size())
                {
-                       for (whowas_set::iterator ux = grp->begin(); ux != grp->end(); ux++)
+                       for (irc::whowas::whowas_set::iterator ux = grp->begin(); ux != grp->end(); ux++)
                        {
-                               WhoWasGroup* u = *ux;
+                               ServerInstance->Log(DEBUG,"Spool whowas entry");
+                               irc::whowas::WhoWasGroup* u = *ux;
                                time_t rawtime = u->signon;
                                tm *timeinfo;
                                char b[MAXBUF];
@@ -50,22 +60,26 @@ void cmd_whowas::Handle (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;
 }