From 16c11eb4a3bb46a388c645b7db738762e444cde8 Mon Sep 17 00:00:00 2001
From: proller <proller@github.com>
Date: Sat, 30 Mar 2013 02:03:24 +0400
Subject: Masterserver: report gameid, uptime, cosmetic fixes on server web
 page

---
 util/master/list.js    | 36 ++++++++++++++++++------------------
 util/master/master.cgi |  5 +++++
 2 files changed, 23 insertions(+), 18 deletions(-)

(limited to 'util/master')

diff --git a/util/master/list.js b/util/master/list.js
index dcc30e091..18cbc4b68 100644
--- a/util/master/list.js
+++ b/util/master/list.js
@@ -2,11 +2,12 @@ function e(s) {
     if (typeof s === "undefined") s = '';
     return s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;'); //mc"
 }
-function human_time(t) {
+
+function human_time(t, abs) {
     var n = 's';
     if (!t || t < 0) t = 0;
     var f = 0;
-    var s = parseInt((new Date().getTime() / 1000 - (t || 0)));
+    var s = parseInt(abs ? (t || 0) : (new Date().getTime() / 1000 - (t || 0)));
     if (!s || s <= 0) s = 0;
     if (s == 0) return 'now';
     if (s >= 60) {
@@ -35,38 +36,37 @@ function human_time(t) {
     }
     return ((f ? parseFloat(s).toFixed(1) : parseInt(s)) + n);
 }
+
 function success(r) {
     if (!r || !r.list) return;
-    var h = '<table><tr><th>ip:port</th><th>clients, max</th><th>version</th><th>name</th><th>desc</th><th>flags</th><th>updated/started</th><th>ping</th></tr>';
+    var h = '<table class="mts_table"><tr class="mts_head"><th>ip[:port]</th><th>clients/max</th><th>version gameid</th><th>name</th><th>desc</th><th>flags</th><th>uptime</th><th>ping</th></tr>';
     for (var i = 0; i < r.list.length; ++i) {
         var s = r.list[i];
         if (!s) continue;
-        h += '<tr>';
-        h += '<td>' + e(s.address) + ':' + e(s.port) + '</td>';
-        h += '<td>' + e(s.clients) + (s.clients_max ? '/' + e(s.clients_max) : '') + (s.clients_top ? ', ' + s.clients_top : '') + '</td>';
-        h += '<td>' + e(s.version) + '</td>';
-        h += '<td>';
+        h += '<tr class="mts_row">';
+        h += '<td class="mts_address">' + e(s.address) + (s.port != 30000 ? (':' + e(s.port)) : '') + '</td>';
+        h += '<td class="mts_clients">' + e(s.clients) + (s.clients_max ? '/' + e(s.clients_max) : '') + (s.clients_top ? ', ' + s.clients_top : '') + '</td>';
+        h += '<td class="mts_version">' + e(s.version) + ' ' + e(s.gameid) + '</td>';
+        h += '<td class="mts_url">';
         if (s.url) h += '<a href="' + e(s.url) + '">';
         h += e(s.name || s.url);
         if (s.url) h += '</a>';
         h += '</td>';
-        h += '<td>' + e(s.description) + '</td>';
-        h += '<td>' + e(s.password ? 'Pwd ' : '') + (s.creative ? 'Cre ' : '') + (s.damage ? 'Dmg ' : '') + (s.pvp ? 'Pvp ' : '') + (s.dedicated ? 'Ded ' : '') + '</td>';
+        h += '<td class="mts_description">' + e(s.description) + '</td>';
+        h += '<td class="mts_flags">' + e(s.password ? 'Pwd ' : '') + (s.creative ? 'Cre ' : '') + (s.damage ? 'Dmg ' : '') + (s.pvp ? 'Pvp ' : '') + (s.dedicated ? 'Ded ' : '') + '</td>';
         if (!s.time || s.time < 0) s.time = 0;
         if (!s.start || s.start < 0) s.start = 0;
-        h += '<td>' + human_time(s.time) + (s.start ? '/' + human_time(s.start) : '') + '</td>';
-        h += '<td>' + (s.ping ? parseFloat(s.ping).toFixed(3)*1000 : '') + '</td>';
+        h += '<td class="mts_time">' + (s.uptime ? human_time(s.uptime, 1) : '') + '</td>';
+        h += '<td class="mts_ping">' + (s.ping ? parseFloat(s.ping).toFixed(3) * 1000 : '') + '</td>';
         h += '</tr>';
     }
     h += '</table>'
     jQuery('#table').html(h);
 }
+var master_root;
+
 function get() {
-    jQuery.ajax({
-        url: 'list',
-        dataType: 'json',
-        success: success
-    });
+    jQuery.getJSON((master_root || '') + 'list', success);
     setTimeout(get, 60000);
 }
-get();
\ No newline at end of file
+get();
diff --git a/util/master/master.cgi b/util/master/master.cgi
index b918876bd..0e456ed0c 100755
--- a/util/master/master.cgi
+++ b/util/master/master.cgi
@@ -18,6 +18,7 @@ nginx:
 
         location / {
             index  index.html;
+            add_header Access-Control-Allow-Origin *;
         }
         location /announce {
             fastcgi_pass   unix:/var/run/fcgiwrap/fcgiwrap.sock;
@@ -35,6 +36,10 @@ apache .htaccess:
   Allow from all
  </FilesMatch>
  Deny from all
+ <ifModule mod_headers.c>
+     Header set Access-Control-Allow-Origin: *
+ </ifModule>
+
 
 
 =cut
-- 
cgit v1.2.3


From 177ca4f4d55368718eb295f1010ad5c81660af57 Mon Sep 17 00:00:00 2001
From: proller <proller@github.com>
Date: Sat, 30 Mar 2013 02:36:06 +0400
Subject: Fix backward compatibility for server uptime in master server web
 page

---
 util/master/list.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'util/master')

diff --git a/util/master/list.js b/util/master/list.js
index 18cbc4b68..990bb6ded 100644
--- a/util/master/list.js
+++ b/util/master/list.js
@@ -54,9 +54,8 @@ function success(r) {
         h += '</td>';
         h += '<td class="mts_description">' + e(s.description) + '</td>';
         h += '<td class="mts_flags">' + e(s.password ? 'Pwd ' : '') + (s.creative ? 'Cre ' : '') + (s.damage ? 'Dmg ' : '') + (s.pvp ? 'Pvp ' : '') + (s.dedicated ? 'Ded ' : '') + '</td>';
-        if (!s.time || s.time < 0) s.time = 0;
         if (!s.start || s.start < 0) s.start = 0;
-        h += '<td class="mts_time">' + (s.uptime ? human_time(s.uptime, 1) : '') + '</td>';
+        h += '<td class="mts_time">' + (s.uptime ? human_time(s.uptime, 1) : s.start ? human_time(s.start) : '') + '</td>';
         h += '<td class="mts_ping">' + (s.ping ? parseFloat(s.ping).toFixed(3) * 1000 : '') + '</td>';
         h += '</tr>';
     }
-- 
cgit v1.2.3