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 f285476795f274a5e5ce19049b953967d741b682..f95c0b1079d4ce613b92b350ad9d6a3244855e26 100644 (file)
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Implements config tags which allow blocking of joins to channels */
 
@@ -20,49 +19,48 @@ class ModuleDenyChannels : public Module
 {
  private:
 
-       
+
        ConfigReader *Conf;
 
  public:
-       ModuleDenyChannels(InspIRCd* Me) : Module(Me)
-       {
-               
-               Conf = new ConfigReader(ServerInstance);
+       ModuleDenyChannels()    {
+
+               Conf = new ConfigReader;
                Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
-       
-       virtual void OnRehash(User* user, const std::string &param)
+
+       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++)
                {
                        std::string name = Conf->ReadValue("badchan","name",i);
                        std::string redirect = Conf->ReadValue("badchan","redirect",i);
-                       
+
                        if (!redirect.empty())
                        {
-                       
-                               if (!ServerInstance->IsChannel(redirect.c_str()))
+
+                               if (!ServerInstance->IsChannel(redirect.c_str(), ServerInstance->Config->Limits.ChanMax))
                                {
                                        if (user)
-                                               user->WriteServ("Notice %s :Invalid badchan redirect '%s'", user->nick.c_str(), redirect.c_str());
+                                               user->WriteServ("NOTICE %s :Invalid badchan redirect '%s'", user->nick.c_str(), redirect.c_str());
                                        throw ModuleException("Invalid badchan redirect, not a channel");
                                }
-       
+
                                for (int j =0; j < Conf->Enumerate("badchan"); j++)
                                {
-                                       if (match(redirect, Conf->ReadValue("badchan","name",j)))
+                                       if (InspIRCd::Match(redirect, Conf->ReadValue("badchan","name",j)))
                                        {
                                                bool goodchan = false;
                                                for (int k =0; k < Conf->Enumerate("goodchan"); k++)
                                                {
-                                                       if (match(redirect, Conf->ReadValue("goodchan","name",k)))
+                                                       if (InspIRCd::Match(redirect, Conf->ReadValue("goodchan","name",k)))
                                                                goodchan = true;
                                                }
-       
+
                                                if (!goodchan)
                                                {
                                                        /* <badchan:redirect> is a badchan */
@@ -80,22 +78,22 @@ class ModuleDenyChannels : public Module
        {
                delete Conf;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+               return Version("Implements config tags which allow blocking of joins to channels", VF_VENDOR,API_VERSION);
        }
 
 
-       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+       virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                for (int j =0; j < Conf->Enumerate("badchan"); j++)
                {
-                       if (match(cname, Conf->ReadValue("badchan","name",j)))
+                       if (InspIRCd::Match(cname, Conf->ReadValue("badchan","name",j)))
                        {
                                if (IS_OPER(user) && Conf->ReadFlag("badchan","allowopers",j))
                                {
-                                       return 0;
+                                       return MOD_RES_PASSTHRU;
                                }
                                else
                                {
@@ -104,30 +102,30 @@ class ModuleDenyChannels : public Module
 
                                        for (int i = 0; i < Conf->Enumerate("goodchan"); i++)
                                        {
-                                               if (match(cname, Conf->ReadValue("goodchan", "name", i)))
+                                               if (InspIRCd::Match(cname, Conf->ReadValue("goodchan", "name", i)))
                                                {
-                                                       return 0;
+                                                       return MOD_RES_PASSTHRU;
                                                }
                                        }
-                                       
-                                       if (ServerInstance->IsChannel(redirect.c_str()))
+
+                                       if (ServerInstance->IsChannel(redirect.c_str(), ServerInstance->Config->Limits.ChanMax))
                                        {
                                                /* simple way to avoid potential loops: don't redirect to +L channels */
                                                Channel *newchan = ServerInstance->FindChan(redirect);
                                                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());
-                                                       return 1;
+                                                       Channel::JoinUser(user,redirect.c_str(),false,"",false,ServerInstance->Time());
+                                                       return MOD_RES_DENY;
                                                }
                                        }
 
                                        user->WriteNumeric(926, "%s %s :Channel %s is forbidden: %s",user->nick.c_str(),cname,cname,reason.c_str());
-                                       return 1;
+                                       return MOD_RES_DENY;
                                }
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 };