X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ffmode.cpp;h=a15b5ddc219b0b4c96d40148eba494b81bb8c0a1;hb=a4305d8f3c3e613be839bdcd61a1d14c87fed5aa;hp=d95c942849d5f277dbd497376703684d1df2987c;hpb=3d8ec5dbd9cfde34fcbc63ad7b9b1369866f0a33;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp
index d95c94284..a15b5ddc2 100644
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.cpp
@@ -1,110 +1,55 @@
-/*       +------------------------------------+
- *       | 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 "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 */
-bool TreeSocket::ForceMode(const std::string &source, parameterlist &params)
+/** FMODE command - channel mode change with timestamp checks */
+CmdResult CommandFMode::Handle(User* who, Params& params)
 {
-	/* 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;
+	time_t TS = ServerCommand::ExtractTS(params[1]);
 
-	/* 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++)
-	{
-		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]);
-		}
+	Channel* const chan = ServerInstance->FindChan(params[0]);
+	if (!chan)
+		// Channel doesn't exist
+		return CMD_FAILURE;
 
-	}
-	/* Extract the TS value of the object, either User or Channel */
-	User* dst = this->ServerInstance->FindNick(params[0]);
-	Channel* chan = NULL;
-	time_t ourTS = 0;
+	// Extract the TS of the channel in question
+	time_t ourTS = chan->age;
 
-	if (dst)
-	{
-		ourTS = dst->age;
-	}
-	else
-	{
-		chan = this->ServerInstance->FindChan(params[0]);
-		if (chan)
-		{
-			ourTS = chan->age;
-		}
-		else
-			/* Oops, channel doesnt exist! */
-			return true;
-	}
-
-	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;
-	}
-
-	/* 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, true);
+	if (TS > ourTS)
+		return CMD_FAILURE;
 
-		/* HOT POTATO! PASS IT ON! */
-		Utils->DoOneToAllButSender(source,"FMODE",params,sourceserv);
-	}
-	/* If the TS is greater than ours, we drop the mode and dont pass it anywhere.
+	/* TS is equal or less: apply the mode change locally and forward the message
 	 */
-	return true;
-}
 
+	// Turn modes into a Modes::ChangeList; may have more elements than max modes
+	Modes::ChangeList changelist;
+	ServerInstance->Modes.ModeParamsToChangeList(who, MODETYPE_CHANNEL, params, changelist, 2);
 
+	ModeParser::ModeProcessFlag flags = ModeParser::MODE_LOCALONLY;
+	if ((TS == ourTS) && IS_SERVER(who))
+		flags |= ModeParser::MODE_MERGE;
+
+	ServerInstance->Modes->Process(who, chan, NULL, changelist, flags);
+	return CMD_SUCCESS;
+}