X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Foverride_whois.cpp;h=68b0919c9cda9ce8fbbff9f467f74134702eb65a;hb=8cebe2878f3878afce6f643d93668155cb26801d;hp=214c20da3f789fdb5f2ea4723b8f6878b4857932;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/override_whois.cpp b/src/modules/m_spanningtree/override_whois.cpp
index 214c20da3..68b0919c9 100644
--- a/src/modules/m_spanningtree/override_whois.cpp
+++ b/src/modules/m_spanningtree/override_whois.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	  the file COPYING for details.
@@ -12,43 +12,37 @@
  */
 
 /* $ModDesc: Provides a spanning tree server link protocol */
-		
+
 #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 "m_spanningtree/timesynctimer.h"
-#include "m_spanningtree/resolvers.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/rconnect.h"
-#include "m_spanningtree/rsquit.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 m_spanningtree/rconnect.h m_spanningtree/rsquit.h */
+#include "xline.h"
+#include "../transport.h"
+
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
+
+/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
-int ModuleSpanningTree::HandleRemoteWhois(const char** parameters, int pcnt, User* user)
+int ModuleSpanningTree::HandleRemoteWhois(const std::vector<std::string>& parameters, User* user)
 {
-	if ((IS_LOCAL(user)) && (pcnt > 1))
+	if ((IS_LOCAL(user)) && (parameters.size() > 1))
 	{
 		User* remote = ServerInstance->FindNick(parameters[1]);
 		if ((remote) && (remote->GetFd() < 0))
 		{
-			std::deque<std::string> params;
-			params.push_back(parameters[1]);
+			parameterlist params;
+			params.push_back(remote->uuid);
 			Utils->DoOneToOne(user->uuid,"IDLE",params,remote->server);
 			return 1;
 		}
 		else if (!remote)
 		{
-			user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[1]);
-			user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, parameters[1]);
+			user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[1].c_str());
+			user->WriteNumeric(318, "%s %s :End of /WHOIS list.",user->nick.c_str(), parameters[1].c_str());
 			return 1;
 		}
 	}