Merge pull request #569 from ShutterQuick/inspircd+asrootfix

[user/henk/code/inspircd.git] / src / mode.cpp

diff --git a/src/mode.cpp b/src/mode.cpp
index 63008f45c8ffe69bd7b20a6cf72bbb0c322b674c..303d292d9a4ef45fe6550ef666ec5c0d43c9c7b4 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -94,7 +94,7 @@ ModeAction SimpleUserModeHandler::OnModeChange(User* source, User* dest, Channel
 {
        /* We're either trying to add a mode we already have or
                remove a mode we don't have, deny. */
-       if (dest->IsModeSet(this->GetModeChar()) == adding)
+       if (dest->IsModeSet(this) == adding)
                return MODEACTION_DENY;
 
        /* adding will be either true or false, depending on if we
@@ -103,7 +103,7 @@ ModeAction SimpleUserModeHandler::OnModeChange(User* source, User* dest, Channel
                aren't removing a mode we don't have, we don't have to do any
                other checks here to see if it's true or false, just add or
                remove the mode */
-       dest->SetMode(this->GetModeChar(), adding);
+       dest->SetMode(this, adding);
 
        return MODEACTION_ALLOW;
 }
@@ -113,7 +113,7 @@ ModeAction SimpleChannelModeHandler::OnModeChange(User* source, User* dest, Chan
 {
        /* We're either trying to add a mode we already have or
                remove a mode we don't have, deny. */
-       if (channel->IsModeSet(this->GetModeChar()) == adding)
+       if (channel->IsModeSet(this) == adding)
                return MODEACTION_DENY;
 
        /* adding will be either true or false, depending on if we
@@ -122,7 +122,7 @@ ModeAction SimpleChannelModeHandler::OnModeChange(User* source, User* dest, Chan
                aren't removing a mode we don't have, we don't have to do any
                other checks here to see if it's true or false, just add or
                remove the mode */
-       channel->SetMode(this->GetModeChar(), adding);
+       channel->SetMode(this, adding);
 
        return MODEACTION_ALLOW;
 }
@@ -134,10 +134,6 @@ ModeAction ParamChannelModeHandler::OnModeChange(User* source, User* dest, Chann
        std::string now = channel->GetModeParameter(this);
        if (parameter == now)
                return MODEACTION_DENY;
-       if (adding)
-               channel->SetModeParam(this, parameter);
-       else
-               channel->SetModeParam(this, "");
        return MODEACTION_ALLOW;
 }
 
@@ -320,6 +316,9 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool
        if (ma != MODEACTION_ALLOW)
                return ma;
 
+       if ((!mh->IsListMode()) && (mh->GetNumParams(true)) && (chan))
+               chan->SetModeParam(mh, (adding ? parameter : ""));
+
        itpair = modewatchermap.equal_range(mh->name);
        for (ModeWatchIter i = itpair.first; i != itpair.second; ++i)
        {
@@ -411,9 +410,9 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User* user,
                        /* Make sure the user isn't trying to slip in an invalid parameter */
                        if ((parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos))
                                continue;
-                       if ((flags & MODE_MERGE) && targetchannel && targetchannel->IsModeSet(modechar) && !mh->IsListMode())
+                       if ((flags & MODE_MERGE) && targetchannel && targetchannel->IsModeSet(mh) && !mh->IsListMode())
                        {
-                               std::string ours = targetchannel->GetModeParameter(modechar);
+                               std::string ours = targetchannel->GetModeParameter(mh);
                                if (!mh->ResolveModeConflict(parameter, ours, targetchannel))
                                        /* we won the mode merge, don't apply this mode */
                                        continue;
@@ -469,15 +468,11 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User* user,
                        ServerInstance->PI->SendMode(user, targetuser, targetchannel, LastParseParams, LastParseTranslate);
 
                if (targetchannel)
-               {
-                       targetchannel->WriteChannel(user, "MODE %s", LastParse.c_str());
-                       FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, LastParseParams, LastParseTranslate));
-               }
+                       targetchannel->WriteChannel(user, "MODE " + LastParse);
                else
-               {
-                       targetuser->WriteFrom(user, "MODE %s", LastParse.c_str());
-                       FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, LastParseParams, LastParseTranslate));
-               }
+                       targetuser->WriteFrom(user, "MODE " + LastParse);
+
+               FOREACH_MOD(I_OnMode,OnMode(user, targetuser, targetchannel, LastParseParams, LastParseTranslate));
        }
        else if (targetchannel && parameters.size() == 2)
        {
@@ -823,7 +818,7 @@ void ModeHandler::RemoveMode(User* user)
                parameters.push_back(user->nick);
                parameters.push_back("-");
                parameters[1].push_back(this->GetModeChar());
-               ServerInstance->Modes->Process(parameters, ServerInstance->FakeClient);
+               ServerInstance->Modes->Process(parameters, ServerInstance->FakeClient, ModeParser::MODE_LOCALONLY);
        }
 }
 
@@ -833,11 +828,11 @@ void ModeHandler::RemoveMode(Channel* channel, irc::modestacker& stack)
        {
                RemovePrefixMode(channel, stack);
        }
-       else if (channel->IsModeSet(this->GetModeChar()))
+       else if (channel->IsModeSet(this))
        {
                if (this->GetNumParams(false))
                        // Removing this mode requires a parameter
-                       stack.Push(this->GetModeChar(), channel->GetModeParameter(this->GetModeChar()));
+                       stack.Push(this->GetModeChar(), channel->GetModeParameter(this));
                else
                        stack.Push(this->GetModeChar());
        }