X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fsvsjoin.cpp;h=552e08dd37fc53bfec859f353c4fdb413ccfa0a4;hb=02220d48eec4dd3507b582031de639c9d7835ec8;hp=ee4addb74167b870c52cff73b2f5c0596f547c62;hpb=a3f89e772514aca9aa4615ebe1656010111fc455;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/svsjoin.cpp b/src/modules/m_spanningtree/svsjoin.cpp
index ee4addb74..552e08dd3 100644
--- a/src/modules/m_spanningtree/svsjoin.cpp
+++ b/src/modules/m_spanningtree/svsjoin.cpp
@@ -1,52 +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::ServiceJoin(const std::string &prefix, std::deque<std::string> &params)
+CmdResult CommandSVSJoin::Handle(User* user, std::vector<std::string>& parameters)
 {
-	if (params.size() < 2)
-		return true;
-
-	if (!this->Instance->IsChannel(params[1].c_str()))
-		return true;
-
-	User* u = this->Instance->FindNick(params[0]);
+	// Check for valid channel name
+	if (!ServerInstance->IsChannel(parameters[1]))
+		return CMD_FAILURE;
+
+	// Check target exists
+	User* u = ServerInstance->FindUUID(parameters[0]);
+	if (!u)
+		return CMD_FAILURE;
+
+	/* only join if it's local, otherwise just pass it on! */
+	LocalUser* localuser = IS_LOCAL(u);
+	if (localuser)
+		Channel::JoinUser(localuser, parameters[1]);
+	return CMD_SUCCESS;
+}
 
+RouteDescriptor CommandSVSJoin::GetRouting(User* user, const std::vector<std::string>& parameters)
+{
+	User* u = ServerInstance->FindUUID(parameters[0]);
 	if (u)
-	{
-		/* only join if it's local, otherwise just pass it on! */
-		if (IS_LOCAL(u))
-			Channel::JoinUser(this->Instance, u, params[1].c_str(), false, "", false, Instance->Time());
-		Utils->DoOneToAllButSender(prefix,"SVSJOIN",params,prefix);
-	}
-	return true;
+		return ROUTE_OPT_UCAST(u->server);
+	return ROUTE_LOCALONLY;
 }
-