Merge pull request #1361 from genius3000/master+rline_IP

[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 21686add399b16572260cc9647dfa7a6344d1aae..9c7ed1213ee2cfdfa230ae0bc1d5af0c6ef831d7 100644 (file)
--- 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;
+       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");
@@ -34,32 +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();
-       }
-
-       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, cname, "Only IRC operators may create new channels");
                                return MOD_RES_DENY;
                        }
                }