Introduce ModeProcessFlags, can be passed to ModeParser::Process() to indicate local...

[user/henk/code/inspircd.git] / src / modules / m_channames.cpp

diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index 92774edff7575230ebb350ef1f1d784471851d37..f1a4981c8c95d74404c4859275bebc293c57fdf5 100644 (file)
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -23,44 +23,45 @@
 
 static std::bitset<256> allowedmap;
 
-class NewIsChannelHandler : public HandlerBase2<bool, const char*, size_t>
+class NewIsChannelHandler : public HandlerBase1<bool, const std::string&>
 {
  public:
        NewIsChannelHandler() { }
-       virtual ~NewIsChannelHandler() { }
-       virtual bool Call(const char*, size_t);
+       ~NewIsChannelHandler() { }
+       bool Call(const std::string&);
 };
 
-bool NewIsChannelHandler::Call(const char* c, size_t max)
+bool NewIsChannelHandler::Call(const std::string& channame)
 {
-               /* check for no name - don't check for !*chname, as if it is empty, it won't be '#'! */
-               if (!c || *c++ != '#')
+       if (channame.empty() || channame.length() > ServerInstance->Config->Limits.ChanMax || channame[0] != '#')
+               return false;
+
+       for (std::string::const_iterator c = channame.begin(); c != channame.end(); ++c)
+       {
+               unsigned int i = *c & 0xFF;
+               if (!allowedmap[i])
                        return false;
+       }
 
-               while (*c && --max)
-               {
-                       unsigned int i = *c++ & 0xFF;
-                       if (!allowedmap[i])
-                               return false;
-               }
-               // a name of exactly max length will have max = 1 here; the null does not trigger --max
-               return max;
+       return true;
 }
 
 class ModuleChannelNames : public Module
 {
- private:
        NewIsChannelHandler myhandler;
-       caller2<bool, const char*, size_t> rememberer;
+       caller1<bool, const std::string&> rememberer;
        bool badchan;
 
  public:
-       ModuleChannelNames() : rememberer(ServerInstance->IsChannel)
+       ModuleChannelNames() : rememberer(ServerInstance->IsChannel), badchan(false)
+       {
+       }
+
+       void init() CXX11_OVERRIDE
        {
                ServerInstance->IsChannel = &myhandler;
-               badchan = false;
                Implementation eventlist[] = { I_OnRehash, I_OnUserKick };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                OnRehash(NULL);
        }
 
@@ -70,7 +71,7 @@ class ModuleChannelNames : public Module
                std::vector<Channel*> chanvec;
                for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); ++i)
                {
-                       if (!ServerInstance->IsChannel(i->second->name.c_str(), MAXBUF))
+                       if (!ServerInstance->IsChannel(i->second->name))
                                chanvec.push_back(i->second);
                }
                std::vector<Channel*>::reverse_iterator c2 = chanvec.rbegin();
@@ -83,21 +84,29 @@ class ModuleChannelNames : public Module
                                modes.push_back(c->name);
                                modes.push_back("-P");
 
-                               ServerInstance->SendGlobalMode(modes, ServerInstance->FakeClient);
+                               ServerInstance->Modes->Process(modes, ServerInstance->FakeClient);
                        }
                        const UserMembList* users = c->GetUsers();
-                       for(UserMembCIter j = users->begin(); j != users->end(); ++j)
+                       for(UserMembCIter j = users->begin(); j != users->end(); )
+                       {
                                if (IS_LOCAL(j->first))
-                                       c->KickUser(ServerInstance->FakeClient, j->first, "Channel name no longer valid");
+                               {
+                                       // KickUser invalidates the iterator
+                                       UserMembCIter it = j++;
+                                       c->KickUser(ServerInstance->FakeClient, it->first, "Channel name no longer valid");
+                               }
+                               else
+                                       ++j;
+                       }
                }
                badchan = false;
        }
 
-       virtual void OnRehash(User* user)
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
-               ConfigReader Conf;
-               std::string denyToken = Conf.ReadValue("channames", "denyrange", 0);
-               std::string allowToken = Conf.ReadValue("channames", "allowrange", 0);
+               ConfigTag* tag = ServerInstance->Config->ConfValue("channames");
+               std::string denyToken = tag->getString("denyrange");
+               std::string allowToken = tag->getString("allowrange");
                allowedmap.set();
 
                irc::portparser denyrange(denyToken, false);
@@ -117,7 +126,7 @@ class ModuleChannelNames : public Module
                ValidateChans();
        }
 
-       virtual void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except_list)
+       void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except_list) CXX11_OVERRIDE
        {
                if (badchan)
                {
@@ -128,13 +137,13 @@ class ModuleChannelNames : public Module
                }
        }
 
-       virtual ~ModuleChannelNames()
+       ~ModuleChannelNames()
        {
                ServerInstance->IsChannel = rememberer;
                ValidateChans();
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Implements config tags which allow changing characters allowed in channel names", VF_VENDOR);
        }