X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Foverride_map.cpp;h=26bbcc27955559ed0ad69299591e8ef676222163;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=693b07bade23e478818fd7f71c2b03beb57f993e;hpb=87b1461e2a4710a38b32186c2582da9fe9bb3804;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 693b07bad..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 + * Copyright (C) 2016, 2018-2020 Sadie Powell * Copyright (C) 2014 Adam + * Copyright (C) 2013-2016 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2009 Uli Schlachter * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2007-2008 Craig Edwards + * Copyright (C) 2008 Thomas Stagner * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007, 2010 Craig Edwards * * 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 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 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 map; @@ -138,10 +144,10 @@ static std::vector 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 = " "; }