X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fsvsjoin.cpp;h=92187ddf76297a85681cfd23146be4a26b0a0d10;hb=c6e40d36b42a7ebf832c3a57d2816a47ee9c9a76;hp=d8df6fb9592b694e0de73633946998dff80b1c99;hpb=e4907b2ac7c9c17868128a868a033efbbc0625ea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/svsjoin.cpp b/src/modules/m_spanningtree/svsjoin.cpp
index d8df6fb95..92187ddf7 100644
--- a/src/modules/m_spanningtree/svsjoin.cpp
+++ b/src/modules/m_spanningtree/svsjoin.cpp
@@ -1,47 +1,58 @@
-/*       +------------------------------------+
- *       | 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) 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 "socket.h"
-#include "xline.h"
-#include "socketengine.h"
 
-#include "main.h"
-#include "utils.h"
-#include "treeserver.h"
-#include "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, parameterlist &params)
+CmdResult CommandSVSJoin::Handle(User* user, Params& parameters)
 {
-	// Check params
-	if (params.size() < 2)
-		return true;
-
 	// Check for valid channel name
-	if (!ServerInstance->IsChannel(params[1].c_str(), ServerInstance->Config->Limits.ChanMax))
-		return true;
+	if (!ServerInstance->IsChannel(parameters[1]))
+		return CMD_FAILURE;
 
 	// Check target exists
-	User* u = ServerInstance->FindNick(params[0]);
+	User* u = ServerInstance->FindUUID(parameters[0]);
 	if (!u)
-		return true;
+		return CMD_FAILURE;
 
 	/* only join if it's local, otherwise just pass it on! */
-	if (IS_LOCAL(u))
-		Channel::JoinUser(u, params[1].c_str(), false, "", false, ServerInstance->Time());
-	Utils->DoOneToAllButSender(prefix,"SVSJOIN",params,prefix);
-	return true;
+	LocalUser* localuser = IS_LOCAL(u);
+	if (localuser)
+	{
+		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 CMD_SUCCESS;
 }
 
+RouteDescriptor CommandSVSJoin::GetRouting(User* user, const Params& parameters)
+{
+	return ROUTE_OPT_UCAST(parameters[0]);
+}