X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fsvsjoin.cpp;h=9598a6348bf920883e08644fb720f1bb31a867de;hb=0a6b1e1a7de92e078a98f0b955d2624e5b85e4c1;hp=38ba687ccb747b5588ae7c7f063a9648ed8fcdf9;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/svsjoin.cpp b/src/modules/m_spanningtree/svsjoin.cpp
index 38ba687cc..9598a6348 100644
--- a/src/modules/m_spanningtree/svsjoin.cpp
+++ b/src/modules/m_spanningtree/svsjoin.cpp
@@ -1,45 +1,62 @@
-/*       +------------------------------------+
- *       | 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) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2008-2009 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 "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/treesocket.h"
+#include "inspircd.h"
 
-/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.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, Params& parameters)
 {
-	if (params.size() < 2)
-		return true;
+	// Check for valid channel name
+	if (!ServerInstance->IsChannel(parameters[1]))
+		return CMD_FAILURE;
 
-	User* u = this->ServerInstance->FindNick(params[0]);
+	// Check target exists
+	User* u = ServerInstance->FindUUID(parameters[0]);
+	if (!u)
+		return CMD_FAILURE;
 
-	if (u)
+	/* only join if it's local, otherwise just pass it on! */
+	LocalUser* localuser = IS_LOCAL(u);
+	if (localuser)
 	{
-		/* only join if it's local, otherwise just pass it on! */
-		if (IS_LOCAL(u))
-			Channel::JoinUser(this->ServerInstance, u, params[1].c_str(), false, "", false, ServerInstance->Time());
-		Utils->DoOneToAllButSender(prefix,"SVSJOIN",params,prefix);
+		bool override = false;
+		std::string key;
+		if (parameters.size() >= 3)
+		{
+			key = parameters[2];
+			if (key.empty())
+				override = true;
+		}
+
+		Channel::JoinUser(localuser, parameters[1], override, key);
 	}
-	return true;
+
+	return CMD_SUCCESS;
 }
 
+RouteDescriptor CommandSVSJoin::GetRouting(User* user, const Params& parameters)
+{
+	return ROUTE_OPT_UCAST(parameters[0]);
+}