Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

[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 27548c91c8115dc55bc3ef726ea5727c00a6de4e..eda5b6f66e8b58acba40c06cebf15572b578ac90 100644 (file)
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -22,15 +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 std::vector<userrec*> all_opers;
-extern InspIRCd* ServerInstance;
-
 typedef std::map<irc::string,int> StatsHash;
 typedef StatsHash::iterator StatsIter;
 
@@ -42,7 +38,7 @@ static SortedList* so = new SortedList();
 
 class ModuleHttpStats : public Module
 {
-       Server* Srv;
+       
        std::string stylesheet;
        bool changed;
 
@@ -50,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;
        }
@@ -113,7 +109,7 @@ class ModuleHttpStats : public Module
                                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>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>";
@@ -174,7 +170,7 @@ class ModuleHttpStats : public Module
                                Request req((char*)&response, (Module*)this, event->GetSource());
                                req.Send();
 
-                               log(DEBUG,"Sent");
+                               ServerInstance->Log(DEBUG,"Sent");
                        }
                }
        }
@@ -244,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);
        }
 };
 
@@ -264,7 +261,7 @@ class ModuleHttpStatsFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleHttpStats(Me);
        }