Annotations

[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 c838a495d9eb4ce9dc82e0610c9a4c29e22705f3..04d0a30337d65a6b8d09edd686fcb46c47d40510 100644 (file)
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -18,7 +18,8 @@
 #include "channels.h"
 #include "modules.h"
 #include "hashcomp.h"
-#include "helperfuncs.h"
+
+#include "inspircd.h"
 
 /* $ModDesc: Implements config tags which allow blocking of joins to channels */
 
@@ -26,25 +27,25 @@ class ModuleDenyChannels : public Module
 {
  private:
 
-       Server *Srv;
+       
        ConfigReader *Conf;
 
  public:
-       ModuleDenyChannels(Server* Me) : Module::Module(Me)
+       ModuleDenyChannels(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               Conf = new ConfigReader;
+               
+               Conf = new ConfigReader(ServerInstance);
        }
        
        virtual void OnRehash(const std::string &param)
        {
-               delete Conf;
-               Conf = new ConfigReader;
+               DELETE(Conf);
+               Conf = new ConfigReader(ServerInstance);
        }
        
        virtual ~ModuleDenyChannels()
        {
-               delete Conf;
+               DELETE(Conf);
        }
        
        virtual Version GetVersion()
@@ -57,8 +58,8 @@ 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)
+       {
                for (int j =0; j < Conf->Enumerate("badchan"); j++)
                {
                        irc::string cn = Conf->ReadValue("badchan","name",j).c_str();
@@ -72,13 +73,13 @@ class ModuleDenyChannels : public Module
                                else
                                {
                                        std::string reason = Conf->ReadValue("badchan","reason",j);
-                                       WriteServ(user->fd,"926 %s %s :Channel %s is forbidden: %s",user->nick,cname,cname,reason.c_str());
+                                       user->WriteServ("926 %s %s :Channel %s is forbidden: %s",user->nick,cname,cname,reason.c_str());
                                        return 1;
                                }
                        }
                }
                return 0;
-        }
+       }
 };
 
 // stuff down here is the module-factory stuff. For basic modules you can ignore this.
@@ -94,7 +95,7 @@ class ModuleDenyChannelsFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleDenyChannels(Me);
        }