Fix the OnSendWhoLine event being completely broken with WHOX.

[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 f456a57db68dd8a877173166c900f7e63b57aea8..65c83e08b5895ba208ec64f5692b0f909f4b1060 100644 (file)
--- a/src/coremods/core_whowas.cpp
+++ b/src/coremods/core_whowas.cpp
@@ -22,6 +22,7 @@
 
 #include "inspircd.h"
 #include "commands/cmd_whowas.h"
+#include "modules/stats.h"
 
 enum
 {
@@ -40,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())
@@ -61,7 +62,7 @@ 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()));
@@ -244,7 +245,7 @@ WhoWas::Entry::Entry(User* user)
        , dhost(user->GetDisplayedHost())
        , ident(user->ident)
        , server(user->server->GetName())
-       , gecos(user->fullname)
+       , real(user->GetRealName())
        , signon(user->signon)
 {
 }
@@ -260,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)
        {
        }
 
@@ -291,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);