m_spanningtree Change TreeServer::GetSocket() to always return the socket that can...

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

diff --git a/src/mode.cpp b/src/mode.cpp
index 578fc2c27a518469d35db84ea721ce05bf921df7..15f5c0d60aec6e5bfaf892ae6f500df1ceaf980d 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -29,7 +29,7 @@
 ModeHandler::ModeHandler(Module* Creator, const std::string& Name, char modeletter, ParamSpec Params, ModeType type)
        : ServiceProvider(Creator, Name, SERVICE_MODE), m_paramtype(TR_TEXT),
        parameters_taken(Params), mode(modeletter), prefix(0), oper(false),
-       list(false), m_type(type), levelrequired(HALFOP_VALUE)
+       list(false), m_type(type), levelrequired(HALFOP_VALUE), prefixrank(0)
 {
 }
 
@@ -44,11 +44,6 @@ ModeHandler::~ModeHandler()
 {
 }
 
-unsigned int ModeHandler::GetPrefixRank()
-{
-       return 0;
-}
-
 int ModeHandler::GetNumParams(bool adding)
 {
        switch (parameters_taken)
@@ -99,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
@@ -108,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;
 }
@@ -118,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
@@ -127,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;
 }
@@ -139,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;
 }
 
@@ -190,7 +181,10 @@ void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targ
                        /* Display user's current mode string */
                        user->WriteNumeric(RPL_UMODEIS, "%s :+%s",targetuser->nick.c_str(),targetuser->FormatModes());
                        if ((targetuser->IsOper()))
-                               user->WriteNumeric(RPL_SNOMASKIS, "%s +%s :Server notice mask", targetuser->nick.c_str(), targetuser->FormatNoticeMasks());
+                       {
+                               ModeHandler* snomask = FindMode('s', MODETYPE_USER);
+                               user->WriteNumeric(RPL_SNOMASKIS, "%s %s :Server notice mask", targetuser->nick.c_str(), snomask->GetUserParameter(user).c_str());
+                       }
                        return;
                }
                else
@@ -325,6 +319,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)
        {
@@ -336,7 +333,7 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool
        return MODEACTION_ALLOW;
 }
 
-void ModeParser::Process(const std::vector<std::string>& parameters, User *user, bool merge)
+void ModeParser::Process(const std::vector<std::string>& parameters, User* user, ModeProcessFlag flags)
 {
        std::string target = parameters[0];
        Channel* targetchannel = ServerInstance->FindChan(target);
@@ -416,9 +413,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 (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;
@@ -470,16 +467,15 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
                LastParse.append(output_mode);
                LastParse.append(output_parameters.str());
 
+               if (!(flags & MODE_LOCALONLY))
+                       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(OnMode, (user, targetuser, targetchannel, LastParseParams, LastParseTranslate));
        }
        else if (targetchannel && parameters.size() == 2)
        {
@@ -661,7 +657,7 @@ bool ModeParser::DelMode(ModeHandler* mh)
                                stackresult.push_back(chan->name);
                                while (stack.GetStackedLine(stackresult))
                                {
-                                       ServerInstance->SendMode(stackresult, ServerInstance->FakeClient);
+                                       this->Process(stackresult, ServerInstance->FakeClient, MODE_LOCALONLY);
                                        stackresult.erase(stackresult.begin() + 1, stackresult.end());
                                }
                        }
@@ -825,7 +821,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);
        }
 }
 
@@ -835,11 +831,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());
        }
@@ -897,9 +893,6 @@ ModeParser::ModeParser()
        /* Clear mode handler list */
        memset(modehandlers, 0, sizeof(modehandlers));
 
-       /* Last parse string */
-       LastParse.clear();
-
        seq = 0;
        memset(&sent, 0, sizeof(sent));
 }