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 fe3171fc594fc1a17159cd4c6d36377aa96104af..be3ee0add9eafb0f90ef7b164e50933276a93225 100644 (file)
--- a/src/cmd_whowas.cpp
+++ b/src/cmd_whowas.cpp
@@ -2,12 +2,9 @@
  *       | 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.
  *
@@ -18,8 +15,6 @@
 #include "users.h"
 #include "commands/cmd_whowas.h"
 
-
-
 extern "C" command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_whowas(Instance);
@@ -27,20 +22,33 @@ extern "C" command_t* init_command(InspIRCd* Instance)
 
 CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user)
 {
+       /* 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]);
 
+       ServerInstance->Log(DEBUG,"Entered cmd_whowas");
+
        if (i == ServerInstance->whowas.end())
        {
+               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;
@@ -65,12 +73,13 @@ CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user)
                }
                else
                {
+                       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;
                }
        }
-       
-       user->WriteServ("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;
 }