X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_config.cpp;h=62314cd7ea0eef94282e3b4c8f94eaf8d0855f4a;hb=ac8a394a5c01d8cecd6d1fd364173825ecb452ae;hp=f68bc471fc7452dc3b3d3c3baf99ad6369ad9c6a;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd_config.cpp b/src/modules/m_httpd_config.cpp
index f68bc471f..62314cd7e 100644
--- a/src/modules/m_httpd_config.cpp
+++ b/src/modules/m_httpd_config.cpp
@@ -1,43 +1,36 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "httpd.h"
 #include "protocol.h"
 
-/* $ModDesc: Provides statistics over HTTP via m_httpd.so */
-/* $ModDep: httpd.h */
+/* $ModDesc: Allows for the server configuration to be viewed over HTTP via m_httpd.so */
 
-class ModuleHttpStats : public Module
+class ModuleHttpConfig : public Module
 {
-
-	std::string stylesheet;
-	bool changed;
-
  public:
-
-	void ReadConfig()
-	{
-		ConfigReader c(ServerInstance);
-		this->stylesheet = c.ReadValue("httpstats", "stylesheet", 0);
-	}
-
-	ModuleHttpStats(InspIRCd* Me) : Module(Me)
+	void init()
 	{
-		ReadConfig();
-		this->changed = true;
-		Implementation eventlist[] = { I_OnEvent, I_OnRequest };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		Implementation eventlist[] = { I_OnEvent };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	std::string Sanitize(const std::string &str)
@@ -74,14 +67,14 @@ class ModuleHttpStats : public Module
 		return ret;
 	}
 
-	void OnEvent(Event* event)
+	void OnEvent(Event& event)
 	{
 		std::stringstream data("");
 
-		if (event->GetEventID() == "httpd_url")
+		if (event.id == "httpd_url")
 		{
 			ServerInstance->Logs->Log("m_http_stats", DEBUG,"Handling httpd event");
-			HTTPRequest* http = (HTTPRequest*)event->GetData();
+			HTTPRequest* http = (HTTPRequest*)&event;
 
 			if ((http->GetURI() == "/config") || (http->GetURI() == "/config/"))
 			{
@@ -91,38 +84,32 @@ class ModuleHttpStats : public Module
 				for (ConfigDataHash::iterator x = ServerInstance->Config->config_data.begin(); x != ServerInstance->Config->config_data.end(); ++x)
 				{
 					data << "&lt;" << x->first << " ";
-					for (KeyValList::iterator j = x->second.begin(); j != x->second.end(); j++)
+					ConfigTag* tag = x->second;
+					for (std::vector<KeyVal>::const_iterator j = tag->getItems().begin(); j != tag->getItems().end(); j++)
 					{
-						data << j->first << "=&quot;" << j->second << "&quot; ";
+						data << Sanitize(j->first) << "=&quot;" << Sanitize(j->second) << "&quot; ";
 					}
 					data << "&gt;<br>";
 				}
 
 				data << "</body></html>";
 				/* Send the document back to m_httpd */
-				HTTPDocument response(http->sock, &data, 200);
+				HTTPDocumentResponse response(this, *http, &data, 200);
 				response.headers.SetHeader("X-Powered-By", "m_httpd_config.so");
 				response.headers.SetHeader("Content-Type", "text/html");
-				Request req((char*)&response, (Module*)this, event->GetSource());
-				req.Send();
+				response.Send();
 			}
 		}
 	}
 
-	const char* OnRequest(Request* request)
-	{
-		return NULL;
-	}
-
-
-	virtual ~ModuleHttpStats()
+	virtual ~ModuleHttpConfig()
 	{
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Allows for the server configuration to be viewed over HTTP via m_httpd.so", VF_VENDOR);
 	}
 };
 
-MODULE_INIT(ModuleHttpStats)
+MODULE_INIT(ModuleHttpConfig)