diff --git a/index.php.template.txt b/index.php.template.txt index 130f10a07..1bb685056 100644 --- a/index.php.template.txt +++ b/index.php.template.txt @@ -20,6 +20,7 @@ header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past $defaultserver = 'showdown'; include '../pokemonshowdown.com/config/servers.inc.php'; +include '../pokemonshowdown.com/lib/ntbb-session.lib.php'; $server = @$_REQUEST['server']; $serverport = 0; @@ -77,6 +78,13 @@ $serverlibs = array( ); $serverlibrary = $serverlibs[$serverprotocol]; +$upkeep = array(); +unset($curuser['userdata']); +$upkeep['curuser'] = $curuser; +if (empty($_COOKIE['showdown_username'])) $userid = $curuser['userid']; +else $userid = $users->userid($_COOKIE['showdown_username']); +$upkeep['assertion'] = $users->getAssertion($userid, $server); + ?> @@ -100,7 +108,8 @@ $serverlibrary = $serverlibs[$serverprotocol]; serverid: '', serverport: , serverprotocol: '', - urlPrefix: '' + urlPrefix: '', + upkeep: }; alert('We should be open to the public again in a few minutes.'); diff --git a/js/sim.js b/js/sim.js index ce561ecf6..01ee12af7 100644 --- a/js/sim.js +++ b/js/sim.js @@ -3226,12 +3226,5 @@ if (!Config.down) { }; } } - if (Config.testclient) { - onConnect(Config); - } else { - $.post(actionphp, { - act: 'upkeep', - name: name - }, Tools.safeJson(onConnect), 'text'); - } + onConnect(Config.upkeep); } diff --git a/testclient.html b/testclient.html index 1fe827da1..0a98d902b 100644 --- a/testclient.html +++ b/testclient.html @@ -14,8 +14,7 @@