X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_stats.cpp;h=7d7ebcf3d662d46332d87b06342524cecd38c998;hb=e9e75e50bc25e67af22dd88b39b12217a553d5cb;hp=547d6032f1ebbf2e219728ed99ac8d585295084e;hpb=83e36af589b433b00482e3c6b617165606e1ccbd;p=user%2Fhenk%2Fcode%2Finspircd.git
diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 547d6032f..7d7ebcf3d 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"
@@ -55,8 +55,7 @@ class ModuleHttpStats : public Module
ret += it->second;
ret += ';';
}
- else if (*x == 0x9 || *x == 0xA || *x == 0xD ||
- (*x >= 0x20 && *x <= 0xD7FF) || (*x >= 0xE000 && *x <= 0x10FFFF))
+ else if (*x == 0x9 || *x == 0xA || *x == 0xD || *x >= 0x20)
{
// The XML specification defines the following characters as valid inside an XML document:
// Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
@@ -98,7 +97,7 @@ class ModuleHttpStats : public Module
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/"))
@@ -120,7 +119,13 @@ class ModuleHttpStats : public Module
stime = gmtime(&server_uptime);
data << "" << stime->tm_yday << "" << stime->tm_hour << "" << stime->tm_min << "" << stime->tm_sec << "" << ServerInstance->startup_time << "";
- data << "" << Sanitize(ServerInstance->Config->data005) << "";
+ data << "";
+ const std::vector& isupport = ServerInstance->ISupport.GetLines();
+ for (std::vector::const_iterator it = isupport.begin(); it != isupport.end(); it++)
+ {
+ data << Sanitize(*it) << std::endl;
+ }
+ data << "";
std::vector xltypes = ServerInstance->XLines->GetAllTypes();
for (std::vector::iterator it = xltypes.begin(); it != xltypes.end(); ++it)
{
@@ -188,9 +193,9 @@ class ModuleHttpStats : public Module
data << "" << u->nick << "" << u->uuid << ""
<< u->host << "" << u->dhost << ""
<< Sanitize(u->fullname) << "" << u->server << "";
- if (IS_AWAY(u))
+ if (u->IsAway())
data << "" << Sanitize(u->awaymsg) << "" << u->awaytime << "";
- if (IS_OPER(u))
+ if (u->IsOper())
data << "" << Sanitize(u->oper->NameStr()) << "";
data << "" << u->FormatModes() << "" << Sanitize(u->ident) << "";
LocalUser* lu = IS_LOCAL(u);
@@ -233,10 +238,6 @@ class ModuleHttpStats : public Module
}
}
- virtual ~ModuleHttpStats()
- {
- }
-
virtual Version GetVersion()
{
return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR);