X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fsvspart.cpp;h=b966da2820297ec58b16749849f2135160ddb362;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=bcb73741ba87351dfb84dc50d18eebe6b1b26a19;hpb=0b070b52bc8e8ceb52388e45cea90f4add119c4f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/svspart.cpp b/src/modules/m_spanningtree/svspart.cpp
index bcb73741b..b966da282 100644
--- a/src/modules/m_spanningtree/svspart.cpp
+++ b/src/modules/m_spanningtree/svspart.cpp
@@ -1,57 +1,49 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 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 "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
-#include "socket.h"
-#include "wildcard.h"
-#include "xline.h"
-#include "transport.h"
-#include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
+#include "inspircd.h"
 
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
+#include "commands.h"
 
-bool TreeSocket::ServicePart(const std::string &prefix, std::deque<std::string> &params)
+CmdResult CommandSVSPart::Handle(const std::vector<std::string>& parameters, User *user)
 {
-	if (params.size() < 2)
-		return true;
-
-	std::string reason = "Services forced part";
-
-	if (params.size() == 3)
-		reason = params[2];
+	User* u = ServerInstance->FindUUID(parameters[0]);
+	if (!u)
+		return CMD_FAILURE;
 
-	User* u = this->Instance->FindNick(params[0]);
-	Channel* c = this->Instance->FindChan(params[1]);
+	Channel* c = ServerInstance->FindChan(parameters[1]);
+	if (!c)
+		return CMD_FAILURE;
 
-	if (u)
+	if (IS_LOCAL(u))
 	{
-		/* only part if it's local, otherwise just pass it on! */
-		if (IS_LOCAL(u))
-			if (!c->PartUser(u, reason))
-				delete c;
-		Utils->DoOneToAllButSender(prefix,"SVSPART",params,prefix);
+		std::string reason = (parameters.size() == 3) ? parameters[2] : "Services forced part";
+		c->PartUser(u, reason);
 	}
-
-	return true;
+	return CMD_SUCCESS;
 }
 
+RouteDescriptor CommandSVSPart::GetRouting(User* user, const std::vector<std::string>& parameters)
+{
+	User* u = ServerInstance->FindUUID(parameters[0]);
+	if (u)
+		return ROUTE_OPT_UCAST(u->server);
+	return ROUTE_LOCALONLY;
+}