X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_whowas.cpp;h=bb8866239f444c3b1586713452e3a1de5dcd22c2;hb=84a19a9ab6129deb71cdc24b216b74dd8eb80978;hp=8ec5c095784172c5e3924176cef71ebe540a1e94;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp
index 8ec5c0957..bb8866239 100644
--- a/src/cmd_whowas.cpp
+++ b/src/cmd_whowas.cpp
@@ -14,78 +14,58 @@
  * ---------------------------------------------------
  */
 
-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 whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
+extern whowas_users whowas;
 
 void cmd_whowas::Handle (char **parameters, int pcnt, userrec* user)
 {
-	whowas_hash::iterator i = whowas.find(parameters[0]);
+	whowas_users::iterator i = whowas.find(parameters[0]);
 
 	if (i == whowas.end())
 	{
 		WriteServ(user->fd,"406 %s %s :There was no such nickname",user->nick,parameters[0]);
-		WriteServ(user->fd,"369 %s %s :End of WHOWAS",user->nick,parameters[0]);
 	}
 	else
 	{
-		time_t rawtime = i->second->signon;
-		tm *timeinfo;
-		char b[MAXBUF];
-		
-		timeinfo = localtime(&rawtime);
-		strlcpy(b,asctime(timeinfo),MAXBUF);
-		b[strlen(b)-1] = '\0';
-		
-		WriteServ(user->fd,"314 %s %s %s %s * :%s",user->nick,i->second->nick,i->second->ident,i->second->dhost,i->second->fullname);
-		WriteServ(user->fd,"312 %s %s %s :%s",user->nick,i->second->nick,i->second->server,b);
-		WriteServ(user->fd,"369 %s %s :End of WHOWAS",user->nick,parameters[0]);
-	}
+		whowas_set* grp = i->second;
+		if (grp->size())
+		{
+			for (whowas_set::iterator ux = grp->begin(); ux != grp->end(); ux++)
+			{
+				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);
+				
+				if(*user->oper)
+					WriteServ(user->fd,"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);
+				else
+					WriteServ(user->fd,"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]);
+		}
+	}
+	
+	WriteServ(user->fd,"369 %s %s :End of WHOWAS",user->nick,parameters[0]);
 }
-
-