Merge branch 'master+crossmodevents'

diff --combined src/modules/m_httpd_stats.cpp
index 35a4b0fb2115ee4d50bd4648e909b06f0038b3a1,983566e555967ac9c89375bd6ae32ac7b054b7f0..ad0b4bb72caac277ebda2d9ed21226c54515e8df
--- 1/src/modules/m_httpd_stats.cpp
--- 2/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@@ -25,14 -25,15 +25,15 @@@
  #include "modules/httpd.h"
  #include "xline.h"
  
- class ModuleHttpStats : public Module
+ class ModuleHttpStats : public Module, public HTTPRequestEventListener
  {
        static const insp::flat_map<char, char const*>& entities;
        HTTPdAPI API;
  
   public:
        ModuleHttpStats()
-               : API(this)
+               : HTTPRequestEventListener(this)
+               , API(this)
        {
        }
  
@@@ -87,14 -88,12 +88,12 @@@
                data << "</metadata>";
        }
  
-       void OnEvent(Event& event) CXX11_OVERRIDE
+       ModResult HandleRequest(HTTPRequest* http)
        {
                std::stringstream data("");
  
-               if (event.id == "httpd_url")
                {
                        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Handling httpd event");
-                       HTTPRequest* http = (HTTPRequest*)&event;
  
                        if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/"))
                        {
@@@ -107,7 -106,13 +106,7 @@@
                                data << "<channelcount>" << ServerInstance->GetChans().size() << "</channelcount>";
                                data << "<opercount>" << ServerInstance->Users->all_opers.size() << "</opercount>";
                                data << "<socketcount>" << (SocketEngine::GetUsedFds()) << "</socketcount><socketmax>" << SocketEngine::GetMaxFds() << "</socketmax><socketengine>" INSPIRCD_SOCKETENGINE_NAME "</socketengine>";
 -
 -                              time_t current_time = 0;
 -                              current_time = ServerInstance->Time();
 -                              time_t server_uptime = current_time - ServerInstance->startup_time;
 -                              struct tm* stime;
 -                              stime = gmtime(&server_uptime);
 -                              data << "<uptime><days>" << stime->tm_yday << "</days><hours>" << stime->tm_hour << "</hours><mins>" << stime->tm_min << "</mins><secs>" << stime->tm_sec << "</secs><boot_time_t>" << ServerInstance->startup_time << "</boot_time_t></uptime>";
 +                              data << "<uptime><boot_time_t>" << ServerInstance->startup_time << "</boot_time_t></uptime>";
  
                                data << "<isupport>";
                                const std::vector<std::string>& isupport = ServerInstance->ISupport.GetLines();
@@@ -183,7 -188,7 +182,7 @@@
                                        data << "<user>";
                                        data << "<nickname>" << u->nick << "</nickname><uuid>" << u->uuid << "</uuid><realhost>"
                                                << u->host << "</realhost><displayhost>" << u->dhost << "</displayhost><gecos>"
 -                                              << Sanitize(u->fullname) << "</gecos><server>" << u->server << "</server>";
 +                                              << Sanitize(u->fullname) << "</gecos><server>" << u->server->GetName() << "</server>";
                                        if (u->IsAway())
                                                data << "<away>" << Sanitize(u->awaymsg) << "</away><awaytime>" << u->awaytime << "</awaytime>";
                                        if (u->IsOper())
@@@ -225,8 -230,15 +224,15 @@@
                                response.headers.SetHeader("X-Powered-By", MODNAME);
                                response.headers.SetHeader("Content-Type", "text/xml");
                                API->SendResponse(response);
+                               return MOD_RES_DENY; // Handled
                        }
                }
+               return MOD_RES_PASSTHRU;
+       }
+ 
+       ModResult OnHTTPRequest(HTTPRequest& req) CXX11_OVERRIDE
+       {
+               return HandleRequest(&req);
        }
  
        Version GetVersion() CXX11_OVERRIDE