Merge pull request #1254 from genius3000/insp20+fixPIstatusmsgs

[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 d95c942849d5f277dbd497376703684d1df2987c..c1e452db627bd28d0a647609536eb75d396c8248 100644 (file)
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.cpp
@@ -1,51 +1,35 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
-#include "xline.h"
+#include "commands.h"
 
 #include "treesocket.h"
 #include "treeserver.h"
 #include "utils.h"
 
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
-
 /** FMODE command - server mode with timestamp checks */
-bool TreeSocket::ForceMode(const std::string &source, parameterlist &params)
+CmdResult CommandFMode::Handle(const std::vector<std::string>& params, User *who)
 {
-       /* Chances are this is a 1.0 FMODE without TS */
-       if (params.size() < 3)
-       {
-               /* No modes were in the command, probably a channel with no modes set on it */
-               return true;
-       }
-
-       std::string sourceserv;
+       std::string sourceserv = who->server;
 
-       /* Are we dealing with an FMODE from a user, or from a server? */
-       User* who = this->ServerInstance->FindNick(source);
-       if (who)
-       {
-               /* FMODE from a user, set sourceserv to the users server name */
-               sourceserv = who->server;
-       }
-       else
-       {
-               /* FMODE from a server, use a fake user to receive mode feedback */
-               who = Utils->ServerUser;
-               sourceserv = source;    /* Set sourceserv to the actual source string */
-       }
        std::vector<std::string> modelist;
        time_t TS = 0;
        for (unsigned int q = 0; (q < params.size()) && (q < 64); q++)
@@ -66,7 +50,7 @@ bool TreeSocket::ForceMode(const std::string &source, parameterlist &params)
 
        }
        /* Extract the TS value of the object, either User or Channel */
-       User* dst = this->ServerInstance->FindNick(params[0]);
+       User* dst = ServerInstance->FindNick(params[0]);
        Channel* chan = NULL;
        time_t ourTS = 0;
 
@@ -76,35 +60,34 @@ bool TreeSocket::ForceMode(const std::string &source, parameterlist &params)
        }
        else
        {
-               chan = this->ServerInstance->FindChan(params[0]);
+               chan = ServerInstance->FindChan(params[0]);
                if (chan)
                {
                        ourTS = chan->age;
                }
                else
                        /* Oops, channel doesnt exist! */
-                       return true;
+                       return CMD_FAILURE;
        }
 
        if (!TS)
        {
                ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"*** BUG? *** TS of 0 sent to FMODE. Are some services authors smoking craq, or is it 1970 again?. Dropped.");
                ServerInstance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FMODE with a TS of zero. Total craq. Mode was dropped.", sourceserv.c_str());
-               return true;
+               return CMD_INVALID;
        }
 
        /* TS is equal or less: Merge the mode changes into ours and pass on.
         */
        if (TS <= ourTS)
        {
-               ServerInstance->Modes->Process(modelist, who, true);
-
-               /* HOT POTATO! PASS IT ON! */
-               Utils->DoOneToAllButSender(source,"FMODE",params,sourceserv);
+               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.
         */
-       return true;
+       return CMD_FAILURE;
 }