X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_stats.cpp;h=1feeb9d246a16019c46309c254868faa29cae0d3;hb=2330fc9ddd48c939e894e7e37e9bb2e62eafc38d;hp=6367e02de3961f707c01f81f9bbd43c5ea2c9db2;hpb=94373f0fe8b39022db08802c089855a3098eac30;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index 6367e02de..1feeb9d24 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -38,12 +38,18 @@ extern int MODCOUNT; typedef std::map StatsHash; typedef StatsHash::iterator StatsIter; + +typedef std::vector > SortedList; +typedef SortedList::iterator SortedIter; + static StatsHash* sh = new StatsHash(); +static SortedList* so = new SortedList(); class ModuleHttpStats : public Module { Server* Srv; std::string stylesheet; + bool changed; public: @@ -57,6 +63,33 @@ class ModuleHttpStats : public Module { Srv = Me; ReadConfig(); + this->changed = false; + } + + void InsertOrder(irc::string channel, int count) + { + /* This function figures out where in the sorted list to put an item from the hash */ + SortedIter a; + for (a = so->begin(); a != so->end(); a++) + { + /* Found an item equal to or less than, we insert our item before it */ + if (a->first <= count) + { + so->insert(a,std::pair(count,channel)); + return; + } + } + /* There are no items in the list yet, insert something at the beginning */ + so->insert(so->begin(), std::pair(count,channel)); + } + + void SortList() + { + /* Sorts the hash into the sorted list using an insertion sort */ + so->clear(); + for (StatsIter a = sh->begin(); a != sh->end(); a++) + InsertOrder(a->first, a->second); + this->changed = false; } void OnEvent(Event* event) @@ -69,51 +102,80 @@ class ModuleHttpStats : public Module if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/")) { - log(DEBUG,"HTTP URL!"); - - data << ""; - data << "InspIRCd server statisitics for " << Srv->GetServerName() << " (" << Srv->GetServerDescription() << ")"; - data << ""; - data << "

InspIRCd server statisitics for " << Srv->GetServerName() << " (" << Srv->GetServerDescription() << ")

"; - - data << "

"; - data << "

Totals

"; - data << ""; - data << ""; - data << ""; - data << ""; - data << ""; - data << "

Users	" << clientlist.size() << "
Channels	" << chanlist.size() << "
Opers	" << all_opers.size() << "
Sockets	" << (ServerInstance->SE->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << " (Max: " << ServerInstance->SE->GetMaxFds() << " via socket engine '" << ServerInstance->SE->GetName() << "')

"; - data << "

"; - - data << "

"; - data << "

Modules

"; - data << ""; + data << "\n\ + "; + + data << ""; + data << ""; + data << "InspIRCd server statisitics for " << Srv->GetServerName() << " (" << Srv->GetServerDescription() << ")"; + data << ""; + data << "

InspIRCd server statisitics for " << Srv->GetServerName() << " (" << Srv->GetServerDescription() << ")

"; + + data << "

"; + data << "

Totals

"; + data << "

"; + data << ""; + data << ""; + data << ""; + data << ""; + data << "

Users	" << clientlist.size() << "
Channels	" << chanlist.size() << "
Opers	" << all_opers.size() << "
Sockets	" << (ServerInstance->SE->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << " (Max: " << ServerInstance->SE->GetMaxFds() << " via socket engine '" << ServerInstance->SE->GetName() << "')

"; + data << "

"; + + data << "

"; + data << "

Modules

"; + data << ""; for (int i = 0; i <= MODCOUNT; i++) { if (Config->module_names[i] != "") - data << ""; + data << ""; } - data << "

" << Config->module_names[i] << "

"; - data << "

"; - - data << "

"; - data << "

Channels

"; - data << ""; - data << ""; - for (StatsIter a = sh->begin(); a != sh->end(); a++) + data << "

Users	Count

"; + data << "

"; + + data << "

"; + data << "

Channels

"; + data << ""; + data << ""; + + /* If the list has changed since last time it was displayed, re-sort it + * this time only (not every time, as this would be moronic) + */ + if (this->changed) + this->SortList(); + + int n = 0; + for (SortedIter a = so->begin(); ((a != so->end()) && (n < 25)); a++, n++) { - data << ""; + chanrec* c = Srv->FindChannel(a->second.c_str()); + if (c) + { + data << ""; + data << ""; + data << ""; + data << ""; + data << ""; + data << ""; + } } - data << "

Users	Name	@	%	+	Topic
" << a->second << "	" << a->first << "
" << a->first << "	" << a->second << "	" << c->GetOppedUsers()->size() << "	" << c->GetHalfoppedUsers()->size() << "	" << c->GetVoicedUsers()->size() << "	" << c->topic << "

"; - data << "

"; + data << ""; + data << ""; + + + + + + data << "

"; + data << "

"; - data << ""; - data << ""; + data << ""; + data << ""; /* Send the document back to m_httpd */ - HTTPDocument response(http->sock, &data, 200, "X-Powered-By: m_http_stats.so\r\nContent-Type: text/html\r\n"); + HTTPDocument response(http->sock, &data, 200, "X-Powered-By: m_http_stats.so\r\nContent-Type: text/html; charset=iso-8859-1\r\n"); Request req((char*)&response, (Module*)this, event->GetSource()); req.Send(); @@ -129,6 +191,7 @@ class ModuleHttpStats : public Module { sh->erase(a); } + this->changed = true; } void OnUserJoin(userrec* user, chanrec* channel) @@ -143,6 +206,7 @@ class ModuleHttpStats : public Module irc::string name = channel->name; sh->insert(std::pair(name,1)); } + this->changed = true; } void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) @@ -152,6 +216,7 @@ class ModuleHttpStats : public Module { a->second--; } + this->changed = true; } void OnUserQuit(userrec* user, const std::string &message) @@ -168,6 +233,7 @@ class ModuleHttpStats : public Module } } } + this->changed = true; } char* OnRequest(Request* request)