]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_httpd_stats.cpp
Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified
[user/henk/code/inspircd.git] / src / modules / m_httpd_stats.cpp
index 1aef5410276ccdd3394b9d40e5e09d950eee6011..eda5b6f66e8b58acba40c06cebf15572b578ac90 100644 (file)
@@ -22,20 +22,11 @@ using namespace std;
 #include "configreader.h"
 #include "modules.h"
 #include "inspsocket.h"
-#include "helperfuncs.h"
 #include "httpd.h"
 #include "inspircd.h"
 
 /* $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;
-
 typedef std::map<irc::string,int> StatsHash;
 typedef StatsHash::iterator StatsIter;
 
@@ -47,7 +38,7 @@ static SortedList* so = new SortedList();
 
 class ModuleHttpStats : public Module
 {
-       Server* Srv;
+       
        std::string stylesheet;
        bool changed;
 
@@ -55,13 +46,13 @@ class ModuleHttpStats : public Module
 
        void ReadConfig()
        {
-               ConfigReader c;
+               ConfigReader c(ServerInstance);
                this->stylesheet = c.ReadValue("httpstats", "stylesheet", 0);
        }
 
-       ModuleHttpStats(Server* Me) : Module::Module(Me)
+       ModuleHttpStats(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
+               
                ReadConfig();
                this->changed = false;
        }
@@ -102,38 +93,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>";
-                               for (int i = 0; i <= MODCOUNT; i++)
+                               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 " << ServerInstance->Config->ServerName << " (" << ServerInstance->Config->ServerDesc << ")</title>";
+                               data << "</head><body>";
+                               data << "<h1>InspIRCd server statisitics for " << ServerInstance->Config->ServerName << " (" << 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>" << ServerInstance->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 <= ServerInstance->GetModuleCount(); 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)
@@ -144,30 +139,38 @@ 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();
 
-                               log(DEBUG,"Sent");
+                               ServerInstance->Log(DEBUG,"Sent");
                        }
                }
        }
@@ -237,11 +240,12 @@ class ModuleHttpStats : public Module
        virtual ~ModuleHttpStats()
        {
                delete sh;
+               delete so;
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
        }
 };
 
@@ -257,7 +261,7 @@ class ModuleHttpStatsFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleHttpStats(Me);
        }