Add <gecos> field to <server> in XML stats output, also add to ProtoServer. Fixes...

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9971 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/protocol.h b/include/protocol.h
index 87d4ea384bb23c469ece668544276087c7aaaba3..8579f03aacdfc74beafd669911912403ef194bfa 100644 (file)
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -26,6 +26,7 @@ class ProtoServer
  public:
        std::string servername;
        std::string parentname;
+       std::string gecos;
        unsigned int usercount;
        unsigned int opercount;
        unsigned int latencyms;

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index ad4723ccb7aaf70ecca5ac5f5041632984306776..5aa433318dd2d0c9070385b1f30bf8f99bc958d3 100644 (file)
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -121,7 +121,7 @@ class ModuleHttpStats : public Module
                                         data << "<channeltopic>";
                                                data << "<topictext>" << Sanitize(c->topic) << "</topictext>";
                                                data << "<setby>" << Sanitize(c->setby) << "</setby>";
-                                               data << "<settime>" << Sanitize(c->topicset) << "</settime>";
+                                               data << "<settime>" << c->topicset << "</settime>";
                                        data << "</channeltopic>";
                                         data << "<channelmodes>" << Sanitize(c->ChanModes(true)) << "</channelmodes>";
                                         CUList* ulist = c->GetUsers();
@@ -161,6 +161,7 @@ class ModuleHttpStats : public Module
                                         data << "<server>";
                                         data << "<servername>" << b->servername << "</servername>";
                                         data << "<parentname>" << b->parentname << "</parentname>";
+                                       data << "<gecos>" << b->gecos << "</gecos>";
                                         data << "<usercount>" << b->usercount << "</usercount>";
                                         data << "<opercount>" << b->opercount << "</opercount>";
                                         data << "<lagmillisecs>" << b->latencyms << "</lagmillisecs>";

diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index 850a27c22de970605089162caea1168e6a2bf5fa..66a18a5dd16249846a2244f1d78b4af1b4f0d1cf 100644 (file)
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -16,6 +16,7 @@ void SpanningTreeProtocolInterface::GetServerList(ProtoServerList &sl)
                ps.parentname = s ? s->GetName() : ServerInstance->Config->ServerName;
                ps.usercount = i->second->GetUserCount();
                ps.opercount = i->second->GetOperCount();
+               ps.gecos = i->second->GetDesc();
                ps.latencyms = i->second->rtt;
                sl.push_back(ps);
        }