1 files changed, 41 insertions, 36 deletions

diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index c76b0e79f..853b6b75c 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -21,65 +21,70 @@
 
 
 #include "inspircd.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
 {
-	std::set<irc::string> allowchans;
+	AllowChans allowchans;
+	bool allowregistered;
 
-	void ReadConfig()
+	bool CanCreateChannel(LocalUser* user, const std::string& name)
 	{
-		allowchans.clear();
-		ConfigTagList tags = ServerInstance->Config->ConfTags("allowchannel");
-		for(ConfigIter i = tags.first; i != tags.second; ++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)
 		{
-			ConfigTag* tag = i->second;
-			std::string txt = tag->getString("name");
-			allowchans.insert(txt.c_str());
+			if (InspIRCd::Match(name, *it))
+				return true;
 		}
-	}
 
- public:
-	void init()
-	{
-		ReadConfig();
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+		return false;
 	}
 
-	virtual void OnRehash(User* user)
+ public:
+	ModuleRestrictChans()
+		: allowregistered(false)
 	{
-		ReadConfig();
 	}
 
-
-	virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		irc::string x = cname;
-		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)
+		AllowChans newallows;
+		ConfigTagList tags = ServerInstance->Config->ConfTags("allowchannel");
+		for (ConfigIter i = tags.first; i != tags.second; ++i)
 		{
-			// 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 MOD_RES_DENY;
-			}
+			const std::string name = i->second->getString("name");
+			if (name.empty())
+				throw ModuleException("Empty <allowchannel:name> at " + i->second->getTagLocation());
+
+			newallows.insert(name);
 		}
-		return MOD_RES_PASSTHRU;
+		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("Only opers may create new channels if this module is loaded",VF_VENDOR);
+		return Version("Allows restricting who can create channels", VF_VENDOR);
 	}
 };