Move lots of spanningtree items to commands

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12296 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 8 insertions, 18 deletions

diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp
index 598c9ab9c..de7631c83 100644
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.cpp
@@ -12,25 +12,15 @@
  */
 
 #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 */
-void TreeSocket::ForceMode(User* who, 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;
-	}
-
 	std::string sourceserv = who->server;
 
 	std::vector<std::string> modelist;
@@ -70,27 +60,27 @@ void TreeSocket::ForceMode(User* who, parameterlist &params)
 		}
 		else
 			/* Oops, channel doesnt exist! */
-			return;
+			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;
+		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, IS_SERVER(who));
-
-		/* HOT POTATO! PASS IT ON! */
-		Utils->DoOneToAllButSender(sourceserv,"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 CMD_FAILURE;
 }