X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Foverride_map.cpp;h=26bbcc27955559ed0ad69299591e8ef676222163;hb=0a6b1e1a7de92e078a98f0b955d2624e5b85e4c1;hp=68551e84f5ba22359cdd4e3a0235c181a4ae40ba;hpb=f71e6bf9cb41811f18864f5d4eecb26e29d03f25;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp
index 68551e84f..26bbcc279 100644
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -1,10 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2016, 2018-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2014 Adam <Adam@anope.org>
+ *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007, 2010 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -76,20 +82,24 @@ static std::vector<std::string> GetMap(User* user, TreeServer* current, unsigned
 	std::string buffer = current->GetName();
 	if (user->IsOper())
 	{
-		buffer += " (" + current->GetID() + ")";
+		buffer += " (" + current->GetId();
+
+		const std::string& cur_vers = current->GetRawVersion();
+		if (!cur_vers.empty())
+			buffer += " " + cur_vers;
+
+		buffer += ")";
 	}
 
 	// Pad with spaces until its at max len, max_len must always be >= my names length
 	buffer.append(max_len - current->GetName().length(), ' ');
 
-	char buf[16];
-	snprintf(buf, sizeof(buf), "%5d [%5.2f%%]", current->UserCount, percent);
-	buffer += buf;
+	buffer += InspIRCd::Format("%5d [%5.2f%%]", current->UserCount, percent);
 
 	if (user->IsOper())
 	{
 		time_t secs_up = ServerInstance->Time() - current->age;
-		buffer += " [Up: " + ModuleSpanningTree::TimeToStr(secs_up) + (current->rtt == 0 ? "]" : " Lag: " + ConvToStr(current->rtt) + "ms]");
+		buffer += " [Up: " + InspIRCd::DurationString(secs_up) + (current->rtt == 0 ? "]" : " Lag: " + ConvToStr(current->rtt) + "ms]");
 	}
 
 	std::vector<std::string> map;
@@ -134,10 +144,10 @@ static std::vector<std::string> GetMap(User* user, TreeServer* current, unsigned
 				if (j != child_map.begin())
 				{
 					// If this child is not my last child, then add |
-					// to be able to "link" the next server in my list to me, and to indent this childs servers
+					// to be able to "link" the next server in my list to me, and to indent this child's servers
 					if (!last)
 						prefix = "| ";
-					// Otherwise this is my last child, so just use a space as theres nothing else linked to me below this
+					// Otherwise this is my last child, so just use a space as there's nothing else linked to me below this
 					else
 						prefix = "  ";
 				}
@@ -164,15 +174,15 @@ static std::vector<std::string> GetMap(User* user, TreeServer* current, unsigned
 	return map;
 }
 
-CmdResult CommandMap::Handle(const std::vector<std::string>& parameters, User* user)
+CmdResult CommandMap::Handle(User* user, const Params& parameters)
 {
 	if (parameters.size() > 0)
 	{
-		/* Remote MAP, the server is within the 1st parameter */
+		// Remote MAP, the target server is the 1st parameter
 		TreeServer* s = Utils->FindServerMask(parameters[0]);
 		if (!s)
 		{
-			user->WriteNumeric(ERR_NOSUCHSERVER, "%s :No such server", parameters[0].c_str());
+			user->WriteNumeric(ERR_NOSUCHSERVER, parameters[0], "No such server");
 			return CMD_FAILURE;
 		}
 
@@ -199,22 +209,19 @@ CmdResult CommandMap::Handle(const std::vector<std::string>& parameters, User* u
 
 	std::vector<std::string> map = GetMap(user, Utils->TreeRoot, max, 0);
 	for (std::vector<std::string>::const_iterator i = map.begin(); i != map.end(); ++i)
-		user->SendText(":%s %03d %s :%s", ServerInstance->Config->ServerName.c_str(),
-			RPL_MAP, user->nick.c_str(), i->c_str());
+		user->WriteRemoteNumeric(RPL_MAP, *i);
 
 	size_t totusers = ServerInstance->Users->GetUsers().size();
 	float avg_users = (float) totusers / Utils->serverlist.size();
 
-	user->SendText(":%s %03d %s :%u server%s and %u user%s, average %.2f users per server",
-		ServerInstance->Config->ServerName.c_str(), RPL_MAPUSERS, user->nick.c_str(),
-		(unsigned int)Utils->serverlist.size(), (Utils->serverlist.size() > 1 ? "s" : ""), (unsigned int)totusers, (totusers > 1 ? "s" : ""), avg_users);
-	user->SendText(":%s %03d %s :End of /MAP", ServerInstance->Config->ServerName.c_str(),
-		RPL_ENDMAP, user->nick.c_str());
+	user->WriteRemoteNumeric(RPL_MAPUSERS, InspIRCd::Format("%u server%s and %u user%s, average %.2f users per server",
+		(unsigned int)Utils->serverlist.size(), (Utils->serverlist.size() > 1 ? "s" : ""), (unsigned int)totusers, (totusers > 1 ? "s" : ""), avg_users));
+	user->WriteRemoteNumeric(RPL_ENDMAP, "End of /MAP");
 
 	return CMD_SUCCESS;
 }
 
-RouteDescriptor CommandMap::GetRouting(User* user, const std::vector<std::string>& parameters)
+RouteDescriptor CommandMap::GetRouting(User* user, const Params& parameters)
 {
 	if (!parameters.empty())
 		return ROUTE_UNICAST(parameters[0]);