Masterserver: report gameid, uptime, cosmetic fixes on server web page

diff --git a/src/server.cpp b/src/server.cpp
index 6bdebcec4d9d956ed3e9a23e6aa61d1454b66417..c4dd0ab0fabd1652ba6a23930305167d967f1eb4 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1243,7 +1243,7 @@ void Server::AsyncRunStep()
                float &counter = m_masterserver_timer;
                if((!counter || counter >= 300.0) && g_settings->getBool("server_announce") == true)
                {
-                       ServerList::sendAnnounce(!counter ? "start" : "update", m_clients_number);
+                       ServerList::sendAnnounce(!counter ? "start" : "update", m_clients_number, m_uptime.get(), m_gamespec.id);
                        counter = 0.01;
                }
                counter += dtime;

diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index 3dfc79f50cb4067a093308d4b7941ca8d0b1f70a..93f9d2435dea91020c4ccb3bbd12305aa720db77 100644 (file)
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -232,7 +232,7 @@ static size_t ServerAnnounceCallback(void *contents, size_t size, size_t nmemb,
     //((std::string*)userp)->append((char*)contents, size * nmemb);
     //return size * nmemb;
 }
-void sendAnnounce(std::string action, u16 clients) {
+void sendAnnounce(std::string action, u16 clients, double uptime, std::string gameid) {
        Json::Value server;
        if (action.size())
                server["action"]        = action;
@@ -250,6 +250,9 @@ void sendAnnounce(std::string action, u16 clients) {
                server["pvp"]           = g_settings->getBool("enable_pvp");
                server["clients"]       = clients;
                server["clients_max"]   = g_settings->get("max_users");
+               if (uptime >=1) server["uptime"] = (int)uptime;
+               if (gameid!="") server["gameid"] = gameid;
+               
        }
        if(server["action"] == "start")
                actionstream << "announcing to " << g_settings->get("serverlist_url") << std::endl;

diff --git a/src/serverlist.h b/src/serverlist.h
index e81e64c5b3acb8d9eb17b4fadc1c280961a9cce2..d01415c504c845496fdbb58214cd1ff559c5477d 100644 (file)
--- a/src/serverlist.h
+++ b/src/serverlist.h
@@ -39,7 +39,7 @@ namespace ServerList
        std::vector<ServerListSpec> deSerializeJson(std::string liststring);
        std::string serializeJson(std::vector<ServerListSpec>);
        #if USE_CURL
-       void sendAnnounce(std::string action = "", u16 clients = 0);
+       void sendAnnounce(std::string action = "", u16 clients = 0, double uptime = 0, std::string gameid = "");
        #endif
 } //ServerList namespace
 

diff --git a/util/master/list.js b/util/master/list.js
index dcc30e091501e1d5271e90d76beeee45a156edb8..18cbc4b688f428290e9739bf4a717ae271d493dd 100644 (file)
--- 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 b918876bd29a08889c367d84669c10ccd7865a5e..0e456ed0cace4ee77216b27ffceb0cdf8376294a 100755 (executable)
--- 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