Remove whitespace and minor style changes

[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 598c9ab9ce0d3ea01e2a84b67acae2c8fd9b201e..48e4a19b96519ebeadc4162f5baadbd73bbe21d5 100644 (file)
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.cpp
@@ -1,96 +1,77 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 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 "treesocket.h"
-#include "treeserver.h"
-#include "utils.h"
-
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
+#include "inspircd.h"
+#include "commands.h"
 
 /** FMODE command - server mode with timestamp checks */
-void TreeSocket::ForceMode(User* who, parameterlist &params)
+CmdResult CommandFMode::Handle(User* who, std::vector<std::string>& params)
 {
-       /* Chances are this is a 1.0 FMODE without TS */
-       if (params.size() < 3)
+       time_t TS = ConvToInt(params[1]);
+       if (!TS)
        {
-               /* No modes were in the command, probably a channel with no modes set on it */
-               return;
+               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "*** BUG? *** TS of 0 sent to FMODE. Are some services authors smoking craq, or is it 1970 again?. Dropping link.");
+               ServerInstance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FMODE with a TS of zero. Total craq, dropping link.", who->server->GetName().c_str());
+               return CMD_INVALID;
        }
 
-       std::string sourceserv = who->server;
-
-       std::vector<std::string> modelist;
-       time_t TS = 0;
-       for (unsigned int q = 0; (q < params.size()) && (q < 64); q++)
-       {
-               if (q == 1)
-               {
-                       /* The timestamp is in this position.
-                        * We don't want to pass that up to the
-                        * server->client protocol!
-                        */
-                       TS = atoi(params[q].c_str());
-               }
-               else
-               {
-                       /* Everything else is fine to append to the modelist */
-                       modelist.push_back(params[q]);
-               }
-
-       }
        /* Extract the TS value of the object, either User or Channel */
-       User* dst = ServerInstance->FindNick(params[0]);
-       Channel* chan = NULL;
-       time_t ourTS = 0;
-
-       if (dst)
+       time_t ourTS;
+       if (params[0][0] == '#')
        {
-               ourTS = dst->age;
+               Channel* chan = ServerInstance->FindChan(params[0]);
+               if (!chan)
+                       /* Oops, channel doesn't exist! */
+                       return CMD_FAILURE;
+
+               ourTS = chan->age;
        }
        else
        {
-               chan = ServerInstance->FindChan(params[0]);
-               if (chan)
-               {
-                       ourTS = chan->age;
-               }
-               else
-                       /* Oops, channel doesnt exist! */
-                       return;
-       }
+               User* user = ServerInstance->FindUUID(params[0]);
+               if (!user)
+                       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;
+               if (IS_SERVER(user))
+                       return CMD_INVALID;
+
+               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)
-       {
-               ServerInstance->Modes->Process(modelist, who, IS_SERVER(who));
+       if (TS > ourTS)
+               return CMD_FAILURE;
 
-               /* HOT POTATO! PASS IT ON! */
-               Utils->DoOneToAllButSender(sourceserv,"FMODE",params,sourceserv);
-       }
-       /* 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.
         */
-}
+       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;
+}