]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_httpd_stats.cpp
Server::GetAdmin, Server::GetServerDescription, Server::GetNetworkName --- *REMOVED*
[user/henk/code/inspircd.git] / src / modules / m_httpd_stats.cpp
index ed1d6a57ebc752c14f8405f7379d967ad0099b28..8b2ce75f5b628f3251433240e707aa4e3cf2ae8d 100644 (file)
@@ -28,11 +28,8 @@ using namespace std;
 
 /* $ModDesc: Provides statistics over HTTP via m_httpd.so */
 
-extern user_hash clientlist;
-extern chan_hash chanlist;
 extern std::vector<userrec*> all_opers;
 extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
 
 extern int MODCOUNT;
 
@@ -88,10 +85,7 @@ class ModuleHttpStats : public Module
                /* Sorts the hash into the sorted list using an insertion sort */
                so->clear();
                for (StatsIter a = sh->begin(); a != sh->end(); a++)
-               {
-                       log(DEBUG, "InsertOrder on %d %s",a->second,a->first.c_str());
                        InsertOrder(a->first, a->second);
-               }
                this->changed = false;
        }
 
@@ -105,38 +99,42 @@ class ModuleHttpStats : public Module
 
                        if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/"))
                        {
-                               log(DEBUG,"HTTP URL!");
-
-                               data << "<HTML><HEAD>";
-                               data << "<TITLE>InspIRCd server statisitics for " << Srv->GetServerName() << " (" << Srv->GetServerDescription() << ")</TITLE>";
-                               data << "</HEAD><BODY>";
-                               data << "<H1>InspIRCd server statisitics for " << Srv->GetServerName() << " (" << Srv->GetServerDescription() << ")</H1>";
-
-                               data << "<DIV ID='TOTALS'>";
-                               data << "<H2>Totals</H2>";
-                               data << "<TABLE>";
-                               data << "<TR><TD>Users</TD><TD>" << clientlist.size() << "</TD></TR>";
-                               data << "<TR><TD>Channels</TD><TD>" << chanlist.size() << "</TD></TR>";
-                               data << "<TR><TD>Opers</TD><TD>" << all_opers.size() << "</TD></TR>";
-                               data << "<TR><TD>Sockets</TD><TD>" << (ServerInstance->SE->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << " (Max: " << ServerInstance->SE->GetMaxFds() << " via socket engine '" << ServerInstance->SE->GetName() << "')</TD></TR>";
-                               data << "</TABLE>";
-                               data << "</DIV>";
-
-                               data << "<DIV ID='MODULES'>";
-                               data << "<H2>Modules</H2>";
-                               data << "<TABLE>";
+                               data << "<!DOCTYPE html PUBLIC \
+                                       \"-//W3C//DTD XHTML 1.1//EN\" \
+                                       \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n\
+                                       <html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\">";
+
+                               data << "<head>";
+                               data << "<link rel='stylesheet' href='" << this->stylesheet << "' type='text/css' />";
+                               data << "<title>InspIRCd server statisitics for " << Srv->GetServerName() << " (" << ServerInstance->Config->ServerDesc << ")</title>";
+                               data << "</head><body>";
+                               data << "<h1>InspIRCd server statisitics for " << Srv->GetServerName() << " (" << ServerInstance->Config->ServerDesc << ")</h1>";
+
+                               data << "<div class='totals'>";
+                               data << "<h2>Totals</h2>";
+                               data << "<table>";
+                               data << "<tr><td>Users</td><td>" << ServerInstance->clientlist.size() << "</td></tr>";
+                               data << "<tr><td>Channels</td><td>" << ServerInstance->chanlist.size() << "</td></tr>";
+                               data << "<tr><td>Opers</td><td>" << all_opers.size() << "</td></tr>";
+                               data << "<tr><td>Sockets</td><td>" << (ServerInstance->SE->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << " (Max: " << ServerInstance->SE->GetMaxFds() << " via socket engine '" << ServerInstance->SE->GetName() << "')</td></tr>";
+                               data << "</table>";
+                               data << "</div>";
+
+                               data << "<div class='modules'>";
+                               data << "<h2>Modules</h2>";
+                               data << "<table>";
                                for (int i = 0; i <= MODCOUNT; i++)
                                {
-                                       if (Config->module_names[i] != "")
-                                               data << "<TR><TD>" << Config->module_names[i] << "</TD></TR>";
+                                       if (ServerInstance->Config->module_names[i] != "")
+                                               data << "<tr><td>" << ServerInstance->Config->module_names[i] << "</td></tr>";
                                }
-                               data << "</TABLE>";
-                               data << "</DIV>";
+                               data << "</table>";
+                               data << "</div>";
 
-                               data << "<DIV ID='CHANNELS'>";
-                               data << "<H2>Channels</H2>";
-                               data << "<TABLE>";
-                               data << "<TR><TH>Users</TH><TH>Name</TH><TH>@</TH><TH>%</TH><TH>+</TH></TR>";
+                               data << "<div class='channels'>";
+                               data << "<h2>Channels</h2>";
+                               data << "<table>";
+                               data << "<tr><th>Users</th><th>Name</th><th>@</th><th>%</th><th>+</th><th>Topic</th></tr>";
 
                                /* 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)
@@ -147,26 +145,34 @@ class ModuleHttpStats : public Module
                                int n = 0;
                                for (SortedIter a = so->begin(); ((a != so->end()) && (n < 25)); a++, n++)
                                {
-                                       chanrec* c = Srv->FindChannel(a->second.c_str());
+                                       chanrec* c = ServerInstance->FindChan(a->second.c_str());
                                        if (c)
                                        {
-                                               data << "<TR><TD>" << a->first << "</TD><TD>" << a->second << "</TD>";
-                                               data << "<TD>" << c->GetOppedUsers()->size() << "</TD>";
-                                               data << "<TD>" << c->GetHalfoppedUsers()->size() << "</TD>";
-                                               data << "<TD>" << c->GetVoicedUsers()->size() << "</TD>";
-                                               data << "</TR>";
+                                               data << "<tr><td>" << a->first << "</td><td>" << a->second << "</td>";
+                                               data << "<td>" << c->GetOppedUsers()->size() << "</td>";
+                                               data << "<td>" << c->GetHalfoppedUsers()->size() << "</td>";
+                                               data << "<td>" << c->GetVoicedUsers()->size() << "</td>";
+                                               data << "<td>" << c->topic << "</td>";
+                                               data << "</tr>";
                                        }
                                }
 
-                               data << "</TABLE>";
-                               data << "</DIV>";
+                               data << "</table>";
+                               data << "</div>";
+
+
+
+
 
+                               data << "<div class='validion'>";
+                               data << "<p><a href='http://validator.w3.org/check?uri=referer'><img src='http://www.w3.org/Icons/valid-xhtml11' alt='Valid XHTML 1.1' height='31' width='88' /></a></p>";
+                               data << "</div>";
                                
-                               data << "</BODY>";
-                               data << "</HTML>";
+                               data << "</body>";
+                               data << "</html>";
 
                                /* 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();