- Tear out a useless load of XLine clutters that did nothing much except confuse...

[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 6bf5dc86840391c8e2630df8edad2251298aea80..2d022ad308738e27e959a484715d8237d2256972 100644 (file)
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -12,11 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "configreader.h"
-#include "modules.h"
-#include "inspsocket.h"
 #include "httpd.h"
 
 /* $ModDesc: Provides statistics over HTTP via m_httpd.so */
@@ -122,11 +117,11 @@ class ModuleHttpStats : public Module
 
                                data << "</general>";
                                data << "<modulelist>";
-                               for (int i = 0; i <= ServerInstance->GetModuleCount(); i++)
+                               for (int i = 0; i <= ServerInstance->Modules->GetCount(); i++)
                                {
                                        if (!ServerInstance->Config->module_names[i].empty())
                                        {
-                                               Version v = ServerInstance->modules[i]->GetVersion();
+                                               Version v = ServerInstance->Modules->modules[i]->GetVersion();
                                                data << "<module><name>" << ServerInstance->Config->module_names[i] << "</name><version>" << 
                                                        v.Major << "." <<  v.Minor << "." << v.Revision << "." << v.Build << "</version></module>";
                                        }
@@ -142,7 +137,7 @@ class ModuleHttpStats : public Module
 
                                for (SortedIter a = so->begin(); a != so->end(); a++)
                                {
-                                       chanrec* c = ServerInstance->FindChan(a->second.c_str());
+                                       Channel* c = ServerInstance->FindChan(a->second.c_str());
                                        if (c && !c->IsModeSet('s') && !c->IsModeSet('p'))
                                        {
                                                data << "<channel>";
@@ -181,7 +176,7 @@ class ModuleHttpStats : public Module
                }
        }
 
-       void OnChannelDelete(chanrec* chan)
+       void OnChannelDelete(Channel* chan)
        {
                StatsIter a = sh->find(chan->name);
                if (a != sh->end())
@@ -191,7 +186,7 @@ class ModuleHttpStats : public Module
                this->changed = true;
        }
 
-       void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+       void OnUserJoin(User* user, Channel* channel, bool &silent)
        {
                StatsIter a = sh->find(channel->name);
                if (a != sh->end())
@@ -206,7 +201,7 @@ class ModuleHttpStats : public Module
                this->changed = true;
        }
 
-       void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent)
+       void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
        {
                StatsIter a = sh->find(channel->name);
                if (a != sh->end())
@@ -216,11 +211,11 @@ class ModuleHttpStats : public Module
                this->changed = true;
        }
 
-       void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
+       void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
        {
                for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
                {
-                       chanrec* c = v->first;
+                       Channel* c = v->first;
                        StatsIter a = sh->find(c->name);
                        if (a != sh->end())
                        {