X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_stats.cpp;h=faf42d071e5793d7f0c94aab7f936b154f08221c;hb=f2cdf27dd9c45f91f4184b81ea3b9be7c5d88173;hp=b3a13ada6dec42a9ca48278a7b001e3965691ce8;hpb=26e7bb0b9a17a595d9935a1cae41b44504ad213e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index b3a13ada6..faf42d071 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -22,7 +22,7 @@
 
 
 #include "inspircd.h"
-#include "httpd.h"
+#include "modules/httpd.h"
 #include "xline.h"
 #include "protocol.h"
 
@@ -31,10 +31,15 @@
 class ModuleHttpStats : public Module
 {
 	static std::map<char, char const*> const &entities;
+	HTTPdAPI API;
 
  public:
+	ModuleHttpStats()
+		: API(this)
+	{
+	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		Implementation eventlist[] = { I_OnEvent };
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
@@ -91,13 +96,13 @@ class ModuleHttpStats : public Module
 		data << "</metadata>";
 	}
 
-	void OnEvent(Event& event)
+	void OnEvent(Event& event) CXX11_OVERRIDE
 	{
 		std::stringstream data("");
 
 		if (event.id == "httpd_url")
 		{
-			ServerInstance->Logs->Log("m_http_stats", DEBUG,"Handling httpd event");
+			ServerInstance->Logs->Log("m_http_stats", LOG_DEBUG, "Handling httpd event");
 			HTTPRequest* http = (HTTPRequest*)&event;
 
 			if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/"))
@@ -119,7 +124,13 @@ class ModuleHttpStats : public Module
 				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 << "<isupport>" << Sanitize(ServerInstance->Config->data005) << "</isupport></general><xlines>";
+				data << "<isupport>";
+				const std::vector<std::string>& isupport = ServerInstance->ISupport.GetLines();
+				for (std::vector<std::string>::const_iterator it = isupport.begin(); it != isupport.end(); it++)
+				{
+					data << Sanitize(*it) << std::endl;
+				}
+				data << "</isupport></general><xlines>";
 				std::vector<std::string> xltypes = ServerInstance->XLines->GetAllTypes();
 				for (std::vector<std::string>::iterator it = xltypes.begin(); it != xltypes.end(); ++it)
 				{
@@ -187,10 +198,10 @@ class ModuleHttpStats : public Module
 					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>";
-					if (IS_AWAY(u))
+					if (u->IsAway())
 						data << "<away>" << Sanitize(u->awaymsg) << "</away><awaytime>" << u->awaytime << "</awaytime>";
-					if (IS_OPER(u))
-						data << "<opertype>" << Sanitize(u->oper->NameStr()) << "</opertype>";
+					if (u->IsOper())
+						data << "<opertype>" << Sanitize(u->oper->name) << "</opertype>";
 					data << "<modes>" << u->FormatModes() << "</modes><ident>" << Sanitize(u->ident) << "</ident>";
 					LocalUser* lu = IS_LOCAL(u);
 					if (lu)
@@ -227,12 +238,12 @@ class ModuleHttpStats : public Module
 				HTTPDocumentResponse response(this, *http, &data, 200);
 				response.headers.SetHeader("X-Powered-By", "m_httpd_stats.so");
 				response.headers.SetHeader("Content-Type", "text/xml");
-				response.Send();
+				API->SendResponse(response);
 			}
 		}
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR);
 	}