Merge branch 'master+writenumeric'

[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 3a27cab73eb211c6cc801b31f968ccc20e3fc87c..7513cb33ab591b30fe77cb7670c91edb9cd568e5 100644 (file)
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -64,6 +64,8 @@ class ModuleChannelNames : public Module
 
        void ValidateChans()
        {
+               Modes::ChangeList removepermchan;
+
                badchan = true;
                const chan_hash& chans = ServerInstance->GetChans();
                for (chan_hash::const_iterator i = chans.begin(); i != chans.end(); )
@@ -76,19 +78,18 @@ class ModuleChannelNames : public Module
 
                        if (c->IsModeSet(permchannelmode) && c->GetUserCounter())
                        {
-                               std::vector<std::string> modes;
-                               modes.push_back(c->name);
-                               modes.push_back(std::string("-") + permchannelmode->GetModeChar());
-
-                               ServerInstance->Modes->Process(modes, ServerInstance->FakeClient);
+                               removepermchan.clear();
+                               removepermchan.push_remove(*permchannelmode);
+                               ServerInstance->Modes->Process(ServerInstance->FakeClient, c, NULL, removepermchan);
                        }
-                       UserMembList& users = c->userlist;
-                       for (UserMembIter j = users.begin(); j != users.end(); )
+
+                       Channel::MemberMap& users = c->userlist;
+                       for (Channel::MemberMap::iterator j = users.begin(); j != users.end(); )
                        {
                                if (IS_LOCAL(j->first))
                                {
                                        // KickUser invalidates the iterator
-                                       UserMembIter it = j++;
+                                       Channel::MemberMap::iterator it = j++;
                                        c->KickUser(ServerInstance->FakeClient, it, "Channel name no longer valid");
                                }
                                else
@@ -132,8 +133,8 @@ class ModuleChannelNames : public Module
        {
                if (badchan)
                {
-                       const UserMembList* users = memb->chan->GetUsers();
-                       for(UserMembCIter i = users->begin(); i != users->end(); i++)
+                       const Channel::MemberMap& users = memb->chan->GetUsers();
+                       for (Channel::MemberMap::const_iterator i = users.begin(); i != users.end(); ++i)
                                if (i->first != memb->user)
                                        except_list.insert(i->first);
                }