Fix for bug #415, affects only trunk (wish i'd known this before i started!)

[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 3646690fb853ca51bd29025f638cb063a590b5e1..1b72c52c3789bfa314f689d0ee70c91963de8acc 100644 (file)
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -11,10 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "hashcomp.h"
 #include "inspircd.h"
 #include "wildcard.h"
 
@@ -28,7 +24,7 @@ class ModuleDenyChannels : public Module
        ConfigReader *Conf;
 
  public:
-       ModuleDenyChannels(InspIRCd* Me) : Module::Module(Me)
+       ModuleDenyChannels(InspIRCd* Me) : Module(Me)
        {
                
                Conf = new ConfigReader(ServerInstance);
@@ -61,7 +57,7 @@ class ModuleDenyChannels : public Module
                {
                        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;
                                }
@@ -77,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)