X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_config.cpp;h=6fd7f405013e6fcc22092bd4c32ac5833bb5712b;hb=f471083cd0519d47c7c7a09029813ede41994f7b;hp=a9fdd44fb3b96e3a18f172c8fcc285f461f64a01;hpb=3e105c6311c23787ff54388c8d21c8ac1a01fd57;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd_config.cpp b/src/modules/m_httpd_config.cpp
index a9fdd44fb..6fd7f4050 100644
--- a/src/modules/m_httpd_config.cpp
+++ b/src/modules/m_httpd_config.cpp
@@ -20,17 +20,16 @@
 
 #include "inspircd.h"
 #include "modules/httpd.h"
-#include "protocol.h"
 
-/* $ModDesc: Allows for the server configuration to be viewed over HTTP via m_httpd.so */
-
-class ModuleHttpConfig : public Module
+class ModuleHttpConfig : public Module, public HTTPRequestEventListener
 {
+	HTTPdAPI API;
+
  public:
-	void init() CXX11_OVERRIDE
+	ModuleHttpConfig()
+		: HTTPRequestEventListener(this)
+		, API(this)
 	{
-		Implementation eventlist[] = { I_OnEvent };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	std::string Sanitize(const std::string &str)
@@ -67,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("m_http_stats", LOG_DEBUG, "Handling httpd event");
-			HTTPRequest* http = (HTTPRequest*)&event;
+			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Handling httpd event");
 
 			if ((http->GetURI() == "/config") || (http->GetURI() == "/config/"))
 			{
@@ -95,11 +92,18 @@ class ModuleHttpConfig : public Module
 				data << "</body></html>";
 				/* Send the document back to m_httpd */
 				HTTPDocumentResponse response(this, *http, &data, 200);
-				response.headers.SetHeader("X-Powered-By", "m_httpd_config.so");
+				response.headers.SetHeader("X-Powered-By", MODNAME);
 				response.headers.SetHeader("Content-Type", "text/html");
-				response.Send();
+				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