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

diff --git a/src/coremods/core_whowas.cpp b/src/coremods/core_whowas.cpp
index 79ce94cc9..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,19 +41,19 @@ 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())
 	{
-		user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s :This command has been disabled.", name.c_str());
+		user->WriteNumeric(ERR_UNKNOWNCOMMAND, name, "This command has been disabled.");
 		return CMD_FAILURE;
 	}
 
 	const WhoWas::Nick* const nick = manager.FindNick(parameters[0]);
 	if (!nick)
 	{
-		user->WriteNumeric(ERR_WASNOSUCHNICK, "%s :There was no such nickname", parameters[0].c_str());
+		user->WriteNumeric(ERR_WASNOSUCHNICK, parameters[0], "There was no such nickname");
 	}
 	else
 	{
@@ -51,18 +62,18 @@ CmdResult CommandWhowas::Handle (const std::vector<std::string>& parameters, Use
 		{
 			WhoWas::Entry* u = *i;
 
-			user->WriteNumeric(RPL_WHOWASUSER, "%s %s %s * :%s", parameters[0].c_str(), u->ident.c_str(),u->dhost.c_str(),u->gecos.c_str());
+			user->WriteNumeric(RPL_WHOWASUSER, parameters[0], u->ident, u->dhost, '*', u->real);
 
 			if (user->HasPrivPermission("users/auspex"))
-				user->WriteNumeric(RPL_WHOWASIP, "%s :was connecting from *@%s", parameters[0].c_str(), u->host.c_str());
+				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, "%s %s :%s", parameters[0].c_str(), (hide_server ? ServerInstance->Config->HideWhoisServer.c_str() : u->server.c_str()), signon.c_str());
+			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);
 		}
 	}
 
-	user->WriteNumeric(RPL_ENDOFWHOWAS, "%s :End of WHOWAS", parameters[0].c_str());
+	user->WriteNumeric(RPL_ENDOFWHOWAS, parameters[0], "End of WHOWAS");
 	return CMD_SUCCESS;
 }
 
@@ -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,30 +261,32 @@ 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)
 	{
 	}
 
-	void OnGarbageCollect()
+	void OnGarbageCollect() CXX11_OVERRIDE
 	{
 		// Remove all entries older than MaxKeep
 		cmd.manager.Maintain();
 	}
 
-	void OnUserQuit(User* user, const std::string& message, const std::string& oper_message)
+	void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) CXX11_OVERRIDE
 	{
 		cmd.manager.Add(user);
 	}
 
-	ModResult OnStats(char symbol, User* user, string_list &results)
+	ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE
 	{
-		if (symbol == 'z')
-			results.push_back("249 "+user->nick+" :Whowas entries: "+ConvToStr(cmd.manager.GetStats().entrycount));
+		if (stats.GetSymbol() == 'z')
+			stats.AddRow(249, "Whowas entries: "+ConvToStr(cmd.manager.GetStats().entrycount));
 
 		return MOD_RES_PASSTHRU;
 	}
@@ -281,14 +294,14 @@ 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);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("WHOWAS", VF_VENDOR);
 	}