X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fcommands%2Fcmd_whowas.h;h=d333541228903ae722d7d58d9f9928093bd10053;hb=9f69e159adcc0892f0bdef16ac4617630737b156;hp=28ded7ca2bb038989d862595aa63bd6f463a3614;hpb=ee47b42586e1c8fdf17c196ed92ac78ed6502599;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h
index 28ded7ca2..d33354122 100644
--- a/include/commands/cmd_whowas.h
+++ b/include/commands/cmd_whowas.h
@@ -1,32 +1,45 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *      the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __CMD_WHOWAS_H__
-#define __CMD_WHOWAS_H__
-
 
-// include the common header files
+#ifndef CMD_WHOWAS_H
+#define CMD_WHOWAS_H
+#include "modules.h"
 
-#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 */
@@ -35,7 +48,7 @@ class WhoWasMaintainTimer;
 /* Forward ref for typedefs */
 class WhoWasGroup;
 
-/** InspTimer that is used to maintain the whowas list, called once an hour
+/** Timer that is used to maintain the whowas list, called once an hour
  */
 extern WhoWasMaintainTimer* timer;
 
@@ -56,84 +69,70 @@ 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_t
+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;
 
-	/* String holding stats so it can be collected
-	 */
-	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, userrec *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(userrec* user);
-	void GetStats(Extensible* ext);
+	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+	void AddToWhoWas(User* user);
+	std::string GetStats();
 	void PruneWhoWas(time_t t);
 	void MaintainWhoWas(time_t t);
-	virtual ~cmd_whowas();
+	~CommandWhowas();
 };
 
 /** Used to hold WHOWAS information
  */
-class WhoWasGroup : public classbase
+class WhoWasGroup
 {
  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;
+	std::string server;
 	/** Fullname (GECOS)
 	 */
-	char* gecos;
+	std::string gecos;
 	/** Signon time
 	 */
 	time_t signon;
 
-	/** Initialize this WhoQasFroup with a user
+	/** Initialize this WhoWasFroup with a user
 	 */
-	WhoWasGroup(userrec* user);
+	WhoWasGroup(User* user);
 	/** Destructor
 	 */
 	~WhoWasGroup();
 };
 
-class WhoWasMaintainTimer : public InspTimer
+class WhoWasMaintainTimer : public Timer
 {
-  private:
-	InspIRCd* ServerInstance;
   public:
-	WhoWasMaintainTimer(InspIRCd* Instance, long interval)
-	: InspTimer(interval, Instance->Time(), true), ServerInstance(Instance)
+	WhoWasMaintainTimer(long interval)
+	: Timer(interval, ServerInstance->Time(), true)
 	{
 	}
 	virtual void Tick(time_t TIME);