Merge pull request #1157 from SaberUK/insp20+fix-cron-restart

[user/henk/code/inspircd.git] / src / modules / m_restrictchans.cpp

diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 587ba24c1254c36f6d895d37d0b077ce922550ee..c76b0e79fc2317ed49bfc377dd1650c8379d502b 100644 (file)
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -1,70 +1,76 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2005-2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Only opers may create new channels if this module is loaded */
 
 class ModuleRestrictChans : public Module
 {
-
-
-       std::map<irc::string,int> allowchans;
+       std::set<irc::string> allowchans;
 
        void ReadConfig()
        {
-               ConfigReader* MyConf = new ConfigReader(ServerInstance);
                allowchans.clear();
-               for (int i = 0; i < MyConf->Enumerate("allowchannel"); i++)
+               ConfigTagList tags = ServerInstance->Config->ConfTags("allowchannel");
+               for(ConfigIter i = tags.first; i != tags.second; ++i)
                {
-                       std::string txt;
-                       txt = MyConf->ReadValue("allowchannel", "name", i);
-                       irc::string channel = txt.c_str();
-                       allowchans[channel] = 1;
+                       ConfigTag* tag = i->second;
+                       std::string txt = tag->getString("name");
+                       allowchans.insert(txt.c_str());
                }
-               delete MyConf;
        }
 
  public:
-       ModuleRestrictChans(InspIRCd* Me)
-               : Module(Me)
+       void init()
        {
-
                ReadConfig();
                Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                ReadConfig();
        }
 
 
-       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)
        {
                irc::string x = cname;
-               // user is not an oper and its not in the allow list
-               if ((!IS_OPER(user)) && (allowchans.find(x) == allowchans.end()))
+               if (!IS_LOCAL(user))
+                       return MOD_RES_PASSTHRU;
+
+               // channel does not yet exist (record is null, about to be created IF we were to allow it)
+               if (!chan)
                {
-                       // channel does not yet exist (record is null, about to be created IF we were to allow it)
-                       if (!chan)
+                       // user is not an oper and its not in the allow list
+                       if ((!IS_OPER(user)) && (allowchans.find(x) == allowchans.end()))
                        {
                                user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Only IRC operators may create new channels",user->nick.c_str(),cname);
-                               return 1;
+                               return MOD_RES_DENY;
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual ~ModuleRestrictChans()
@@ -73,7 +79,7 @@ class ModuleRestrictChans : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+               return Version("Only opers may create new channels if this module is loaded",VF_VENDOR);
        }
 };