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

diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp
index b2b3dcc58..be3ee0add 100644
--- a/src/cmd_whowas.cpp
+++ b/src/cmd_whowas.cpp
@@ -2,100 +2,84 @@
  *       | 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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_whowas.h"
-
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
+#include "commands/cmd_whowas.h"
 
-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]);
+
+	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
 	{
-		whowas_group* grp = (whowas_group*)i;
+		ServerInstance->Log(DEBUG,"Whowas set found");
+		irc::whowas::whowas_set* grp = i->second;
 		if (grp->size())
 		{
-			for (whowas_group::iterator u = grp->begin(); u != grp->end(); u++)
+			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;
 				char b[MAXBUF];
 	
 				timeinfo = localtime(&rawtime);
+				
+				/* XXX - 'b' could be only 25 chars long and then strlcpy() would terminate it for us too? */
 				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);
-				WriteServ(user->fd,"312 %s %s %s :%s",user->nick,parameters[0], *Config->HideWhoisServer ? Config->HideWhoisServer : u->server,b);
-				WriteServ(user->fd,"369 %s %s :End of WHOWAS",user->nick,parameters[0]);
+				user->WriteServ("314 %s %s %s %s * :%s",user->nick,parameters[0],u->ident,u->dhost,u->gecos);
+				
+				if(*user->oper)
+					user->WriteServ("379 %s %s :was connecting from *@%s", user->nick, parameters[0], u->host);
+				
+				if(*ServerInstance->Config->HideWhoisServer && !(*user->oper))
+					user->WriteServ("312 %s %s %s :%s",user->nick,parameters[0], ServerInstance->Config->HideWhoisServer, b);
+				else
+					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;
+}