X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_denychans.cpp;h=3b3cd50fa74bdcb26f3bc9ca0f7f1681941c5945;hb=cd7657bddc7a6dc2e7326077d173a874bf71f6bd;hp=cbd7368691c218c3528280b68f6ac15ced17174c;hpb=42d5b9571eff06b0c33093dc9118c29f9603fd2b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index cbd736869..3b3cd50fa 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -11,12 +11,12 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "hashcomp.h"
-
-#include "inspircd.h"
+#include "wildcard.h"
 
 /* $ModDesc: Implements config tags which allow blocking of joins to channels */
 
@@ -28,7 +28,7 @@ class ModuleDenyChannels : public Module
 	ConfigReader *Conf;
 
  public:
-	ModuleDenyChannels(InspIRCd* Me) : Module::Module(Me)
+	ModuleDenyChannels(InspIRCd* Me) : Module(Me)
 	{
 		
 		Conf = new ConfigReader(ServerInstance);
@@ -59,11 +59,9 @@ class ModuleDenyChannels : public Module
 	{
 		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)
+				if (IS_OPER(user) && Conf->ReadFlag("badchan","allowopers",j))
 				{
 					return 0;
 				}
@@ -100,7 +98,7 @@ class ModuleDenyChannelsFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleDenyChannelsFactory;
 }