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

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 7d11d41e4712df250cdb0d1925c1ba89d839228c..57b0a6e273d8ae7fcf7c418b62cfbc968ea1cdca 100644 (file)
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -11,14 +11,13 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "configreader.h"
 #include "modules.h"
 #include "inspsocket.h"
 #include "httpd.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides statistics over HTTP via m_httpd.so */
 
@@ -45,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();
@@ -102,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>";
@@ -114,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>";
@@ -164,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");
                        }
                }
        }
@@ -180,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())
@@ -195,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())
@@ -205,7 +202,7 @@ 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 (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
                {
@@ -260,7 +257,7 @@ class ModuleHttpStatsFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleHttpStatsFactory;
 }