X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fsvsnick.cpp;h=fda150012f1f845a5db01b3c8c3fc1fcd0db5b1d;hb=207c6c290e5b752d562fdc0b121379d511a3dce8;hp=ef57f6dbb6440b6220069df4dda0e6ff847afc9e;hpb=a1a7b96a8c994eb09a3d071f3daf28252b8c188b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index ef57f6dbb..fda150012 100644
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,53 +12,41 @@
  */
 
 #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 "main.h"
+#include "utils.h"
+#include "commands.h"
 
-/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
-/** Because Andy insists that services-compatible servers must
- * implement SVSNICK and SVSJOIN, that's exactly what we do :p
- */
-bool TreeSocket::ForceNick(const std::string &prefix, std::deque<std::string> &params)
+CmdResult CommandSVSNick::Handle(const std::vector<std::string>& parameters, User *user)
 {
-	if (params.size() < 3)
-		return true;
-
-	User* u = this->Instance->FindNick(params[0]);
+	User* u = ServerInstance->FindNick(parameters[0]);
 
-	if (u)
+	if (u && IS_LOCAL(u))
 	{
-		Utils->DoOneToAllButSender(prefix,"SVSNICK",params,prefix);
+		std::string nick = parameters[1];
+		if (isdigit(nick[0]))
+			nick = u->uuid;
 
-		if (IS_LOCAL(u))
+		if (!u->ForceNickChange(nick.c_str()))
 		{
-			std::deque<std::string> par;
-			par.push_back(params[1]);
-
-			if (!u->ForceNickChange(params[1].c_str()))
+			/* buh. UID them */
+			if (!u->ForceNickChange(u->uuid.c_str()))
 			{
-				/* buh. UID them */
-				if (!u->ForceNickChange(u->uuid.c_str()))
-				{
-					this->Instance->Users->QuitUser(u, "Nickname collision");
-					return true;
-				}
+				ServerInstance->Users->QuitUser(u, "Nickname collision");
+				return CMD_SUCCESS;
 			}
-
-			u->age = atoi(params[2].c_str());
 		}
+
+		u->age = atoi(parameters[2].c_str());
 	}
 
-	return true;
+	return CMD_SUCCESS;
 }
 
+RouteDescriptor CommandSVSNick::GetRouting(User* user, const std::vector<std::string>& parameters)
+{
+	User* u = ServerInstance->FindNick(parameters[0]);
+	if (u)
+		return ROUTE_OPT_UCAST(u->server);
+	return ROUTE_LOCALONLY;
+}