X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_config.cpp;h=c47ddb5b2fb8ae70b5d36d832f246e76b3bb4f9e;hb=4132a44396d8fa3d23f87b5cbea5b928aa09769f;hp=88594e2fe288ae19cb6c38b2d43c64c5f170d850;hpb=a5fe50aca04ca554d313e7361c571c6a497a9c4e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd_config.cpp b/src/modules/m_httpd_config.cpp
index 88594e2fe..c47ddb5b2 100644
--- a/src/modules/m_httpd_config.cpp
+++ b/src/modules/m_httpd_config.cpp
@@ -19,18 +19,17 @@
 
 
 #include "inspircd.h"
-#include "httpd.h"
-#include "protocol.h"
+#include "modules/httpd.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()
+	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)
+	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/"))
 			{
@@ -84,8 +81,8 @@ class ModuleHttpConfig : public Module
 				for (ConfigDataHash::iterator x = ServerInstance->Config->config_data.begin(); x != ServerInstance->Config->config_data.end(); ++x)
 				{
 					data << "&lt;" << x->first << " ";
-					ConfigTag* tag = x->second;
-					for (std::vector<KeyVal>::const_iterator j = tag->getItems().begin(); j != tag->getItems().end(); j++)
+					const ConfigItems& items = x->second->getItems();
+					for (ConfigItems::const_iterator j = items.begin(); j != items.end(); j++)
 					{
 						data << Sanitize(j->first) << "=&quot;" << Sanitize(j->second) << "&quot; ";
 					}
@@ -95,16 +92,23 @@ 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);
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Allows for the server configuration to be viewed over HTTP via m_httpd.so", VF_VENDOR);
+		return Version("Allows for the server configuration to be viewed over HTTP via m_httpd", VF_VENDOR);
 	}
 };