X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_restrictchans.cpp;h=b619ee4487392beb8d6da39fb5f0e4721db55ad3;hb=ea590a5d80741c3bc030cb0a2fcb3c59da4fd078;hp=9de6b1a0c6a38b02b2f89d31c8536db27d95e65a;hpb=54d10d53c730ab81ca6464fe2f0e0ecbcd435672;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 9de6b1a0c..b619ee448 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -24,9 +24,10 @@
 
 class ModuleRestrictChans : public Module
 {
-	std::set<irc::string> allowchans;
+	std::set<std::string, irc::insensitive_swo> allowchans;
 
-	void ReadConfig()
+ public:
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		allowchans.clear();
 		ConfigTagList tags = ServerInstance->Config->ConfTags("allowchannel");
@@ -34,34 +35,19 @@ class ModuleRestrictChans : public Module
 		{
 			ConfigTag* tag = i->second;
 			std::string txt = tag->getString("name");
-			allowchans.insert(txt.c_str());
+			allowchans.insert(txt);
 		}
 	}
 
- public:
-	void init() CXX11_OVERRIDE
-	{
-		ReadConfig();
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
-	void OnRehash(User* user) CXX11_OVERRIDE
-	{
-		ReadConfig();
-	}
-
 	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
-		irc::string x(cname.c_str());
-
 		// 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 ((!user->IsOper()) && (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.c_str());
+				user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s :Only IRC operators may create new channels", cname.c_str());
 				return MOD_RES_DENY;
 			}
 		}