]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_httpd_stats.cpp
A ton more clear() and empty() stuff thats been lingering on the long term todo for...
[user/henk/code/inspircd.git] / src / modules / m_httpd_stats.cpp
index d8d71f78dcf7609fbaf9fbf46fe7a5b3b8e30539..57b0a6e273d8ae7fcf7c418b62cfbc968ea1cdca 100644 (file)
@@ -2,40 +2,25 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                    E-mail:
- *             <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #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 +32,7 @@ static SortedList* so = new SortedList();
 
 class ModuleHttpStats : public Module
 {
-       Server* Srv;
+       
        std::string stylesheet;
        bool changed;
 
@@ -55,13 +40,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(Me)
        {
-               Srv = Me;
+               
                ReadConfig();
                this->changed = false;
        }
@@ -88,10 +73,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 +87,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].empty())
+                                               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>Count</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,22 +133,36 @@ class ModuleHttpStats : public Module
                                int n = 0;
                                for (SortedIter a = so->begin(); ((a != so->end()) && (n < 25)); a++, n++)
                                {
-                                       data << "<TR><TD>" << a->first << "</TD><TD>" << a->second << "</TD></TR>";
+                                       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 << "<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");
                        }
                }
        }
@@ -177,7 +177,7 @@ class ModuleHttpStats : public Module
                this->changed = true;
        }
 
-       void OnUserJoin(userrec* user, chanrec* channel)
+       void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
        {
                StatsIter a = sh->find(channel->name);
                if (a != sh->end())
@@ -192,7 +192,7 @@ class ModuleHttpStats : public Module
                this->changed = true;
        }
 
-       void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage)
+       void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent)
        {
                StatsIter a = sh->find(channel->name);
                if (a != sh->end())
@@ -202,18 +202,15 @@ class ModuleHttpStats : public Module
                this->changed = true;
        }
 
-       void OnUserQuit(userrec* user, const std::string &message)
+       void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
        {
-               for (std::vector<ucrec*>::const_iterator v = user->chans.begin(); v != user->chans.end(); v++)
+               for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
                {
-                       if (((ucrec*)(*v))->channel)
+                       chanrec* c = v->first;
+                       StatsIter a = sh->find(c->name);
+                       if (a != sh->end())
                        {
-                               chanrec* c = ((ucrec*)(*v))->channel;
-                               StatsIter a = sh->find(c->name);
-                               if (a != sh->end())
-                               {
-                                       a->second--;
-                               }
+                               a->second--;
                        }
                }
                this->changed = true;
@@ -232,11 +229,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);
        }
 };
 
@@ -252,14 +250,14 @@ class ModuleHttpStatsFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleHttpStats(Me);
        }
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleHttpStatsFactory;
 }