Chain ValidateServerName onto ValidateHostname so that the servername gets hostname...

[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 951103271198e4e11f48497f9d289cd472c995b3..157f772c113fa453dce821e3e9f72e8afcd3fff7 100644 (file)
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -73,7 +73,7 @@ class ModuleHttpStats : public Module
                so->clear();
                for (StatsIter a = sh->begin(); a != sh->end(); a++)
                        InsertOrder(a->first, a->second);
-               for (user_hash::iterator u = ServerInstance->clientlist->begin(); u != ServerInstance->clientlist->end(); u++)
+               for (user_hash::iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); u++)
                {
                        StatsHash::iterator n = Servers->find(u->second->server);
                        if (n != Servers->end())
@@ -103,9 +103,9 @@ class ModuleHttpStats : public Module
                                data << "<server><name>" << ServerInstance->Config->ServerName << "</name><gecos>" << ServerInstance->Config->ServerDesc << "</gecos></server>";
 
                                data << "<general>";
-                               data << "<usercount>" << ServerInstance->clientlist->size() << "</usercount>";
+                               data << "<usercount>" << ServerInstance->Users->clientlist->size() << "</usercount>";
                                data << "<channelcount>" << ServerInstance->chanlist->size() << "</channelcount>";
-                               data << "<opercount>" << ServerInstance->all_opers.size() << "</opercount>";
+                               data << "<opercount>" << ServerInstance->Users->all_opers.size() << "</opercount>";
                                data << "<socketcount>" << (ServerInstance->SE->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << "</socketcount><socketmax>" << ServerInstance->SE->GetMaxFds() <<
                                        "</socketmax><socketengine>" << ServerInstance->SE->GetName() << "</socketengine>";
 
@@ -225,7 +225,7 @@ class ModuleHttpStats : public Module
                this->changed = true;
        }
 
-       char* OnRequest(Request* request)
+       const char* OnRequest(Request* request)
        {
                return NULL;
        }
@@ -239,7 +239,7 @@ class ModuleHttpStats : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
        }
 };