Add Inspircd::AddServices

[user/henk/code/inspircd.git] / src / modules / m_httpd_stats.cpp

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index cfe8f9782da72dc4cb907bedb92167fac9c0b35e..e34c4b43f178701c89d9bdf76a401490a1399c8b 100644 (file)
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -13,6 +13,7 @@
 
 #include "inspircd.h"
 #include "httpd.h"
+#include "xline.h"
 #include "protocol.h"
 
 /* $ModDesc: Provides statistics over HTTP via m_httpd.so */
@@ -69,14 +70,14 @@ class ModuleHttpStats : public Module
        void DumpMeta(std::stringstream& data, Extensible* ext)
        {
                data << "<metadata>";
-               for(ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++)
+               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 << "<meta name=\"" << item->key << "\"/>";
-                       else
-                               data << "<meta name=\"" << item->key << "\">" << Sanitize(value) << "</meta>";
+                       if (!value.empty())
+                               data << "<meta name=\"" << item->name << "\">" << Sanitize(value) << "</meta>";
+                       else if (!item->name.empty())
+                               data << "<meta name=\"" << item->name << "\"/>";
                }
                data << "</metadata>";
        }
@@ -92,12 +93,9 @@ class ModuleHttpStats : public Module
 
                        if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/"))
                        {
-                               data << "<inspircdstats>";
-
-                               data << "<server><name>" << ServerInstance->Config->ServerName << "</name><gecos>"
+                               data << "<inspircdstats><server><name>" << ServerInstance->Config->ServerName << "</name><gecos>"
                                        << Sanitize(ServerInstance->Config->ServerDesc) << "</gecos><version>"
-                                       << Sanitize(ServerInstance->GetVersionString()) << "</version><revision>"
-                                       << Sanitize(ServerInstance->GetRevision()) << "</revision></server>";
+                                       << Sanitize(ServerInstance->GetVersionString()) << "</version></server>";
 
                                data << "<general>";
                                data << "<usercount>" << ServerInstance->Users->clientlist->size() << "</usercount>";
@@ -112,8 +110,25 @@ 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>";
-                               data << "<modulelist>";
+                               data << "<isupport>" << Sanitize(ServerInstance->Config->data005) << "</isupport></general><xlines>";
+                               std::vector<std::string> xltypes = ServerInstance->XLines->GetAllTypes();
+                               for (std::vector<std::string>::iterator it = xltypes.begin(); it != xltypes.end(); ++it)
+                               {
+                                       XLineLookup* lookup = ServerInstance->XLines->GetAll(*it);
+
+                                       if (!lookup)
+                                               continue;
+                                       for (LookupIter i = lookup->begin(); i != lookup->end(); ++i)
+                                       {
+                                               data << "<xline type=\"" << it->c_str() << "\"><mask>"
+                                                       << Sanitize(i->second->Displayable()) << "</mask><settime>"
+                                                       << i->second->set_time << "</settime><duration>" << i->second->duration
+                                                       << "</duration><reason>" << Sanitize(i->second->reason)
+                                                       << "</reason></xline>";
+                                       }
+                               }
+
+                               data << "</xlines><modulelist>";
                                std::vector<std::string> module_names = ServerInstance->Modules->GetAllModuleNames(0);
 
                                for (std::vector<std::string>::iterator i = module_names.begin(); i != module_names.end(); ++i)
@@ -122,8 +137,7 @@ class ModuleHttpStats : public Module
                                        Version v = m->GetVersion();
                                        data << "<module><name>" << *i << "</name><version>" << v.version << "</version><description>" << Sanitize(v.description) << "</description></module>";
                                }
-                               data << "</modulelist>";
-                               data << "<channellist>";
+                               data << "</modulelist><channellist>";
 
                                for (chan_hash::const_iterator a = ServerInstance->chanlist->begin(); a != ServerInstance->chanlist->end(); ++a)
                                {
@@ -144,7 +158,9 @@ class ModuleHttpStats : public Module
                                                Membership* memb = x->second;
                                                data << "<channelmember><uid>" << memb->user->uuid << "</uid><privs>"
                                                        << Sanitize(c->GetAllPrefixChars(x->first)) << "</privs><modes>"
-                                                       << memb->modes << "</modes></channelmember>";
+                                                       << memb->modes << "</modes>";
+                                               DumpMeta(data, memb);
+                                               data << "</channelmember>";
                                        }
 
                                        DumpMeta(data, c);
@@ -165,10 +181,12 @@ class ModuleHttpStats : public Module
                                        if (IS_AWAY(u))
                                                data << "<away>" << Sanitize(u->awaymsg) << "</away><awaytime>" << u->awaytime << "</awaytime>";
                                        if (IS_OPER(u))
-                                               data << "<opertype>" << Sanitize(u->oper) << "</opertype>";
+                                               data << "<opertype>" << Sanitize(u->oper->NameStr()) << "</opertype>";
                                        data << "<modes>" << u->FormatModes() << "</modes><ident>" << Sanitize(u->ident) << "</ident>";
-                                       if (IS_LOCAL(u))
-                                               data << "<port>" << u->GetServerPort() << "</port><servaddr>" << irc::sockets::satouser(&u->server_sa) << "</servaddr>";
+                                       LocalUser* lu = IS_LOCAL(u);
+                                       if (lu)
+                                               data << "<port>" << lu->GetServerPort() << "</port><servaddr>"
+                                                       << irc::sockets::satouser(lu->server_sa) << "</servaddr>";
                                        data << "<ipaddress>" << u->GetIPString() << "</ipaddress>";
 
                                        DumpMeta(data, u);
@@ -194,9 +212,7 @@ class ModuleHttpStats : public Module
                                        data << "</server>";
                                }
 
-                               data << "</serverlist>";
-
-                               data << "</inspircdstats>";
+                               data << "</serverlist></inspircdstats>";
 
                                /* Send the document back to m_httpd */
                                HTTPDocumentResponse response(this, *http, &data, 200);
@@ -213,7 +229,7 @@ class ModuleHttpStats : public Module
 
        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);
        }
 };