Remove InspIRCd* parameters and fields

[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 0aa4628180b5a705def7a1796ebe1f8b695d2ece..8c682cfa9448d05ad12802d9f43a97cd69d5faf5 100644 (file)
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -14,7 +14,6 @@
 #include "inspircd.h"
 #include "httpd.h"
 #include "protocol.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd.so dependent modules */
 /* $ModDep: httpd.h */
@@ -48,7 +47,7 @@ class ModuleHTTPAccessList : public Module
        void ReadConfig()
        {
                acl_list.clear();
-               ConfigReader c(ServerInstance);
+               ConfigReader c;
                int n_items = c.Enumerate("httpdacl");
                for (int i = 0; i < n_items; ++i)
                {
@@ -89,8 +88,7 @@ class ModuleHTTPAccessList : public Module
                }
        }
 
-       ModuleHTTPAccessList(InspIRCd* Me) : Module(Me)
-       {
+       ModuleHTTPAccessList()  {
                ReadConfig();
                Implementation eventlist[] = { I_OnEvent, I_OnRequest };
                ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -173,7 +171,7 @@ class ModuleHTTPAccessList : public Module
 
                        for (std::vector<HTTPACL>::const_iterator this_acl = acl_list.begin(); this_acl != acl_list.end(); ++this_acl)
                        {
-                               if (match(http->GetURI(), this_acl->path))
+                               if (InspIRCd::Match(http->GetURI(), this_acl->path, ascii_case_insensitive_map))
                                {
                                        if (!this_acl->blacklist.empty())
                                        {
@@ -183,7 +181,7 @@ class ModuleHTTPAccessList : public Module
 
                                                while (sep.GetToken(entry))
                                                {
-                                                       if (match(http->GetIP(), entry))
+                                                       if (InspIRCd::Match(http->GetIP(), entry, ascii_case_insensitive_map))
                                                        {
                                                                ServerInstance->Logs->Log("m_httpd_acl", DEBUG, "Denying access to blacklisted resource %s (matched by pattern %s) from ip %s (matched by entry %s)",
                                                                                http->GetURI().c_str(), this_acl->path.c_str(), http->GetIP().c_str(), entry.c_str());
@@ -201,7 +199,7 @@ class ModuleHTTPAccessList : public Module
 
                                                while (sep.GetToken(entry))
                                                {
-                                                       if (match(http->GetIP(), entry))
+                                                       if (InspIRCd::Match(http->GetIP(), entry, ascii_case_insensitive_map))
                                                                allow_access = true;
                                                }
 
@@ -285,7 +283,7 @@ class ModuleHTTPAccessList : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd.so dependent modules", VF_VENDOR, API_VERSION);
        }
 };