X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftime.cpp;h=6fdcf8b5391eba2e8afc6228f7694b4862ad0881;hb=e2af2347fc035d702e45f12e772223a8d578410d;hp=cb4fe7c65163d9942b58ad477ebd32168ae932b6;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/time.cpp b/src/modules/m_spanningtree/time.cpp
index cb4fe7c65..6fdcf8b53 100644
--- a/src/modules/m_spanningtree/time.cpp
+++ b/src/modules/m_spanningtree/time.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,41 +12,39 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.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 "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
-bool TreeSocket::Time(const std::string &prefix, std::deque<std::string> &params)
+bool TreeSocket::Time(const std::string &prefix, parameterlist &params)
 {
 	// :source.server TIME remote.server sendernick
 	// :remote.server TIME source.server sendernick TS
 	if (params.size() == 2)
 	{
 		// someone querying our time?
-		if (this->ServerInstance->Config->ServerName == params[0] || this->ServerInstance->Config->GetSID() == params[0])
+		if (ServerInstance->Config->ServerName == params[0] || ServerInstance->Config->GetSID() == params[0])
 		{
-			User* u = this->ServerInstance->FindNick(params[1]);
+			User* u = ServerInstance->FindNick(params[1]);
 			if (u)
 			{
 				params.push_back(ConvToStr(ServerInstance->Time()));
 				params[0] = prefix;
-				Utils->DoOneToOne(this->ServerInstance->Config->GetSID(),"TIME",params,params[0]);
+				Utils->DoOneToOne(ServerInstance->Config->GetSID(),"TIME",params,params[0]);
 			}
 		}
 		else
 		{
 			// not us, pass it on
-			User* u = this->ServerInstance->FindNick(params[1]);
+			User* u = ServerInstance->FindNick(params[1]);
 			if (u)
 				Utils->DoOneToOne(prefix,"TIME",params,params[0]);
 		}
@@ -54,16 +52,17 @@ bool TreeSocket::Time(const std::string &prefix, std::deque<std::string> &params
 	else if (params.size() == 3)
 	{
 		// a response to a previous TIME
-		User* u = this->ServerInstance->FindNick(params[1]);
+		User* u = ServerInstance->FindNick(params[1]);
 		if ((u) && (IS_LOCAL(u)))
 		{
+			std::string sourceserv = Utils->FindServer(prefix)->GetName();
 			time_t rawtime = atol(params[2].c_str());
 			struct tm * timeinfo;
 			timeinfo = localtime(&rawtime);
 			char tms[26];
 			snprintf(tms,26,"%s",asctime(timeinfo));
 			tms[24] = 0;
-			u->WriteNumeric(RPL_TIME, "%s %s :%s",u->nick.c_str(),prefix.c_str(),tms);
+			u->WriteNumeric(RPL_TIME, "%s %s :%s",u->nick.c_str(),sourceserv.c_str(),tms);
 		}
 		else
 		{