PROPAGATE this fix

[user/henk/code/inspircd.git] / src / modules / m_denychans.cpp

diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index 8ceee3566af29ff034802b95fe6b461ae8e86441..1b72c52c3789bfa314f689d0ee70c91963de8acc 100644 (file)
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -2,24 +2,17 @@
  *       | 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.
  *
  * ---------------------------------------------------
  */
 
-#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 */
 
@@ -31,18 +24,18 @@ class ModuleDenyChannels : public Module
        ConfigReader *Conf;
 
  public:
-       ModuleDenyChannels(InspIRCd* Me) : Module::Module(Me)
+       ModuleDenyChannels(InspIRCd* Me) : Module(Me)
        {
                
                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(ServerInstance);
        }
-       
+
        virtual ~ModuleDenyChannels()
        {
                DELETE(Conf);
@@ -62,11 +55,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;
                                }
@@ -82,29 +73,4 @@ class ModuleDenyChannels : public Module
        }
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleDenyChannelsFactory : public ModuleFactory
-{
- public:
-       ModuleDenyChannelsFactory()
-       {
-       }
-       
-       ~ModuleDenyChannelsFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleDenyChannels(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleDenyChannelsFactory;
-}
-
+MODULE_INIT(ModuleDenyChannels)