X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_stats.cpp;h=5288130ce359c246ca3557e5956acc22740a1a40;hb=a8878569083bfa4753e9e118adee0ed1da6a0325;hp=46f474e2df2c8a61f9b2ef19cb85dd533e815e78;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git
diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 46f474e2d..5288130ce 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -16,7 +16,6 @@
#include "protocol.h"
/* $ModDesc: Provides statistics over HTTP via m_httpd.so */
-/* $ModDep: httpd.h */
class ModuleHttpStats : public Module
{
@@ -35,8 +34,8 @@ class ModuleHttpStats : public Module
ModuleHttpStats() {
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, 1);
}
std::string Sanitize(const std::string &str)
@@ -67,20 +66,38 @@ class ModuleHttpStats : public Module
return ret;
}
- void OnEvent(Event* event)
+ void DumpMeta(std::stringstream& data, Extensible* ext)
+ {
+ data << "";
+ for(Extensible::ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++)
+ {
+ ExtensionItem* item = i->first;
+ std::string value = item->serialize(FORMAT_USER, ext, i->second);
+ if (!value.empty())
+ data << "key << "\">" << Sanitize(value) << "";
+ else if (!item->key.empty())
+ data << "key << "\"/>";
+ }
+ data << "";
+ }
+
+ 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() == "/stats") || (http->GetURI() == "/stats/"))
{
data << "";
- data << "" << ServerInstance->Config->ServerName << "" << Sanitize(ServerInstance->Config->ServerDesc) << "";
+ data << "" << ServerInstance->Config->ServerName << ""
+ << Sanitize(ServerInstance->Config->ServerDesc) << ""
+ << Sanitize(ServerInstance->GetVersionString()) << ""
+ << Sanitize(ServerInstance->GetRevision()) << "";
data << "";
data << "" << ServerInstance->Users->clientlist->size() << "";
@@ -95,8 +112,7 @@ 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 << "";
+ data << "" << Sanitize(ServerInstance->Config->data005) << "";
data << "";
std::vector module_names = ServerInstance->Modules->GetAllModuleNames(0);
@@ -104,7 +120,7 @@ class ModuleHttpStats : public Module
{
Module* m = ServerInstance->Modules->Find(i->c_str());
Version v = m->GetVersion();
- data << "" << *i << "" << v.version << "";
+ data << "" << *i << "" << v.version << "" << Sanitize(v.description) << "";
}
data << "";
data << "";
@@ -125,9 +141,16 @@ class ModuleHttpStats : public Module
for (UserMembCIter x = ulist->begin(); x != ulist->end(); ++x)
{
- data << "" << x->first->uuid << "" << Sanitize(c->GetAllPrefixChars(x->first)) << "";
+ Membership* memb = x->second;
+ data << "" << memb->user->uuid << ""
+ << Sanitize(c->GetAllPrefixChars(x->first)) << ""
+ << memb->modes << "";
+ DumpMeta(data, memb);
+ data << "";
}
+ DumpMeta(data, c);
+
data << "";
}
@@ -138,14 +161,20 @@ class ModuleHttpStats : public Module
User* u = a->second;
data << "";
- data << "" << u->nick << "" << u->uuid << "" << u->host << "" << u->dhost << "";
- data << "" << Sanitize(u->fullname) << "" << u->server << "" << Sanitize(u->awaymsg) << "" << Sanitize(u->oper) << "";
- std::string modes;
- for (unsigned char n = 'A'; n <= 'z'; ++n)
- if (u->IsModeSet(n))
- modes += n;
-
- data << modes << "" << Sanitize(u->ident) << "" << u->GetServerPort() << "" << u->GetIPString() << "";
+ data << "" << u->nick << "" << u->uuid << ""
+ << u->host << "" << u->dhost << ""
+ << Sanitize(u->fullname) << "" << u->server << "";
+ if (IS_AWAY(u))
+ data << "" << Sanitize(u->awaymsg) << "" << u->awaytime << "";
+ if (IS_OPER(u))
+ data << "" << Sanitize(u->oper) << "";
+ data << "" << u->FormatModes() << "" << Sanitize(u->ident) << "";
+ if (IS_LOCAL(u))
+ data << "" << u->GetServerPort() << "" << irc::sockets::satouser(&u->server_sa) << "";
+ data << "" << u->GetIPString() << "";
+
+ DumpMeta(data, u);
+
data << "";
}
@@ -172,28 +201,21 @@ class ModuleHttpStats : public Module
data << "";
/* 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_stats.so");
response.headers.SetHeader("Content-Type", "text/xml");
- Request req((char*)&response, (Module*)this, event->GetSource());
- req.Send();
+ response.Send();
}
}
}
- const char* OnRequest(Request* request)
- {
- return NULL;
- }
-
-
virtual ~ModuleHttpStats()
{
}
virtual Version GetVersion()
{
- return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR, API_VERSION);
+ return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR);
}
};