From: proller <proler@github.com>
Date: Tue, 5 Nov 2013 17:17:33 +0000 (+0400)
Subject: Masterserver uptime fix
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=6f44492238c89079402a984466d037f4558924e6;p=zefram%2Fminetest%2Fminetest_engine.git

Masterserver uptime fix
---

diff --git a/util/master/list.js b/util/master/list.js
index 2a831a26..59c12cd9 100644
--- a/util/master/list.js
+++ b/util/master/list.js
@@ -19,6 +19,7 @@ function humanTime(seconds) {
 			return (seconds / conv[i]).toFixed(1) + i;
 		}
 	}
+	return seconds + 's';
 }
 
 function escapeHTML(str) {
diff --git a/util/master/servers.jst b/util/master/servers.jst
index bf4a4bf5..3db07d05 100644
--- a/util/master/servers.jst
+++ b/util/master/servers.jst
@@ -7,7 +7,7 @@
 <table>
 	<tr>
 		{{? !master.no_address}}<th>IP[:Port]</th>{{?}}
-		{{? !master.no_clients}}<th>Players/Max</th>{{?}}
+		{{? !master.no_clients}}<th>Players/Max{{? !master.no_avgtop}}<br/>Avg/Top{{?}}</th>{{?}}
 		{{? !master.no_version}}<th>Version, Gameid, MapGen</th>{{?}}
 		{{? !master.no_name}}<th>Name</th>{{?}}
 		{{? !master.no_description}}<th>Description</th>{{?}}
@@ -25,7 +25,7 @@
 		</td>{{?}}
 		{{? !master.no_clients}}
 		<td class="clients{{? server.clients_list && server.clients_list.length > 0}} mts_hover_list_text{{?}}">
-			{{=server.clients}}/{{=server.clients_max}} {{=server.clients_top}}
+			{{=server.clients}}/{{=server.clients_max}}{{? !master.no_avgtop}} &nbsp;&nbsp;{{=Math.floor(server.pop_v)}}/{{=server.clients_top}}{{?}}
 			{{=hoverList("Clients", server.clients_list)}}
 		</td>{{?}}
 		{{? !master.no_version}}