X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ffmode.cpp;h=c1e452db627bd28d0a647609536eb75d396c8248;hb=9375c633371ee8d25adc5cf756590077e5100bb5;hp=24047226d67a22f1dbbde503550254c52f0b9264;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp
index 24047226d..c1e452db6 100644
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.cpp
@@ -1,53 +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 "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
 
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
+#include "inspircd.h"
+#include "commands.h"
 
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /** FMODE command - server mode with timestamp checks */
-bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &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;
-	}
-
-	bool smode = false;
-	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 = this->ServerInstance->FakeClient;
-		smode = true;			/* Setting this flag tells us it is a server mode*/
-		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++)
@@ -68,7 +50,7 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
 
 	}
 	/* 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;
 
@@ -78,41 +60,34 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
 	}
 	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)
 	{
-		if (smode)
-		{
-			this->ServerInstance->SendMode(modelist, who);
-		}
-		else
-		{
-			this->ServerInstance->CallCommandHandler("MODE", modelist, who);
-		}
-		/* 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;
 }