Convert the account login event to use the new cross-module event system

[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 2dcf1e1cf4be55de4e758255a475bfbafa962126..30eacd7a725915b70ee5fec84600ac6b24ec18bd 100644 (file)
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -24,11 +24,10 @@
 #include "inspircd.h"
 #include "modules/httpd.h"
 #include "xline.h"
-#include "protocol.h"
 
 class ModuleHttpStats : public Module
 {
-       static std::map<char, char const*> const &entities;
+       static const insp::flat_map<char, char const*>& entities;
        HTTPdAPI API;
 
  public:
@@ -44,7 +43,7 @@ class ModuleHttpStats : public Module
 
                for (std::string::const_iterator x = str.begin(); x != str.end(); ++x)
                {
-                       std::map<char, char const*>::const_iterator it = entities.find(*x);
+                       insp::flat_map<char, char const*>::const_iterator it = entities.find(*x);
 
                        if (it != entities.end())
                        {
@@ -156,16 +155,16 @@ class ModuleHttpStats : public Module
                                        Channel* c = i->second;
 
                                        data << "<channel>";
-                                       data << "<usercount>" << c->GetUsers()->size() << "</usercount><channelname>" << Sanitize(c->name) << "</channelname>";
+                                       data << "<usercount>" << c->GetUsers().size() << "</usercount><channelname>" << Sanitize(c->name) << "</channelname>";
                                        data << "<channeltopic>";
                                        data << "<topictext>" << Sanitize(c->topic) << "</topictext>";
                                        data << "<setby>" << Sanitize(c->setby) << "</setby>";
                                        data << "<settime>" << c->topicset << "</settime>";
                                        data << "</channeltopic>";
                                        data << "<channelmodes>" << Sanitize(c->ChanModes(true)) << "</channelmodes>";
-                                       const UserMembList* ulist = c->GetUsers();
 
-                                       for (UserMembCIter x = ulist->begin(); x != ulist->end(); ++x)
+                                       const Channel::MemberMap& ulist = c->GetUsers();
+                                       for (Channel::MemberMap::const_iterator x = ulist.begin(); x != ulist.end(); ++x)
                                        {
                                                Membership* memb = x->second;
                                                data << "<channelmember><uid>" << memb->user->uuid << "</uid><privs>"
@@ -242,9 +241,9 @@ class ModuleHttpStats : public Module
        }
 };
 
-static std::map<char, char const*> const &init_entities()
+static const insp::flat_map<char, char const*>& init_entities()
 {
-       static std::map<char, char const*> entities;
+       static insp::flat_map<char, char const*> entities;
        entities['<'] = "lt";
        entities['>'] = "gt";
        entities['&'] = "amp";
@@ -252,6 +251,6 @@ static std::map<char, char const*> const &init_entities()
        return entities;
 }
 
-std::map<char, char const*> const &ModuleHttpStats::entities = init_entities ();
+const insp::flat_map<char, char const*>& ModuleHttpStats::entities = init_entities();
 
 MODULE_INIT(ModuleHttpStats)