Merge pull request #1337 from SaberUK/master+merge

[user/henk/code/inspircd.git] / src / modules / m_httpd_config.cpp

diff --git a/src/modules/m_httpd_config.cpp b/src/modules/m_httpd_config.cpp
index d495cfb5971d0bc5f90b83db626c3b0e58b83da3..6fd7f405013e6fcc22092bd4c32ac5833bb5712b 100644 (file)
--- a/src/modules/m_httpd_config.cpp
+++ b/src/modules/m_httpd_config.cpp
@@ -20,24 +20,18 @@
 
 #include "inspircd.h"
 #include "modules/httpd.h"
-#include "protocol.h"
 
-class ModuleHttpConfig : public Module
+class ModuleHttpConfig : public Module, public HTTPRequestEventListener
 {
        HTTPdAPI API;
 
  public:
        ModuleHttpConfig()
-               : API(this)
+               : HTTPRequestEventListener(this)
+               , API(this)
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               Implementation eventlist[] = { I_OnEvent };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-       }
-
        std::string Sanitize(const std::string &str)
        {
                std::string ret;
@@ -72,14 +66,12 @@ class ModuleHttpConfig : public Module
                return ret;
        }
 
-       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() == "/config") || (http->GetURI() == "/config/"))
                        {
@@ -103,8 +95,15 @@ class ModuleHttpConfig : public Module
                                response.headers.SetHeader("X-Powered-By", MODNAME);
                                response.headers.SetHeader("Content-Type", "text/html");
                                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