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

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

diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp
index 7be904faf7552bb10b2185cc25989f507f2c2b9f..9a72c5f05016ea453221f75ada2ca95d5a903b7f 100644 (file)
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.cpp
@@ -55,23 +55,25 @@ CmdResult CommandFMode::Handle(const std::vector<std::string>& params, User *who
                ourTS = user->age;
        }
 
-       /* TS is equal or less: Merge the mode changes into ours and pass on.
+       /* If the TS is greater than ours, we drop the mode and don't pass it anywhere.
         */
-       if (TS <= ourTS)
-       {
-               std::vector<std::string> modelist;
-               modelist.reserve(params.size()-1);
-               /* Insert everything into modelist except the TS (params[1]) */
-               modelist.push_back(params[0]);
-               modelist.insert(modelist.end(), params.begin()+2, params.end());
+       if (TS > ourTS)
+               return CMD_FAILURE;
 
-               bool merge = (TS == ourTS) && IS_SERVER(who);
-               ServerInstance->Modes->Process(modelist, who, merge);
-               return CMD_SUCCESS;
-       }
-       /* If the TS is greater than ours, we drop the mode and dont pass it anywhere.
+       /* TS is equal or less: Merge the mode changes into ours and pass on.
         */
-       return CMD_FAILURE;
+       std::vector<std::string> modelist;
+       modelist.reserve(params.size()-1);
+       /* Insert everything into modelist except the TS (params[1]) */
+       modelist.push_back(params[0]);
+       modelist.insert(modelist.end(), params.begin()+2, params.end());
+
+       ModeParser::ModeProcessFlag flags = ModeParser::MODE_LOCALONLY;
+       if ((TS == ourTS) && IS_SERVER(who))
+               flags |= ModeParser::MODE_MERGE;
+
+       ServerInstance->Modes->Process(modelist, who, flags);
+       return CMD_SUCCESS;
 }