Merge insp20

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

diff --git a/src/modules/m_rmode.cpp b/src/modules/m_rmode.cpp
index c81fbd7e7f15f9a0c61f58740436481c13fe7361..37c6e62fff3e1ea9ed43601ba5453af41af8973f 100644 (file)
--- a/src/modules/m_rmode.cpp
+++ b/src/modules/m_rmode.cpp
@@ -60,7 +60,7 @@ class CommandRMode : public Command
                PrefixMode* pm;
                ListModeBase* lm;
                ListModeBase::ModeList* ml;
-               irc::modestacker modestack(false);
+               Modes::ChangeList changelist;
 
                if ((pm = mh->IsPrefixMode()))
                {
@@ -70,8 +70,8 @@ class CommandRMode : public Command
                        {
                                if (!InspIRCd::Match(it->first->nick, pattern))
                                        continue;
-                               if (it->second->hasMode(modeletter) && !((it->first == user) && (pm->GetPrefixRank() > VOICE_VALUE)))
-                                       modestack.Push(modeletter, it->first->nick);
+                               if (it->second->HasMode(pm) && !((it->first == user) && (pm->GetPrefixRank() > VOICE_VALUE)))
+                                       changelist.push_remove(mh, it->first->nick);
                        }
                }
                else if ((lm = mh->IsListModeBase()) && ((ml = lm->GetList(chan)) != NULL))
@@ -80,23 +80,16 @@ class CommandRMode : public Command
                        {
                                if (!InspIRCd::Match(it->mask, pattern))
                                        continue;
-                               modestack.Push(modeletter, it->mask);
+                               changelist.push_remove(mh, it->mask);
                        }
                }
                else
                {
                        if (chan->IsModeSet(mh))
-                               modestack.Push(modeletter);
-               }
-
-               parameterlist stackresult;
-               stackresult.push_back(chan->name);
-               while (modestack.GetStackedLine(stackresult))
-               {
-                       ServerInstance->Modes->Process(stackresult, user);
-                       stackresult.erase(stackresult.begin() + 1, stackresult.end());
+                               changelist.push_remove(mh);
                }
 
+               ServerInstance->Modes->Process(user, chan, NULL, changelist);
                return CMD_SUCCESS;
        }
 };