Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Master server: 

* more white labeling
* installation instructions added
* updated database scheme
* javascript refresh on HTML server list (thanks Omega!)
* desktop notifications on HTML server list (thanks Omega!)
This commit is contained in:
Tom Reynolds 2013-10-13 01:44:27 +00:00
parent c12f5ded3f
commit 95caf75847
12 changed files with 895 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/masterserver/README Normal file
View File

@ -0,0 +1,21 @@
To install:
1. Setup a MYSQL database server
2. CREATE DATABASE 'megaglest-master' ENGINE=InnoDB;
CREATE USER 'megaglest-master'@'localhost' IDENTIFIED BY 'secret password';
GRANT ALL ON 'megaglest-master.*' TO 'megaglest-master';
3. Connect the new user to the new database;
Execute the SQL statments in install/scheme_mysql.sql
4. Copy all files (you can omit INSTALL and install/) to your webserver and
edit config.php to reflect the MySQL connection parameters and game title;
also replace the images in images/ by some which match your game title.
To test and use this server with your MegaGlest engine based game, configure
the "MasterserverURL" property in glest.ini.
To add mods to the game mod menu, edit the database contents using your
favorite MySQL editor or develop a web based frontend to do so. In the latter
case, please let us know about it and try to use a compatible license.

4
source/masterserver/cleanUpServerList.php
View File

@ -1,8 +1,4 @@
<?php
// Copyright (C) 2012 Mark Vejvoda, Titus Tscharntke and Tom Reynolds
// The Megaglest Team, under GNU GPL v3.0
// ==============================================================
// This script can be invoked directly by a cron job on a regular basis:
// /path/to/php -f /path/to/script.php

4
source/masterserver/config.php
View File

@ -9,8 +9,8 @@
define( 'PRODUCT_URL', 'http://megaglest.org' );
define( 'MYSQL_HOST', '127.0.0.1' );
define( 'MYSQL_DATABASE', 'glest' );
define( 'MYSQL_USER', 'root' );
define( 'MYSQL_DATABASE', 'megaglest_master' );
define( 'MYSQL_USER', 'not_root' );
define( 'MYSQL_PASSWORD', 'your_pwd' );
// Allow using persistent MYSQL database server connections

4
source/masterserver/functions.php
View File

@ -1,8 +1,4 @@
<?php
// Copyright (C) 2012 Mark Vejvoda, Titus Tscharntke and Tom Reynolds
// The Megaglest Team, under GNU GPL v3.0
// ==============================================================
if ( !defined('INCLUSION_PERMITTED') || ( defined('INCLUSION_PERMITTED') && INCLUSION_PERMITTED !== true ) ) { die( 'This file must not be invoked directly.' ); }
# This function cleans out special characters

BIN
source/masterserver/images/game_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

0
source/masterserver/megaglest.ico → source/masterserver/images/megaglest.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

111
source/masterserver/createDB.sql → source/masterserver/install/scheme_mysql.sql
View File

