X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_whowas.cpp;h=be3ee0add9eafb0f90ef7b164e50933276a93225;hb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;hp=b4292857c682b5977c7d62c79f192e1d477aa96e;hpb=09afa5085614e0224a296abd082fce205003c3fe;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp
index b4292857c..be3ee0add 100644
--- a/src/cmd_whowas.cpp
+++ b/src/cmd_whowas.cpp
@@ -2,43 +2,53 @@
  *       | 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 "commands/cmd_whowas.h"
 
-extern InspIRCd* ServerInstance;
-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]);
+	/* 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())
 	{
+		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;
@@ -63,9 +73,13 @@ void 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]);
+	return CMD_SUCCESS;
 }