X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_restrictchans.cpp;h=9e660e8ed16f0d1843b480384ff5a6a772fdc212;hb=9d72ec55ae98960bf996dd3d92c29598a5e3c825;hp=a2f117616085237a198335859ae4c81b5e723496;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index a2f117616..9e660e8ed 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -22,13 +22,12 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Only opers may create new channels if this module is loaded */
-
 class ModuleRestrictChans : public Module
 {
-	std::set<irc::string> allowchans;
+	insp::flat_set<std::string, irc::insensitive_swo> allowchans;
 
-	void ReadConfig()
+ public:
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		allowchans.clear();
 		ConfigTagList tags = ServerInstance->Config->ConfTags("allowchannel");
@@ -36,48 +35,26 @@ class ModuleRestrictChans : public Module
 		{
 			ConfigTag* tag = i->second;
 			std::string txt = tag->getString("name");
-			allowchans.insert(txt.c_str());
+			allowchans.insert(txt);
 		}
 	}
 
- public:
-	ModuleRestrictChans()
-	{
-		ReadConfig();
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
-	}
-
-	virtual void OnRehash(User* user)
-	{
-		ReadConfig();
-	}
-
-
-	virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) 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)
 		{
 			// user is not an oper and its not in the allow list
-			if ((!IS_OPER(user)) && (allowchans.find(x) == allowchans.end()))
+			if ((!user->IsOper()) && (allowchans.find(cname) == allowchans.end()))
 			{
-				user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Only IRC operators may create new channels",user->nick.c_str(),cname);
+				user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s :Only IRC operators may create new channels", cname.c_str());
 				return MOD_RES_DENY;
 			}
 		}
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleRestrictChans()
-	{
-	}
-
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Only opers may create new channels if this module is loaded",VF_VENDOR);
 	}