Revert automated conversion by Special, as it (unfortunately) neglects some details. It provides a useful start point, though, so it'll be used as the basis for the final conversion.

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

1 files changed, 5 insertions, 4 deletions

diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index 45c9cbcd6..2717d873a 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -12,6 +12,7 @@
  */
 
 #include "inspircd.h"
+#include "wildcard.h"
 
 /* $ModDesc: Implements config tags which allow blocking of joins to channels */
 
@@ -53,12 +54,12 @@ class ModuleDenyChannels : public Module
 
 				for (int j =0; j < Conf->Enumerate("badchan"); j++)
 				{
-					if (InspIRCd::Match(redirect, Conf->ReadValue("badchan","name",j)))
+					if (match(redirect, Conf->ReadValue("badchan","name",j)))
 					{
 						bool goodchan = false;
 						for (int k =0; k < Conf->Enumerate("goodchan"); k++)
 						{
-							if (InspIRCd::Match(redirect, Conf->ReadValue("goodchan","name",k)))
+							if (match(redirect, Conf->ReadValue("goodchan","name",k)))
 								goodchan = true;
 						}
 
@@ -90,7 +91,7 @@ class ModuleDenyChannels : public Module
 	{
 		for (int j =0; j < Conf->Enumerate("badchan"); j++)
 		{
-			if (InspIRCd::Match(cname, Conf->ReadValue("badchan","name",j)))
+			if (match(cname, Conf->ReadValue("badchan","name",j)))
 			{
 				if (IS_OPER(user) && Conf->ReadFlag("badchan","allowopers",j))
 				{
@@ -103,7 +104,7 @@ class ModuleDenyChannels : public Module
 
 					for (int i = 0; i < Conf->Enumerate("goodchan"); i++)
 					{
-						if (InspIRCd::Match(cname, Conf->ReadValue("goodchan", "name", i)))
+						if (match(cname, Conf->ReadValue("goodchan", "name", i)))
 						{
 							return 0;
 						}