Remove InspIRCd* parameters and fields

[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 f47d414bd92ec5b14250fe95678a80643ca52217..f95c0b1079d4ce613b92b350ad9d6a3244855e26 100644 (file)
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -23,10 +23,9 @@ class ModuleDenyChannels : public Module
        ConfigReader *Conf;
 
  public:
-       ModuleDenyChannels(InspIRCd* Me) : Module(Me)
-       {
+       ModuleDenyChannels()    {
 
-               Conf = new ConfigReader(ServerInstance);
+               Conf = new ConfigReader;
                Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
@@ -34,7 +33,7 @@ class ModuleDenyChannels : public Module
        virtual void OnRehash(User* user)
        {
                delete Conf;
-               Conf = new ConfigReader(ServerInstance);
+               Conf = new ConfigReader;
                /* check for redirect validity and loops/chains */
                for (int i =0; i < Conf->Enumerate("badchan"); i++)
                {
@@ -116,7 +115,7 @@ class ModuleDenyChannels : public Module
                                                if ((!newchan) || (!(newchan->IsModeSet('L'))))
                                                {
                                                        user->WriteNumeric(926, "%s %s :Channel %s is forbidden, redirecting to %s: %s",user->nick.c_str(),cname,cname,redirect.c_str(), reason.c_str());
-                                                       Channel::JoinUser(ServerInstance,user,redirect.c_str(),false,"",false,ServerInstance->Time());
+                                                       Channel::JoinUser(user,redirect.c_str(),false,"",false,ServerInstance->Time());
                                                        return MOD_RES_DENY;
                                                }
                                        }