Make FJOIN send UUID

[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 cbd7368691c218c3528280b68f6ac15ced17174c..4a01faa7c68559e24c283dafb1dd96bf968fa33e 100644 (file)
--- 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;
                                }
@@ -79,29 +77,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)