X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_denychans.cpp;h=3646690fb853ca51bd29025f638cb063a590b5e1;hb=be36d92f3dcb0ac3772daebff43a5ecfe0a2d364;hp=c823b9c1e835f4a9d4f91d1c0dca95f0a21693db;hpb=d0b4bb3811458aa335857514e4cbb95d5c84f433;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index c823b9c1e..3646690fb 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -18,8 +15,8 @@
 #include "channels.h"
 #include "modules.h"
 #include "hashcomp.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
+#include "wildcard.h"
 
 /* $ModDesc: Implements config tags which allow blocking of joins to channels */
 
@@ -34,15 +31,15 @@ class ModuleDenyChannels : public Module
 	ModuleDenyChannels(InspIRCd* Me) : Module::Module(Me)
 	{
 		
-		Conf = new ConfigReader;
+		Conf = new ConfigReader(ServerInstance);
 	}
 	
-	virtual void OnRehash(const std::string &param)
+	virtual void OnRehash(userrec* user, const std::string &param)
 	{
 		DELETE(Conf);
-		Conf = new ConfigReader;
+		Conf = new ConfigReader(ServerInstance);
 	}
-	
+
 	virtual ~ModuleDenyChannels()
 	{
 		DELETE(Conf);
@@ -50,7 +47,7 @@ class ModuleDenyChannels : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 
 	void Implements(char* List)
@@ -58,13 +55,11 @@ class ModuleDenyChannels : public Module
 		List[I_OnUserPreJoin] = List[I_OnRehash] = 1;
 	}
 
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
 	{
 		for (int j =0; j < Conf->Enumerate("badchan"); j++)
 		{
-			irc::string cn = Conf->ReadValue("badchan","name",j).c_str();
-			irc::string thischan = cname;
-			if (thischan == cn)
+			if (match(cname, Conf->ReadValue("badchan","name",j).c_str()))
 			{
 				if ((Conf->ReadFlag("badchan","allowopers",j)) && *user->oper)
 				{