X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_stats.cpp;h=46f474e2df2c8a61f9b2ef19cb85dd533e815e78;hb=7107ec12d8640d35cfe3d5002db1bc1deb33625d;hp=d0963b2af883ae37fcd495d41b9ac2de51b7e03c;hpb=6fa8fe7a2c07d9d9e419889afdd9e91e38cf1e78;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index d0963b2af..46f474e2d 100644
--- 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
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/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;
 
@@ -28,12 +28,11 @@ class ModuleHttpStats : public Module
 
 	void ReadConfig()
 	{
-		ConfigReader c(ServerInstance);
+		ConfigReader c;
 		this->stylesheet = c.ReadValue("httpstats", "stylesheet", 0);
 	}
 
-	ModuleHttpStats(InspIRCd* Me) : Module(Me)
-	{
+	ModuleHttpStats() 	{
 		ReadConfig();
 		this->changed = true;
 		Implementation eventlist[] = { I_OnEvent, I_OnRequest };
@@ -43,29 +42,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;
-				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;
@@ -90,8 +86,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->GetUsedFds()) << "</socketcount><socketmax>" << ServerInstance->SE->GetMaxFds() << "</socketmax><socketengine>" << ServerInstance->SE->GetName() << "</socketengine>";
 
 				time_t current_time = 0;
 				current_time = ServerInstance->Time();
@@ -104,11 +99,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>";
@@ -119,17 +115,19 @@ class ModuleHttpStats : public Module
 
 					data << "<channel>";
 					data << "<usercount>" << c->GetUsers()->size() << "</usercount><channelname>" << c->name << "</channelname>";
-					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>";
-					CUList* ulist = c->GetUsers();
-
-					for (CUList::iterator x = ulist->begin(); x != ulist->end(); ++x)
+					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>";
+					const UserMembList* ulist = c->GetUsers();
+
+					for (UserMembCIter x = ulist->begin(); x != ulist->end(); ++x)
 					{
 						data << "<channelmember><uid>" << x->first->uuid << "</uid><privs>" << Sanitize(c->GetAllPrefixChars(x->first)) << "</privs></channelmember>";
 					}
+
 					data << "</channel>";
 				}
 
@@ -147,12 +145,12 @@ class ModuleHttpStats : public Module
 						if (u->IsModeSet(n))
 							modes += n;
 
-					data << modes << "</modes><ident>" << Sanitize(u->ident) << "</ident><port>" << u->GetPort() << "</port><ipaddress>" << u->GetIPString() << "</ipaddress>";
+					data << modes << "</modes><ident>" << Sanitize(u->ident) << "</ident><port>" << u->GetServerPort() << "</port><ipaddress>" << u->GetIPString() << "</ipaddress>";
 					data << "</user>";
 				}
 
 				data << "</userlist><serverlist>";
-				
+
 				ProtoServerList sl;
 				ServerInstance->PI->GetServerList(sl);
 
@@ -161,11 +159,14 @@ 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>";
+// This is currently not implemented, so, commented out.
+//					data << "<opercount>" << b->opercount << "</opercount>";
 					data << "<lagmillisecs>" << b->latencyms << "</lagmillisecs>";
 					data << "</server>";
 				}
+
 				data << "</serverlist>";
 
 				data << "</inspircdstats>";
@@ -192,8 +193,20 @@ class ModuleHttpStats : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("Provides statistics over HTTP via m_httpd.so", 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)