Fix some of the include guard names (requested by SaberUK)

[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 f81f7ad1de04d5b66bb9a27c88dc6527466e3c0f..ab92ae911094e6c0152b250fde7deaa007e06907 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-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -17,29 +17,20 @@
 
 class ModuleDenyChannels : public Module
 {
- private:
-
-
-       ConfigReader *Conf;
-
  public:
-       ModuleDenyChannels(InspIRCd* Me) : Module(Me)
-       {
-
-               Conf = new ConfigReader(ServerInstance);
+       ModuleDenyChannels()    {
                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);
+               ConfigReader Conf;
                /* check for redirect validity and loops/chains */
-               for (int i =0; i < Conf->Enumerate("badchan"); i++)
+               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);
+                       std::string name = Conf.ReadValue("badchan","name",i);
+                       std::string redirect = Conf.ReadValue("badchan","redirect",i);
 
                        if (!redirect.empty())
                        {
@@ -51,14 +42,14 @@ class ModuleDenyChannels : public Module
                                        throw ModuleException("Invalid badchan redirect, not a channel");
                                }
 
-                               for (int j =0; j < Conf->Enumerate("badchan"); j++)
+                               for (int j =0; j < Conf.Enumerate("badchan"); j++)
                                {
-                                       if (InspIRCd::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++)
+                                               for (int k =0; k < Conf.Enumerate("goodchan"); k++)
                                                {
-                                                       if (InspIRCd::Match(redirect, Conf->ReadValue("goodchan","name",k)))
+                                                       if (InspIRCd::Match(redirect, Conf.ReadValue("goodchan","name",k)))
                                                                goodchan = true;
                                                }
 
@@ -77,35 +68,35 @@ class ModuleDenyChannels : public Module
 
        virtual ~ModuleDenyChannels()
        {
-               delete Conf;
        }
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR,API_VERSION);
+               return Version("Implements config tags which allow blocking of joins to channels", VF_VENDOR);
        }
 
 
-       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++)
+               ConfigReader Conf;
+               for (int j =0; j < Conf.Enumerate("badchan"); j++)
                {
-                       if (InspIRCd::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))
+                               if (IS_OPER(user) && Conf.ReadFlag("badchan","allowopers",j))
                                {
-                                       return 0;
+                                       return MOD_RES_PASSTHRU;
                                }
                                else
                                {
-                                       std::string reason = Conf->ReadValue("badchan","reason",j);
-                                       std::string redirect = Conf->ReadValue("badchan","redirect",j);
+                                       std::string reason = Conf.ReadValue("badchan","reason",j);
+                                       std::string redirect = Conf.ReadValue("badchan","redirect",j);
 
-                                       for (int i = 0; i < Conf->Enumerate("goodchan"); i++)
+                                       for (int i = 0; i < Conf.Enumerate("goodchan"); i++)
                                        {
-                                               if (InspIRCd::Match(cname, Conf->ReadValue("goodchan", "name", i)))
+                                               if (InspIRCd::Match(cname, Conf.ReadValue("goodchan", "name", i)))
                                                {
-                                                       return 0;
+                                                       return MOD_RES_PASSTHRU;
                                                }
                                        }
 
@@ -116,17 +107,17 @@ 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());
-                                                       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;
        }
 };