Move OnStats from the core to a cross-module event.

[user/henk/code/inspircd.git] / src / coremods / core_whowas.cpp

diff --git a/src/coremods/core_whowas.cpp b/src/coremods/core_whowas.cpp
index 0bb47b2731546bade973a8191af552d96256ffad..689340a8d79d84469aa13353b32eaa90bba096fa 100644 (file)
--- 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)
@@ -57,8 +68,8 @@ CmdResult CommandWhowas::Handle (const std::vector<std::string>& parameters, Use
                                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,8 +241,8 @@ 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)
@@ -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)
        {
        }