X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fcommands%2Fcmd_whowas.h;h=99d12cca4d770624ece9320ff9f8060fe4cb3145;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=4df20e579ac7eeeafdf6ba42bf4f489ba8fa0921;hpb=1afe64600c5affe07bc51cb0be4cc9f2229247da;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h
index 4df20e579..99d12cca4 100644
--- a/include/commands/cmd_whowas.h
+++ b/include/commands/cmd_whowas.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *      the file COPYING for details.
@@ -13,20 +13,25 @@
 
 #ifndef __CMD_WHOWAS_H__
 #define __CMD_WHOWAS_H__
+#include "modules.h"
 
-
-// include the common header files
-
-#include "users.h"
-#include "channels.h"
-
-/* list of available internal commands */
-enum Internals
+struct WhowasRequest : public Request
 {
-	WHOWAS_ADD = 1,
-	WHOWAS_STATS = 2,
-	WHOWAS_PRUNE = 3,
-	WHOWAS_MAINTAIN = 4
+	/* list of available internal commands */
+	enum Internals
+	{
+		WHOWAS_ADD = 1,
+		WHOWAS_STATS = 2,
+		WHOWAS_PRUNE = 3,
+		WHOWAS_MAINTAIN = 4
+	};
+
+	const Internals type;
+	std::string value;
+	User* user;
+
+	WhowasRequest(Module* src, Module* whowas, Internals Type) : Request(src, whowas, "WHOWAS"), type(Type)
+	{}
 };
 
 /* Forward ref for timer */
@@ -56,13 +61,13 @@ typedef std::deque<std::pair<time_t,irc::string> > whowas_users_fifo;
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_whowas : public Command
+class CommandWhowas : public Command
 {
   private:
 	/** Whowas container, contains a map of vectors of users tracked by WHOWAS
 	 */
 	whowas_users whowas;
-	
+
 	/** Whowas container, contains a map of time_t to users tracked by WHOWAS
 	 */
 	whowas_users_fifo whowas_fifo;
@@ -72,27 +77,19 @@ class cmd_whowas : public Command
 	std::string stats;
 
   public:
-	cmd_whowas(InspIRCd* Instance);
+	CommandWhowas(Module* parent);
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
-	/** Handle an internal request from another command, the core, or a module
-	 * @param Command ID
-	 * @param Zero or more parameters, whos form is specified by the command ID.
-	 * @return Return CMD_SUCCESS on success, or CMD_FAILURE on failure.
-	 * If the command succeeds but should remain local to this server,
-	 * return CMD_LOCALONLY.
-	 */
-	CmdResult HandleInternal(const unsigned int id, const std::deque<classbase*> &parameters);
+	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 	void AddToWhoWas(User* user);
-	void GetStats(Extensible* ext);
+	std::string GetStats();
 	void PruneWhoWas(time_t t);
 	void MaintainWhoWas(time_t t);
-	virtual ~cmd_whowas();
+	~CommandWhowas();
 };
 
 /** Used to hold WHOWAS information
@@ -102,19 +99,19 @@ class WhoWasGroup : public classbase
  public:
 	/** Real host
 	 */
-	char* host;
+	std::string host;
 	/** Displayed host
 	 */
-	char* dhost;
+	std::string dhost;
 	/** Ident
 	 */
-	char* ident;
+	std::string ident;
 	/** Server name
 	 */
 	const char* server;
 	/** Fullname (GECOS)
 	 */
-	char* gecos;
+	std::string gecos;
 	/** Signon time
 	 */
 	time_t signon;
@@ -129,11 +126,9 @@ class WhoWasGroup : public classbase
 
 class WhoWasMaintainTimer : public Timer
 {
-  private:
-	InspIRCd* ServerInstance;
   public:
-	WhoWasMaintainTimer(InspIRCd* Instance, long interval)
-	: Timer(interval, Instance->Time(), true), ServerInstance(Instance)
+	WhoWasMaintainTimer(long interval)
+	: Timer(interval, ServerInstance->Time(), true)
 	{
 	}
 	virtual void Tick(time_t TIME);