Merge m_restrictchans and m_regonlycreate due to converging functionality (#1541).

[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 1f2416d4470b32ae82273f07ef686267d1508fcc..853b6b75c14d647e000efbf2419c1af16bf1969d 100644 (file)
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -1,84 +1,90 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 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"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "modules/account.h"
 
-/* $ModDesc: Only opers may create new channels if this module is loaded */
+typedef insp::flat_set<std::string, irc::insensitive_swo> AllowChans;
 
 class ModuleRestrictChans : public Module
 {
-       
+       AllowChans allowchans;
+       bool allowregistered;
 
-       std::map<irc::string,int> allowchans;
-
-       void ReadConfig()
+       bool CanCreateChannel(LocalUser* user, const std::string& name)
        {
-               ConfigReader* MyConf = new ConfigReader(ServerInstance);
-               allowchans.clear();
-               for (int i = 0; i < MyConf->Enumerate("allowchannel"); i++)
+               const AccountExtItem* accountext = GetAccountExtItem();
+               if (allowregistered && accountext && accountext->get(user))
+                       return true;
+
+               if (user->HasPrivPermission("channels/restricted-create"))
+                       return true;
+
+               for (AllowChans::const_iterator it = allowchans.begin(), it_end = allowchans.end(); it != it_end; ++it)
                {
-                       std::string txt;
-                       txt = MyConf->ReadValue("allowchannel", "name", i);
-                       irc::string channel = txt.c_str();
-                       allowchans[channel] = 1;
+                       if (InspIRCd::Match(name, *it))
+                               return true;
                }
-               DELETE(MyConf);
-       }
 
- public:
-       ModuleRestrictChans(InspIRCd* Me)
-               : Module(Me)
-       {
-               
-               ReadConfig();
+               return false;
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+ public:
+       ModuleRestrictChans()
+               : allowregistered(false)
        {
-               ReadConfig();
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreJoin] = List[I_OnRehash] = 1;
-       }
-       
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               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()))
+               AllowChans newallows;
+               ConfigTagList tags = ServerInstance->Config->ConfTags("allowchannel");
+               for (ConfigIter i = tags.first; i != tags.second; ++i)
                {
-                       // channel does not yet exist (record is null, about to be created IF we were to allow it)
-                       if (!chan)
-                       {
-                               user->WriteServ("530 %s %s :Only IRC operators may create new channels",user->nick,cname,cname);
-                               return 1;
-                       }
+                       const std::string name = i->second->getString("name");
+                       if (name.empty())
+                               throw ModuleException("Empty <allowchannel:name> at " + i->second->getTagLocation());
+
+                       newallows.insert(name);
                }
-               return 0;
+               allowchans.swap(newallows);
+
+               // Global config
+               ConfigTag* tag = ServerInstance->Config->ConfValue("restrictchans");
+               allowregistered = tag->getBool("allowregistered", false);
        }
-       
-       virtual ~ModuleRestrictChans()
+
+       ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
        {
+               // channel does not yet exist (record is null, about to be created IF we were to allow it)
+               if (!chan && !CanCreateChannel(user, cname))
+                       return MOD_RES_DENY;
+
+               return MOD_RES_PASSTHRU;
        }
-       
-       virtual Version GetVersion()
+
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("Allows restricting who can create channels", VF_VENDOR);
        }
 };