Update copyrights for 2009.

[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 ff51c28fe62e0e89676d9792ae8b44ded88769a1..a599b4b6bfed3de94cf8c0c026a28be4238fb82f 100644 (file)
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -2,11 +2,11 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ *          the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -20,7 +20,7 @@
 
 class ModuleHttpStats : public Module
 {
-       
+       static std::map<char, char const*> const &entities;
        std::string stylesheet;
        bool changed;
 
@@ -43,32 +43,26 @@ class ModuleHttpStats : public Module
        std::string Sanitize(const std::string &str)
        {
                std::string ret;
+               ret.reserve(str.length() * 2);
 
                for (std::string::const_iterator x = str.begin(); x != str.end(); ++x)
                {
-                       switch (*x)
+                       std::map<char, char const*>::const_iterator it = entities.find(*x);
+
+                       if (it != entities.end())
                        {
-                               case '<':
-                                       ret += "&lt;";
-                               break;
-                               case '>':
-                                       ret += "&gt;";
-                               break;
-                               case '&':
-                                       ret += "&amp;";
-                               break;
-                               case '"':
-                                       ret += "&quot;";
-                               break;
-                               default:
-                                       if (*x < 32 || *x > 126)
-                                       {
-                                               int n = *x;
-                                               ret += ("&#" + ConvToStr(n) + ";");
-                                       }
-                                       else
-                                               ret += *x;
-                               break;
+                               ret += '&';
+                               ret += it->second;
+                               ret += ';';
+                       }
+                       else if (*x < 32 || *x > 126)
+                       {
+                               int n = (unsigned char)*x;
+                               ret += ("&#" + ConvToStr(n) + ";");
+                       }
+                       else
+                       {
+                               ret += *x;
                        }
                }
                return ret;
@@ -93,8 +87,7 @@ class ModuleHttpStats : public Module
                                data << "<usercount>" << ServerInstance->Users->clientlist->size() << "</usercount>";
                                data << "<channelcount>" << ServerInstance->chanlist->size() << "</channelcount>";
                                data << "<opercount>" << ServerInstance->Users->all_opers.size() << "</opercount>";
-                               data << "<socketcount>" << (ServerInstance->SE->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << "</socketcount><socketmax>" << ServerInstance->SE->GetMaxFds() <<
-                                       "</socketmax><socketengine>" << ServerInstance->SE->GetName() << "</socketengine>";
+                               data << "<socketcount>" << (ServerInstance->SE->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << "</socketcount><socketmax>" << ServerInstance->SE->GetMaxFds() << "</socketmax><socketengine>" << ServerInstance->SE->GetName() << "</socketengine>";
 
                                time_t current_time = 0;
                                current_time = ServerInstance->Time();
@@ -107,11 +100,12 @@ class ModuleHttpStats : public Module
                                data << "</general>";
                                data << "<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)
                                {
                                        Module* m = ServerInstance->Modules->Find(i->c_str());
                                        Version v = m->GetVersion();
-                                       data << "<module><name>" << *i << "</name><version>" << v.Major << "." <<  v.Minor << "." << v.Revision << "." << v.Build << "</version></module>";
+                                       data << "<module><name>" << *i << "</name><version>" << v.version << "</version></module>";
                                }
                                data << "</modulelist>";
                                data << "<channellist>";
@@ -125,14 +119,19 @@ class ModuleHttpStats : public Module
                                        data << "<channelops>" << c->GetOppedUsers()->size() << "</channelops>";
                                        data << "<channelhalfops>" << c->GetHalfoppedUsers()->size() << "</channelhalfops>";
                                        data << "<channelvoices>" << c->GetVoicedUsers()->size() << "</channelvoices>";
-                                       data << "<channeltopic>" << Sanitize(c->topic) << "</channeltopic>";
-                                       data << "<channelmodes>" << Sanitize(c->ChanModes(false)) << "</channelmodes>";
+                                       data << "<channeltopic>";
+                                       data << "<topictext>" << Sanitize(c->topic) << "</topictext>";
+                                       data << "<setby>" << Sanitize(c->setby) << "</setby>";
+                                       data << "<settime>" << c->topicset << "</settime>";
+                                       data << "</channeltopic>";
+                                       data << "<channelmodes>" << Sanitize(c->ChanModes(true)) << "</channelmodes>";
                                        CUList* ulist = c->GetUsers();
 
                                        for (CUList::iterator x = ulist->begin(); x != ulist->end(); ++x)
                                        {
                                                data << "<channelmember><uid>" << x->first->uuid << "</uid><privs>" << Sanitize(c->GetAllPrefixChars(x->first)) << "</privs></channelmember>";
                                        }
+
                                        data << "</channel>";
                                }
 
@@ -155,7 +154,7 @@ class ModuleHttpStats : public Module
                                }
 
                                data << "</userlist><serverlist>";
-                               
+
                                ProtoServerList sl;
                                ServerInstance->PI->GetServerList(sl);
 
@@ -164,11 +163,13 @@ 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>";
                                        data << "</server>";
                                }
+
                                data << "</serverlist>";
 
                                data << "</inspircdstats>";
@@ -195,8 +196,20 @@ class ModuleHttpStats : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 };
 
+static std::map<char, char const*> const &init_entities()
+{
+       static std::map<char, char const*> entities;
+       entities['<'] = "lt";
+       entities['>'] = "gt";
+       entities['&'] = "amp";
+       entities['"'] = "quot";
+       return entities;
+}
+
+std::map<char, char const*> const &ModuleHttpStats::entities = init_entities ();
+
 MODULE_INIT(ModuleHttpStats)