Convert more modules

[user/henk/code/inspircd.git] / src / modules / m_httpd_stats.cpp

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 677beed22aafe5c4b375a5784ff942dde635cccb..57b0a6e273d8ae7fcf7c418b62cfbc968ea1cdca 100644 (file)
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -2,34 +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 */
 
-
-
 typedef std::map<irc::string,int> StatsHash;
 typedef StatsHash::iterator StatsIter;
 
@@ -53,7 +44,7 @@ class ModuleHttpStats : public Module
                this->stylesheet = c.ReadValue("httpstats", "stylesheet", 0);
        }
 
-       ModuleHttpStats(InspIRCd* Me) : Module::Module(Me)
+       ModuleHttpStats(InspIRCd* Me) : Module(Me)
        {
                
                ReadConfig();
@@ -110,8 +101,8 @@ class ModuleHttpStats : public Module
                                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>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>";
@@ -122,7 +113,7 @@ class ModuleHttpStats : public Module
                                data << "<table>";
                                for (int i = 0; i <= ServerInstance->GetModuleCount(); i++)
                                {
-                                       if (ServerInstance->Config->module_names[i] != "")
+                                       if (!ServerInstance->Config->module_names[i].empty())
                                                data << "<tr><td>" << ServerInstance->Config->module_names[i] << "</td></tr>";
                                }
                                data << "</table>";
@@ -172,8 +163,6 @@ class ModuleHttpStats : public Module
                                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();
-
-                               ServerInstance->Log(DEBUG,"Sent");
                        }
                }
        }
@@ -188,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())
@@ -203,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())
@@ -213,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;
@@ -243,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);
        }
 };
 
@@ -270,7 +257,7 @@ class ModuleHttpStatsFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleHttpStatsFactory;
 }