Fix a lot of calls to match() and uses of wildcard.h (which doesn't exist anymore) after w00t broke them. Still broken pending a few more changes (it's all w00t's fault.)

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10214 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 3 insertions, 4 deletions

diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp
index 0aa462818..0258deba9 100644
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -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 */
@@ -173,7 +172,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))
 				{
 					if (!this_acl->blacklist.empty())
 					{
@@ -183,7 +182,7 @@ class ModuleHTTPAccessList : public Module
 
 						while (sep.GetToken(entry))
 						{
-							if (match(http->GetIP(), entry))
+							if (InspIRCd::Match(http->GetIP(), entry))
 							{
 								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 +200,7 @@ class ModuleHTTPAccessList : public Module
 
 						while (sep.GetToken(entry))
 						{
-							if (match(http->GetIP(), entry))
+							if (InspIRCd::Match(http->GetIP(), entry))
 								allow_access = true;
 						}