X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_stats.cpp;h=ad0b4bb72caac277ebda2d9ed21226c54515e8df;hb=a71f34e4b17420cacc4a50c5af64fe15811a8148;hp=8a90074a96a50b4dd1e55be444f632942d77d025;hpb=8bdc2313a66bc200e7067e01159367f48571fef9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 8a90074a9..ad0b4bb72 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -24,16 +24,16 @@
 #include "inspircd.h"
 #include "modules/httpd.h"
 #include "xline.h"
-#include "protocol.h"
 
-class ModuleHttpStats : public Module
+class ModuleHttpStats : public Module, public HTTPRequestEventListener
 {
-	static std::map<char, char const*> const &entities;
+	static const insp::flat_map<char, char const*>& entities;
 	HTTPdAPI API;
 
  public:
 	ModuleHttpStats()
-		: API(this)
+		: HTTPRequestEventListener(this)
+		, API(this)
 	{
 	}
 
@@ -44,7 +44,7 @@ class ModuleHttpStats : public Module
 
 		for (std::string::const_iterator x = str.begin(); x != str.end(); ++x)
 		{
-			std::map<char, char const*>::const_iterator it = entities.find(*x);
+			insp::flat_map<char, char const*>::const_iterator it = entities.find(*x);
 
 			if (it != entities.end())
 			{
@@ -88,14 +88,12 @@ class ModuleHttpStats : public Module
 		data << "</metadata>";
 	}
 
-	void OnEvent(Event& event) CXX11_OVERRIDE
+	ModResult HandleRequest(HTTPRequest* http)
 	{
 		std::stringstream data("");
 
-		if (event.id == "httpd_url")
 		{
 			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Handling httpd event");
-			HTTPRequest* http = (HTTPRequest*)&event;
 
 			if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/"))
 			{
@@ -104,17 +102,11 @@ class ModuleHttpStats : public Module
 					<< Sanitize(ServerInstance->GetVersionString()) << "</version></server>";
 
 				data << "<general>";
-				data << "<usercount>" << ServerInstance->Users->clientlist->size() << "</usercount>";
-				data << "<channelcount>" << ServerInstance->chanlist->size() << "</channelcount>";
+				data << "<usercount>" << ServerInstance->Users->GetUsers().size() << "</usercount>";
+				data << "<channelcount>" << ServerInstance->GetChans().size() << "</channelcount>";
 				data << "<opercount>" << ServerInstance->Users->all_opers.size() << "</opercount>";
 				data << "<socketcount>" << (SocketEngine::GetUsedFds()) << "</socketcount><socketmax>" << SocketEngine::GetMaxFds() << "</socketmax><socketengine>" INSPIRCD_SOCKETENGINE_NAME "</socketengine>";
-
-				time_t current_time = 0;
-				current_time = ServerInstance->Time();
-				time_t server_uptime = current_time - ServerInstance->startup_time;
-				struct tm* stime;
-				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 << "<uptime><boot_time_t>" << ServerInstance->startup_time << "</boot_time_t></uptime>";
 
 				data << "<isupport>";
 				const std::vector<std::string>& isupport = ServerInstance->ISupport.GetLines();
@@ -150,21 +142,22 @@ class ModuleHttpStats : public Module
 				}
 				data << "</modulelist><channellist>";
 
-				for (chan_hash::const_iterator a = ServerInstance->chanlist->begin(); a != ServerInstance->chanlist->end(); ++a)
+				const chan_hash& chans = ServerInstance->GetChans();
+				for (chan_hash::const_iterator i = chans.begin(); i != chans.end(); ++i)
 				{
-					Channel* c = a->second;
+					Channel* c = i->second;
 
 					data << "<channel>";
-					data << "<usercount>" << c->GetUsers()->size() << "</usercount><channelname>" << Sanitize(c->name) << "</channelname>";
+					data << "<usercount>" << c->GetUsers().size() << "</usercount><channelname>" << Sanitize(c->name) << "</channelname>";
 					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)
+					const Channel::MemberMap& ulist = c->GetUsers();
+					for (Channel::MemberMap::const_iterator x = ulist.begin(); x != ulist.end(); ++x)
 					{
 						Membership* memb = x->second;
 						data << "<channelmember><uid>" << memb->user->uuid << "</uid><privs>"
@@ -181,14 +174,15 @@ class ModuleHttpStats : public Module
 
 				data << "</channellist><userlist>";
 
-				for (user_hash::const_iterator a = ServerInstance->Users->clientlist->begin(); a != ServerInstance->Users->clientlist->end(); ++a)
+				const user_hash& users = ServerInstance->Users->GetUsers();
+				for (user_hash::const_iterator i = users.begin(); i != users.end(); ++i)
 				{
-					User* u = a->second;
+					User* u = i->second;
 
 					data << "<user>";
 					data << "<nickname>" << u->nick << "</nickname><uuid>" << u->uuid << "</uuid><realhost>"
 						<< u->host << "</realhost><displayhost>" << u->dhost << "</displayhost><gecos>"
-						<< Sanitize(u->fullname) << "</gecos><server>" << u->server << "</server>";
+						<< Sanitize(u->fullname) << "</gecos><server>" << u->server->GetName() << "</server>";
 					if (u->IsAway())
 						data << "<away>" << Sanitize(u->awaymsg) << "</away><awaytime>" << u->awaytime << "</awaytime>";
 					if (u->IsOper())
@@ -230,8 +224,15 @@ class ModuleHttpStats : public Module
 				response.headers.SetHeader("X-Powered-By", MODNAME);
 				response.headers.SetHeader("Content-Type", "text/xml");
 				API->SendResponse(response);
+				return MOD_RES_DENY; // Handled
 			}
 		}
+		return MOD_RES_PASSTHRU;
+	}
+
+	ModResult OnHTTPRequest(HTTPRequest& req) CXX11_OVERRIDE
+	{
+		return HandleRequest(&req);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
@@ -240,9 +241,9 @@ class ModuleHttpStats : public Module
 	}
 };
 
-static std::map<char, char const*> const &init_entities()
+static const insp::flat_map<char, char const*>& init_entities()
 {
-	static std::map<char, char const*> entities;
+	static insp::flat_map<char, char const*> entities;
 	entities['<'] = "lt";
 	entities['>'] = "gt";
 	entities['&'] = "amp";
@@ -250,6 +251,6 @@ static std::map<char, char const*> const &init_entities()
 	return entities;
 }
 
-std::map<char, char const*> const &ModuleHttpStats::entities = init_entities ();
+const insp::flat_map<char, char const*>& ModuleHttpStats::entities = init_entities();
 
 MODULE_INIT(ModuleHttpStats)