@ -1,38 +1,9 @@
--
-- Table structure and sample data for the MegaGlest master server
--
-- SQL should be compatible to MySQL 5.0
--
-- Copyright (C) 2012 Mark Vejvoda, Titus Tscharntke and Tom Reynolds
-- The Megaglest Team, under GNU GPL v3.0
-- ==============================================================
--
-- Table structure for table `glestmaps`
--
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
CREATE TABLE IF NOT EXISTS `glestserver` (
`lasttime` timestamp NOT NULL default CURRENT_TIMESTAMP,
`glestVersion` varchar(30) collate utf8_unicode_ci NOT NULL,
`platform` varchar(30) collate utf8_unicode_ci NOT NULL,
`binaryCompileDate` varchar(30) collate utf8_unicode_ci NOT NULL,
`serverTitle` varchar(100) collate utf8_unicode_ci NOT NULL,
`ip` varchar(15) collate utf8_unicode_ci NOT NULL,
`tech` varchar(100) collate utf8_unicode_ci NOT NULL,
`map` varchar(100) collate utf8_unicode_ci NOT NULL,
`tileset` varchar(100) collate utf8_unicode_ci NOT NULL,
`activeSlots` int(11) NOT NULL,
`networkSlots` int(11) NOT NULL,
`connectedClients` int(11) NOT NULL,
`externalServerPort` int(11) NOT NULL,
`country` varchar(2) collate utf8_unicode_ci NOT NULL,
`status` int(11) NOT NULL default 0, -- valid statuses: 0 waiting for players, 1 = game full pending start, 2 game in progress, 3 game over
KEY `lasttime` (`lasttime`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
INSERT INTO `glestserver` (`lasttime`, `glestVersion`, `platform`, `binaryCompileDate`, `serverTitle`, `ip`, `tech`, `map`, `tileset`, `activeSlots`, `networkSlots`, `connectedClients` ,`externalServerPort`, `country`) VALUES
('2010-05-12 01:41:43', '', '', '', '', '', '', '', '', 0, 0, 0, 0, 'DE');
CREATE TABLE IF NOT EXISTS `glestmaps` (
DROP TABLE IF EXISTS `glestmaps`;
CREATE TABLE `glestmaps` (
`updatetime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`glestversion` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
`mapname` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
@ -44,22 +15,56 @@ CREATE TABLE IF NOT EXISTS `glestmaps` (
`disabled` int(11) NOT NULL DEFAULT '0',
`crcnew` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
PRIMARY KEY (`mapname`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
CREATE TABLE IF NOT EXISTS `glesttilesets` (
--
-- Table structure for table `glestscenarios`
--
DROP TABLE IF EXISTS `glestscenarios`;
CREATE TABLE `glestscenarios` (
`updatetime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`glestversion` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
`tilesetname` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
`scenarioname` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
`crc` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
`description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
`url` varchar(1024) COLLATE utf8_unicode_ci NOT NULL,
`imageUrl` varchar(1024) COLLATE utf8_unicode_ci DEFAULT NULL,
`disabled` int(11) NOT NULL DEFAULT '0',
`crcnew` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
PRIMARY KEY (`tilesetname`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
PRIMARY KEY (`scenarioname`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
CREATE TABLE IF NOT EXISTS `glesttechs` (
--
-- Table structure for table `glestserver`
--
DROP TABLE IF EXISTS `glestserver`;
CREATE TABLE `glestserver` (
`lasttime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`glestVersion` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
`platform` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
`binaryCompileDate` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
`serverTitle` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
`ip` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
`tech` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
`map` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
`tileset` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
`activeSlots` int(11) NOT NULL,
`networkSlots` int(11) NOT NULL,
`connectedClients` int(11) NOT NULL,
`externalServerPort` int(11) NOT NULL,
`country` varchar(2) COLLATE utf8_unicode_ci NOT NULL,
`status` int(11) NOT NULL DEFAULT '0',
KEY `lasttime` (`lasttime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
--
-- Table structure for table `glesttechs`
--
DROP TABLE IF EXISTS `glesttechs`;
CREATE TABLE `glesttechs` (
`updatetime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`glestversion` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
`techname` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
@ -71,19 +76,35 @@ CREATE TABLE IF NOT EXISTS `glesttechs` (
`disabled` int(11) NOT NULL DEFAULT '0',
`crcnew` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
PRIMARY KEY (`techname`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
--
-- Table structure for table `glesttilesets`
--
CREATE TABLE IF NOT EXISTS `glestscenarios` (
DROP TABLE IF EXISTS `glesttilesets`;
CREATE TABLE `glesttilesets` (
`updatetime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`glestversion` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
`scenarioname` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
`tilesetname` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
`crc` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
`description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
`url` varchar(1024) COLLATE utf8_unicode_ci NOT NULL,
`imageUrl` varchar(1024) COLLATE utf8_unicode_ci DEFAULT NULL,
`disabled` int(11) NOT NULL DEFAULT '0',
`crcnew` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
PRIMARY KEY (`scenarioname`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
PRIMARY KEY (`tilesetname`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
--
-- Table structure for table `recent_servers`
--
DROP TABLE IF EXISTS `recent_servers`;
CREATE TABLE `recent_servers` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`server` varchar(25) COLLATE utf8_unicode_ci NOT NULL,
`name` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
`players` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=550 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

316
source/masterserver/scripts/desktop_notifications.js Normal file
View File

@ -0,0 +1,316 @@
// Copyright (C) 2013 Mike Hoffert ("Omega")
// Licensed under GNU GPL v3.0
// ==============================================================
var DEFAULT_REFRESH_TIME = 20000;
// Get query arguments
var get_data = {};
var args = location.search.substr(1).split(/&/);
var version = '';
// Break up URL to find the get queries
for (var i = 0; i < args.length; i++)
{
var tmp = args[i].split(/=/);
if(tmp[0] != "")
{
get_data[decodeURIComponent(tmp[0])] = decodeURIComponent(tmp.slice(1).join("").replace("+", " "));
}
}
// Check if there's a version query
if(get_data['version'])
{
version = get_data['version'];
}
var serverList = {};
var firstLoop = true;
// Modify the document body
var domUl = document.getElementsByTagName("ul");
var domBody = document.getElementsByTagName("body");
var wrapperDiv = document.createElement("div");
wrapperDiv.innerHTML = "The parameters used by the masterserver API will display when you move your mouse pointer over any of the table headings.<br /><br />"
+ "<input id=\"enableNotifications\" type=\"checkbox\" /> <label for=\"enableNotifications\">Check here to enable auto-refreshing of the table and desktop notifications</label><br />"
+ "<label for=\"refreshTimeId\">Refresh time (in seconds):</label> <input id=\"refreshTimeId\" type=\"number\" width=\"3\" min=\"10\" max=\"999\" /> <label for=\"refreshTimeId\">(minimum 10)</label>";
wrapperDiv.style.paddingLeft = "30px";
domBody[0].insertBefore(wrapperDiv, domUl[0]);
domUl[0].parentNode.removeChild(domUl[0]);
// Request permission for issuing desktop notifications when the checkbox is ticked
var notifications = document.getElementById("enableNotifications");
notifications.onclick = function()
{
if(notifications.checked)
{
Notification.requestPermission();
}
}
// Helper function for escpaing special characters
function escapeHtml(text) {
return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
}
// Check the JSON data for changes at intervals and update table
function timedRequest()
{
// Break out if the checkbox isn't ticked
if(!notifications.checked)
{
return;
}
// Get JSON of server list
var request = new XMLHttpRequest();
request.open('GET', 'showServersJson.php', true);
request.send();
// Function calls as soon as we receive the right data from the site
request.onreadystatechange = function()
{
if (request.readyState == 4 && request.status == 200)
{
// Parse the JSON data for safety
var jsonText = JSON.parse(request.responseText);
var newServerList = {};
// Repopulate table content
var table = "<tr>\n"
+ " <th title=\"glestVersion\">Version</th>\n"
+ " <th title=\"status\">Status</th>\n"
+ " <th title=\"country\">Country</th>\n"
+ " <th title=\"serverTitle\">Title</th>\n"
+ " <th title=\"tech\">Techtree</th>\n"
+ " <th title=\"connectedClients\">Network players</th>\n"
+ " <th title=\"networkSlots\">Network slots</th>\n"
+ " <th title=\"activeSlots\">Total slots</th>\n"
+ " <th title=\"map\">Map</th>\n"
+ " <th title=\"tileset\">Tileset</th>\n"
+ " <th title=\"ip\">IPv4 address</th>\n"
+ " <th title=\"externalServerPort\">Game protocol port</th>\n"
+ " <th title=\"platform\">Platform</th>\n"
+ " <th title=\"binaryCompileDate\">Build date</th>\n"
+ "</tr>\n";
// Loop through all json objects
for(var i = 0; i < jsonText.length; i++)
{
// Check if version filter is active
if(version == '' || jsonText[i].glestVersion == version)
{
////// DYNAMIC TABLE SECTION
table += "<tr>";
/// Version
table += "<td><a href=\"?version=" + escapeHtml(jsonText[i].glestVersion) + "\" rel=\"nofollow\">" + escapeHtml(jsonText[i].glestVersion) + "</a></td>";
/// Status
var statusCode = jsonText[i].status;
// Change text if the server is full
if((statusCode == 0) && (jsonText[i].networkSlots <= jsonText[i].connectedClients))
{
statusCode = 1;
}
var statusTitle, statusClass;
// Note that the json value is stored as a string, not a number
switch(statusCode)
{
case "0":
statusTitle = 'waiting for players';
statusClass = 'waiting_for_players';
break;
case "1":
statusTitle = 'game full, pending start';
statusClass = 'game_full_pending_start';
break;
case "2":
statusTitle = 'in progress';
statusClass = 'in_progress';
break;
case "3":
statusTitle = 'finished';
statusClass = 'finished';
break;
default:
statusTitle = 'unknown';
statusClass = 'unknown';
}
table += "<td title=\"" + jsonText[i].status + "\" class=\"" + statusClass + "\">" + escapeHtml(statusTitle) + "</td>";
/// Country
if(jsonText[i].country !== "")
{
var flagFile = "flags/" + jsonText[i].country.toLowerCase() + ".png";
table += "<td><img src=\"" + flagFile + "\" title=\"" + jsonText[i].country + "\" alt=\"" + jsonText[i].country + "\" /></td>";
}
else
{
table += "<td>Unknown</td>";
}
/// Server title
table += "<td>" + escapeHtml(jsonText[i].serverTitle) + "</td>";
/// Tech
table += "<td>" + escapeHtml(jsonText[i].tech) + "</td>";
/// Connected clients
table += "<td>" + escapeHtml(jsonText[i].connectedClients) + "</td>";
/// Network slots
table += "<td>" + escapeHtml(jsonText[i].networkSlots) + "</td>";
/// Active slots
table += "<td>" + escapeHtml(jsonText[i].activeSlots) + "</td>";
/// Map
table += "<td>" + escapeHtml(jsonText[i].map) + "</td>";
/// Tileset
table += "<td>" + escapeHtml(jsonText[i].tileset) + "</td>";
/// IP
table += "<td>" + escapeHtml(jsonText[i].ip) + "</td>";
/// Port
table += "<td>" + escapeHtml(jsonText[i].externalServerPort) + "</td>";
/// Platform
table += "<td>" + escapeHtml(jsonText[i].platform) + "</td>";
/// Binary compilation date
table += "<td>" + escapeHtml(jsonText[i].binaryCompileDate) + "</td>";
table += "</tr>";
////// DESKTOP NOTIFICATIONS SECTION
// Store data in an array keyed by the concatenation of the IP and port
var identifier = jsonText[i].ip + jsonText[i].externalServerPort;
newServerList[identifier] = { 'ip': jsonText[i].ip, 'port': jsonText[i].externalServerPort, 'title': jsonText[i].serverTitle, 'free': (jsonText[i].networkSlots - jsonText[i].connectedClients), 'version': jsonText[i].glestVersion };
// Only check for changes if NOT the first time
if(!firstLoop)
{
// Check if new server doesn't exist in old list
if((newServerList[identifier].free > 0) && !serverList[identifier] && statusCode == 0)
{
// Create notification
var notification = new Notification("Open server", {
iconUrl: 'images/game_icon.png',
body: 'Server "' + newServerList[identifier].title + '" has ' + newServerList[identifier].free + ' free slots available. Click to join now.',
});
notification.onclick = function() { window.location.assign('http://play.mg/?version=' + newServerList[identifier].version + '&mgg_host=' + newServerList[identifier].ip + '&mgg_port=' + newServerList[identifier].port); };
}
}
else
{
firstLoop = false;
}
}
}
// Replace old list with new one
serverList = newServerList;
// Write to actual table when done only, otherwise the browser trips as it tries to fix the partial table formatting
var tableDOM = document.getElementsByTagName("tbody");
tableDOM[0].innerHTML = table;
// Catch empty case
if(jsonText.length == 0)
{
serverList = { };
}
}
// Empty server list
else if(request.readyState == 4 && request.status == 0)
{
serverList = { };
}
}
}
// Default time in miliseconds between updates
var refreshTime = DEFAULT_REFRESH_TIME;
// Check if there's an HTTP refresh query. If so, we need to overwrite it
if(get_data['refresh'])
{
// Get the base URL without any GET parameters (because we have to remove the
// old refresh variable)
var redirectLocation = location.href.split("?")[0] + "?";
// If a version variable was specified, add that back in
if(get_data['version'])
{
redirectLocation += "version=" + get_data['version'] + "&";
}
// Finally the new refresh variable just for JS use
redirectLocation += "jsrefresh=" + get_data['refresh'];
window.location.replace(redirectLocation);
}
// Check if there's a js refresh query
if(get_data['jsrefresh'])
{
// In seconds, so multiply by 1000 for miliseconds
refreshTime = parseInt(get_data['jsrefresh']) * 1000;
}
// Initialize value in text field
var refreshTimeBox = document.getElementById("refreshTimeId");
refreshTimeBox.value = refreshTime / 1000;
// Initiate interval
timedRequest();
var interval = setInterval(timedRequest, refreshTime);
// Catch changes to the refresh time box
refreshTimeBox.onchange = function()
{
// Validate if the input is a number
if(!isNaN(parseFloat(refreshTimeBox.value)) && isFinite(refreshTimeBox.value))
{
if(refreshTimeBox.value < 10)
{
refreshTime = 10000;
refreshTimeBox.value = 10;
}
else if(refreshTimeBox.value > 999)
{
refreshTime = 999000;
refreshTimeBox.value = 999;
}
else
{
refreshTime = refreshTimeBox.value * 1000;
}
}
else
{
refreshTime = DEFAULT_REFRESH_TIME;
refreshTimeBox.value = 20;
}
// Reset the interval
clearInterval(interval);
interval = setInterval(timedRequest, refreshTime);
}

486
source/masterserver/scripts/json2.js Normal file
View File

@ -0,0 +1,486 @@
/*
json2.js
2013-05-26
Public Domain.
NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
See http://www.JSON.org/js.html
This code should be minified before deployment.
See http://javascript.crockford.com/jsmin.html
USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
NOT CONTROL.
This file creates a global JSON object containing two methods: stringify
and parse.
JSON.stringify(value, replacer, space)
value any JavaScript value, usually an object or array.
replacer an optional parameter that determines how object
values are stringified for objects. It can be a
function or an array of strings.
space an optional parameter that specifies the indentation
of nested structures. If it is omitted, the text will
be packed without extra whitespace. If it is a number,
it will specify the number of spaces to indent at each
level. If it is a string (such as '\t' or '&nbsp;'),
it contains the characters used to indent at each level.
This method produces a JSON text from a JavaScript value.
When an object value is found, if the object contains a toJSON
method, its toJSON method will be called and the result will be
stringified. A toJSON method does not serialize: it returns the
value represented by the name/value pair that should be serialized,
or undefined if nothing should be serialized. The toJSON method
will be passed the key associated with the value, and this will be
bound to the value
For example, this would serialize Dates as ISO strings.
Date.prototype.toJSON = function (key) {
function f(n) {
// Format integers to have at least two digits.
return n < 10 ? '0' + n : n;
}
return this.getUTCFullYear() + '-' +
f(this.getUTCMonth() + 1) + '-' +
f(this.getUTCDate()) + 'T' +
f(this.getUTCHours()) + ':' +
f(this.getUTCMinutes()) + ':' +
f(this.getUTCSeconds()) + 'Z';
};
You can provide an optional replacer method. It will be passed the
key and value of each member, with this bound to the containing
object. The value that is returned from your method will be
serialized. If your method returns undefined, then the member will
be excluded from the serialization.
If the replacer parameter is an array of strings, then it will be
used to select the members to be serialized. It filters the results
such that only members with keys listed in the replacer array are
stringified.
Values that do not have JSON representations, such as undefined or
functions, will not be serialized. Such values in objects will be
dropped; in arrays they will be replaced with null. You can use
a replacer function to replace those with JSON values.
JSON.stringify(undefined) returns undefined.
The optional space parameter produces a stringification of the
value that is filled with line breaks and indentation to make it
easier to read.
If the space parameter is a non-empty string, then that string will
be used for indentation. If the space parameter is a number, then
the indentation will be that many spaces.
Example:
text = JSON.stringify(['e', {pluribus: 'unum'}]);
// text is '["e",{"pluribus":"unum"}]'
text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
// text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
text = JSON.stringify([new Date()], function (key, value) {
return this[key] instanceof Date ?
'Date(' + this[key] + ')' : value;
});
// text is '["Date(---current time---)"]'
JSON.parse(text, reviver)
This method parses a JSON text to produce an object or array.
It can throw a SyntaxError exception.
The optional reviver parameter is a function that can filter and
transform the results. It receives each of the keys and values,
and its return value is used instead of the original value.
If it returns what it received, then the structure is not modified.
If it returns undefined then the member is deleted.
Example:
// Parse the text. Values that look like ISO date strings will
// be converted to Date objects.
myData = JSON.parse(text, function (key, value) {
var a;
if (typeof value === 'string') {
a =
/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
if (a) {
return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+a[5], +a[6]));
}
}
return value;
});
myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
var d;
if (typeof value === 'string' &&
value.slice(0, 5) === 'Date(' &&
value.slice(-1) === ')') {
d = new Date(value.slice(5, -1));
if (d) {
return d;
}
}
return value;
});
This is a reference implementation. You are free to copy, modify, or
redistribute.
*/
/*jslint evil: true, regexp: true */
/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
lastIndex, length, parse, prototype, push, replace, slice, stringify,
test, toJSON, toString, valueOf
*/
// Create a JSON object only if one does not already exist. We create the
// methods in a closure to avoid creating global variables.
if (typeof JSON !== 'object') {
JSON = {};
}
(function () {
'use strict';
function f(n) {
// Format integers to have at least two digits.
return n < 10 ? '0' + n : n;
}
if (typeof Date.prototype.toJSON !== 'function') {
Date.prototype.toJSON = function () {
return isFinite(this.valueOf())
? this.getUTCFullYear() + '-' +
f(this.getUTCMonth() + 1) + '-' +
f(this.getUTCDate()) + 'T' +
f(this.getUTCHours()) + ':' +
f(this.getUTCMinutes()) + ':' +
f(this.getUTCSeconds()) + 'Z'
: null;
};
String.prototype.toJSON =
Number.prototype.toJSON =
Boolean.prototype.toJSON = function () {
return this.valueOf();
};
}
var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
gap,
indent,
meta = { // table of character substitutions
'\b': '\\b',
'\t': '\\t',
'\n': '\\n',
'\f': '\\f',
'\r': '\\r',
'"' : '\\"',
'\\': '\\\\'
},
rep;
function quote(string) {
// If the string contains no control characters, no quote characters, and no
// backslash characters, then we can safely slap some quotes around it.
// Otherwise we must also replace the offending characters with safe escape
// sequences.
escapable.lastIndex = 0;
return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
var c = meta[a];
return typeof c === 'string'
? c
: '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
}) + '"' : '"' + string + '"';
}
function str(key, holder) {
// Produce a string from holder[key].
var i, // The loop counter.
k, // The member key.
v, // The member value.
length,
mind = gap,
partial,
value = holder[key];
// If the value has a toJSON method, call it to obtain a replacement value.
if (value && typeof value === 'object' &&
typeof value.toJSON === 'function') {
value = value.toJSON(key);
}
// If we were called with a replacer function, then call the replacer to
// obtain a replacement value.
if (typeof rep === 'function') {
value = rep.call(holder, key, value);
}
// What happens next depends on the value's type.
switch (typeof value) {
case 'string':
return quote(value);
case 'number':
// JSON numbers must be finite. Encode non-finite numbers as null.
return isFinite(value) ? String(value) : 'null';
case 'boolean':
case 'null':
// If the value is a boolean or null, convert it to a string. Note:
// typeof null does not produce 'null'. The case is included here in
// the remote chance that this gets fixed someday.
return String(value);
// If the type is 'object', we might be dealing with an object or an array or
// null.
case 'object':
// Due to a specification blunder in ECMAScript, typeof null is 'object',
// so watch out for that case.
if (!value) {
return 'null';
}
// Make an array to hold the partial results of stringifying this object value.
gap += indent;
partial = [];
// Is the value an array?
if (Object.prototype.toString.apply(value) === '[object Array]') {
// The value is an array. Stringify every element. Use null as a placeholder
// for non-JSON values.
length = value.length;
for (i = 0; i < length; i += 1) {
partial[i] = str(i, value) || 'null';
}
// Join all of the elements together, separated with commas, and wrap them in
// brackets.
v = partial.length === 0
? '[]'
: gap
? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
: '[' + partial.join(',') + ']';
gap = mind;
return v;
}
// If the replacer is an array, use it to select the members to be stringified.
if (rep && typeof rep === 'object') {
length = rep.length;
for (i = 0; i < length; i += 1) {
if (typeof rep[i] === 'string') {
k = rep[i];
v = str(k, value);
if (v) {
partial.push(quote(k) + (gap ? ': ' : ':') + v);
}
}
}
} else {
// Otherwise, iterate through all of the keys in the object.
for (k in value) {
if (Object.prototype.hasOwnProperty.call(value, k)) {
v = str(k, value);
if (v) {
partial.push(quote(k) + (gap ? ': ' : ':') + v);
}
}
}
}
// Join all of the member texts together, separated with commas,
// and wrap them in braces.
v = partial.length === 0
? '{}'
: gap
? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
: '{' + partial.join(',') + '}';
gap = mind;
return v;
}
}
// If the JSON object does not yet have a stringify method, give it one.
if (typeof JSON.stringify !== 'function') {
JSON.stringify = function (value, replacer, space) {
// The stringify method takes a value and an optional replacer, and an optional
// space parameter, and returns a JSON text. The replacer can be a function
// that can replace values, or an array of strings that will select the keys.
// A default replacer method can be provided. Use of the space parameter can
// produce text that is more easily readable.
var i;
gap = '';
indent = '';
// If the space parameter is a number, make an indent string containing that
// many spaces.
if (typeof space === 'number') {
for (i = 0; i < space; i += 1) {
indent += ' ';
}
// If the space parameter is a string, it will be used as the indent string.
} else if (typeof space === 'string') {
indent = space;
}
// If there is a replacer, it must be a function or an array.
// Otherwise, throw an error.
rep = replacer;
if (replacer && typeof replacer !== 'function' &&
(typeof replacer !== 'object' ||
typeof replacer.length !== 'number')) {
throw new Error('JSON.stringify');
}
// Make a fake root object containing our value under the key of ''.
// Return the result of stringifying the value.
return str('', {'': value});
};
}
// If the JSON object does not yet have a parse method, give it one.
if (typeof JSON.parse !== 'function') {
JSON.parse = function (text, reviver) {
// The parse method takes a text and an optional reviver function, and returns
// a JavaScript value if the text is a valid JSON text.
var j;
function walk(holder, key) {
// The walk method is used to recursively walk the resulting structure so
// that modifications can be made.
var k, v, value = holder[key];
if (value && typeof value === 'object') {
for (k in value) {
if (Object.prototype.hasOwnProperty.call(value, k)) {
v = walk(value, k);
if (v !== undefined) {
value[k] = v;
} else {
delete value[k];
}
}
}
}
return reviver.call(holder, key, value);
}
// Parsing happens in four stages. In the first stage, we replace certain
// Unicode characters with escape sequences. JavaScript handles many characters
// incorrectly, either silently deleting them, or treating them as line endings.
text = String(text);
cx.lastIndex = 0;
if (cx.test(text)) {
text = text.replace(cx, function (a) {
return '\\u' +
('0000' + a.charCodeAt(0).toString(16)).slice(-4);
});
}
// In the second stage, we run the text against regular expressions that look
// for non-JSON patterns. We are especially concerned with '()' and 'new'
// because they can cause invocation, and '=' because it can cause mutation.
// But just to be safe, we want to reject all unexpected forms.
// We split the second stage into 4 regexp operations in order to work around
// crippling inefficiencies in IE's and Safari's regexp engines. First we
// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
// replace all simple value tokens with ']' characters. Third, we delete all
// open brackets that follow a colon or comma or that begin the text. Finally,
// we look to see that the remaining characters are only whitespace or ']' or
// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
if (/^[\],:{}\s]*$/
.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
.replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
// In the third stage we use the eval function to compile the text into a
// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
// in JavaScript: it can begin a block or an object literal. We wrap the text
// in parens to eliminate the ambiguity.
j = eval('(' + text + ')');
// In the optional fourth stage, we recursively walk the new structure, passing
// each name/value pair to a reviver function for possible transformation.
return typeof reviver === 'function'
? walk({'': j}, '')
: j;
}
// If the text is not JSON parseable, then a SyntaxError is thrown.
throw new SyntaxError('JSON.parse');
};
}
}());

4
source/masterserver/showRecentServers.php
View File

@ -1,8 +1,4 @@
<?php
// Copyright (C) 2012 Mark Vejvoda, Titus Tscharntke and Tom Reynolds
// The Megaglest Team, under GNU GPL v3.0
// ==============================================================
define( 'INCLUSION_PERMITTED', true );
require_once( 'config.php' );
require_once( 'functions.php' );

4
source/masterserver/showServers.php
View File

@ -58,7 +58,7 @@
echo ' <meta charset="UTF-8" />' . PHP_EOL;
echo ' <title>' . htmlspecialchars( PRODUCT_NAME ) . ' gameservers</title>' . PHP_EOL;
echo ' <link rel="stylesheet" type="text/css" href="style/screen.css" />' . PHP_EOL;
echo ' <link rel="shortcut icon" type="image/x-icon" href="' . htmlspecialchars( strtolower( PRODUCT_NAME ) ) . '.ico" />' . PHP_EOL;
echo ' <link rel="shortcut icon" type="image/x-icon" href="images/' . htmlspecialchars( strtolower( PRODUCT_NAME ) ) . '.ico" />' . PHP_EOL;
echo ' </head>' . PHP_EOL;
echo ' <body>' . PHP_EOL;
echo ' <h1><a href="' . htmlspecialchars( PRODUCT_URL ) . '">' . htmlspecialchars( PRODUCT_NAME ) . '</a> gameservers</h1>' . PHP_EOL;
@ -193,6 +193,8 @@
echo ' <li>You can have this page auto <a href="?refresh=60" rel="nofollow">refresh every 60 seconds</a> by appending <code>?refresh=60</code> to the URL. Minimum refresh time is 10 seconds.</li>' . PHP_EOL;
echo ' <li>The parameters used by the masterserver API will display when you move your mouse pointer over any of the table headings.</li>' . PHP_EOL;
echo ' </ul>' . PHP_EOL;
echo ' <script src="scripts/json2.js"></script>' . PHP_EOL;
echo ' <script src="scripts/desktop_notifications.js"></script>' . PHP_EOL;
echo ' </body>' . PHP_EOL;
echo '</html>' . PHP_EOL;

2
source/masterserver/showServersJson.php
View File

@ -12,7 +12,7 @@
// consider replacing this by a cron job
cleanupServerList();
$servers_in_db = mysql_query( 'SELECT * FROM glestserver ORDER BY status, connectedClients>0 DESC, (networkSlots - connectedClients) , ip DESC;' );
$servers_in_db = mysql_query( 'SELECT * FROM glestserver ORDER BY status, connectedClients>0 DESC, (networkSlots - connectedClients), ip DESC;' );
$all_servers = array();
while ( $server = mysql_fetch_array( $servers_in_db ) )
{