Merge insp20

[user/henk/code/inspircd.git] / src / modules / m_httpd_acl.cpp

diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp
index a556daf396be38eee88a3a89fb63d52266cfd24b..061d56f254ec5082657e5daa75c71f073f3d1b45 100644 (file)
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -45,7 +45,7 @@ class ModuleHTTPAccessList : public Module
        std::vector<HTTPACL> acl_list;
 
  public:
-       void ReadConfig()
+       void OnRehash(User* user)
        {
                acl_list.clear();
                ConfigTagList acls = ServerInstance->Config->ConfTags("httpdacl");
@@ -91,8 +91,8 @@ class ModuleHTTPAccessList : public Module
 
        void init() CXX11_OVERRIDE
        {
-               ReadConfig();
-               Implementation eventlist[] = { I_OnEvent };
+               OnRehash(NULL);
+               Implementation eventlist[] = { I_OnEvent, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
@@ -112,7 +112,7 @@ class ModuleHTTPAccessList : public Module
        {
                if (event.id == "httpd_acl")
                {
-                       ServerInstance->Logs->Log("m_http_stats", LOG_DEBUG,"Handling httpd acl event");
+                       ServerInstance->Logs->Log("m_http_stats", LOG_DEBUG, "Handling httpd acl event");
                        HTTPRequest* http = (HTTPRequest*)&event;
 
                        for (std::vector<HTTPACL>::const_iterator this_acl = acl_list.begin(); this_acl != acl_list.end(); ++this_acl)