X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcoremods%2Fcore_whowas.cpp;h=73251b442d0757d8adb533aec9aadb0c1050b3fa;hb=8cb20e354533fbec24aafd4e61ff6fa69b434aa2;hp=0bb47b2731546bade973a8191af552d96256ffad;hpb=a3e0768758ca68429a29d9c78ce672f2d938c6e7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_whowas.cpp b/src/coremods/core_whowas.cpp
index 0bb47b273..73251b442 100644
--- a/src/coremods/core_whowas.cpp
+++ b/src/coremods/core_whowas.cpp
@@ -22,6 +22,17 @@
 
 #include "inspircd.h"
 #include "commands/cmd_whowas.h"
+#include "modules/stats.h"
+
+enum
+{
+	// From RFC 1459.
+	RPL_WHOWASUSER = 314,
+	RPL_ENDOFWHOWAS = 369,
+
+	// InspIRCd-specific.
+	RPL_WHOWASIP = 652
+};
 
 CommandWhowas::CommandWhowas( Module* parent)
 	: Command(parent, "WHOWAS", 1)
@@ -30,7 +41,7 @@ CommandWhowas::CommandWhowas( Module* parent)
 	Penalty = 2;
 }
 
-CmdResult CommandWhowas::Handle (const std::vector<std::string>& parameters, User* user)
+CmdResult CommandWhowas::Handle(User* user, const Params& parameters)
 {
 	/* if whowas disabled in config */
 	if (!manager.IsEnabled())
@@ -51,14 +62,14 @@ CmdResult CommandWhowas::Handle (const std::vector<std::string>& parameters, Use
 		{
 			WhoWas::Entry* u = *i;
 
-			user->WriteNumeric(RPL_WHOWASUSER, parameters[0], u->ident, u->dhost, '*', u->gecos);
+			user->WriteNumeric(RPL_WHOWASUSER, parameters[0], u->ident, u->dhost, '*', u->real);
 
 			if (user->HasPrivPermission("users/auspex"))
 				user->WriteNumeric(RPL_WHOWASIP, parameters[0], InspIRCd::Format("was connecting from *@%s", u->host.c_str()));
 
 			std::string signon = InspIRCd::TimeString(u->signon);
-			bool hide_server = (!ServerInstance->Config->HideWhoisServer.empty() && !user->HasPrivPermission("servers/auspex"));
-			user->WriteNumeric(RPL_WHOISSERVER, parameters[0], (hide_server ? ServerInstance->Config->HideWhoisServer : u->server), signon);
+			bool hide_server = (!ServerInstance->Config->HideServer.empty() && !user->HasPrivPermission("servers/auspex"));
+			user->WriteNumeric(RPL_WHOISSERVER, parameters[0], (hide_server ? ServerInstance->Config->HideServer : u->server), signon);
 		}
 	}
 
@@ -230,11 +241,11 @@ void WhoWas::Manager::PurgeNick(WhoWas::Nick* nick)
 }
 
 WhoWas::Entry::Entry(User* user)
-	: host(user->host)
-	, dhost(user->dhost)
+	: host(user->GetRealHost())
+	, dhost(user->GetDisplayedHost())
 	, ident(user->ident)
 	, server(user->server->GetName())
-	, gecos(user->fullname)
+	, real(user->fullname)
 	, signon(user->signon)
 {
 }
@@ -250,12 +261,14 @@ WhoWas::Nick::~Nick()
 	stdalgo::delete_all(entries);
 }
 
-class ModuleWhoWas : public Module
+class ModuleWhoWas : public Module, public Stats::EventListener
 {
 	CommandWhowas cmd;
 
  public:
-	ModuleWhoWas() : cmd(this)
+	ModuleWhoWas()
+		: Stats::EventListener(this)
+		, cmd(this)
 	{
 	}
 
@@ -281,8 +294,8 @@ class ModuleWhoWas : public Module
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("whowas");
-		unsigned int NewGroupSize = tag->getInt("groupsize", 10, 0, 10000);
-		unsigned int NewMaxGroups = tag->getInt("maxgroups", 10240, 0, 1000000);
+		unsigned int NewGroupSize = tag->getUInt("groupsize", 10, 0, 10000);
+		unsigned int NewMaxGroups = tag->getUInt("maxgroups", 10240, 0, 1000000);
 		unsigned int NewMaxKeep = tag->getDuration("maxkeep", 3600, 3600);
 
 		cmd.manager.UpdateConfig(NewGroupSize, NewMaxGroups, NewMaxKeep);