Make various self contained methods static.

[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 18d20d76882ae5dd500cd08c21e54d0c2aba7928..346fe41f51cce2a2f011f9ba2665cc78ef1618a0 100644 (file)
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -37,12 +37,6 @@ class ModuleHttpStats : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               Implementation eventlist[] = { I_OnEvent };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-       }
-
        std::string Sanitize(const std::string &str)
        {
                std::string ret;
@@ -147,13 +141,12 @@ class ModuleHttpStats : public Module
                                }
 
                                data << "</xlines><modulelist>";
-                               std::vector<std::string> module_names = ServerInstance->Modules->GetAllModuleNames(0);
+                               const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules();
 
-                               for (std::vector<std::string>::iterator i = module_names.begin(); i != module_names.end(); ++i)
+                               for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)
                                {
-                                       Module* m = ServerInstance->Modules->Find(i->c_str());
-                                       Version v = m->GetVersion();
-                                       data << "<module><name>" << *i << "</name><description>" << Sanitize(v.description) << "</description></module>";
+                                       Version v = i->second->GetVersion();
+                                       data << "<module><name>" << i->first << "</name><description>" << Sanitize(v.description) << "</description></module>";
                                }
                                data << "</modulelist><channellist>";
 
@@ -204,7 +197,7 @@ class ModuleHttpStats : public Module
                                        LocalUser* lu = IS_LOCAL(u);
                                        if (lu)
                                                data << "<port>" << lu->GetServerPort() << "</port><servaddr>"
-                                                       << irc::sockets::satouser(lu->server_sa) << "</servaddr>";
+                                                       << lu->server_sa.str() << "</servaddr>";
                                        data << "<ipaddress>" << u->GetIPString() << "</ipaddress>";
 
                                        DumpMeta(data, u);
@@ -214,10 +207,10 @@ class ModuleHttpStats : public Module
 
                                data << "</userlist><serverlist>";
 
-                               ProtoServerList sl;
+                               ProtocolInterface::ServerList sl;
                                ServerInstance->PI->GetServerList(sl);
 
-                               for (ProtoServerList::iterator b = sl.begin(); b != sl.end(); ++b)
+                               for (ProtocolInterface::ServerList::const_iterator b = sl.begin(); b != sl.end(); ++b)
                                {
                                        data << "<server>";
                                        data << "<servername>" << b->servername << "</servername>";
@@ -234,7 +227,7 @@ class ModuleHttpStats : public Module
 
                                /* Send the document back to m_httpd */
                                HTTPDocumentResponse response(this, *http, &data, 200);
-                               response.headers.SetHeader("X-Powered-By", "m_httpd_stats.so");
+                               response.headers.SetHeader("X-Powered-By", MODNAME);
                                response.headers.SetHeader("Content-Type", "text/xml");
                                API->SendResponse(response);
                        }