X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Foverride_map.cpp;h=26bbcc27955559ed0ad69299591e8ef676222163;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=d1a00ed84b9245c66ee5937f446efcd903a67e35;hpb=4f3aaaef9f8b111452ffa4498aaefeae3fcb6675;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 d1a00ed84..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,7 +82,7 @@ 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())
@@ -93,7 +99,7 @@ static std::vector<std::string> GetMap(User* user, TreeServer* current, unsigned
 	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;
@@ -138,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 = "  ";
 				}
@@ -168,7 +174,7 @@ 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)
 	{
@@ -215,7 +221,7 @@ CmdResult CommandMap::Handle(const std::vector<std::string>& parameters, User* u
 	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]);