X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fcommands%2Fcmd_whowas.h;h=19b7b74fdd7a26ecc012d24608f3f3ba3aef1ce7;hb=ab8305ad99d7bb7d2cfe4154b2deb007546d5b70;hp=9788b3d335e598b5b97ccd4a05be0f01b9ab3479;hpb=94bb5343b1464cbec9f58ee9d90a3deae3ac5308;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h
index 9788b3d33..19b7b74fd 100644
--- a/include/commands/cmd_whowas.h
+++ b/include/commands/cmd_whowas.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -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 */
@@ -67,12 +72,8 @@ class CommandWhowas : public Command
 	 */
 	whowas_users_fifo whowas_fifo;
 
-	/* String holding stats so it can be collected
-	 */
-	std::string stats;
-
   public:
-	CommandWhowas(InspIRCd* Instance);
+	CommandWhowas(Module* parent);
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
@@ -80,24 +81,16 @@ class CommandWhowas : public Command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
 	CmdResult Handle(const std::vector<std::string>& parameters, 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);
 	void AddToWhoWas(User* user);
-	void GetStats(Extensible* ext);
+	std::string GetStats();
 	void PruneWhoWas(time_t t);
 	void MaintainWhoWas(time_t t);
-	virtual ~CommandWhowas();
+	~CommandWhowas();
 };
 
 /** Used to hold WHOWAS information
  */
-class WhoWasGroup : public classbase
+class WhoWasGroup
 {
  public:
 	/** Real host
@@ -111,7 +104,7 @@ class WhoWasGroup : public classbase
 	std::string ident;
 	/** Server name
 	 */
-	const char* server;
+	std::string server;
 	/** Fullname (GECOS)
 	 */
 	std::string gecos;
@@ -119,7 +112,7 @@ class WhoWasGroup : public classbase
 	 */
 	time_t signon;
 
-	/** Initialize this WhoQasFroup with a user
+	/** Initialize this WhoWasFroup with a user
 	 */
 	WhoWasGroup(User* user);
 	/** Destructor
@@ -129,11 +122,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);