';
if (avatar) buf += '
 + ')
';
- buf += '
' + BattleLog.escapeHTML(name) + '';
+ buf += '
' + BattleLog.escapeHTML(name) + '';
var offline = data.rooms === false;
if (data.status || offline) {
var status = offline ? '(Offline)' : data.status.startsWith('!') ? data.status.slice(1) : data.status;
@@ -2723,7 +2723,7 @@ function toId() {
initialize: function (data) {
var buf = '';
buf = '
Your replay has been uploaded! It\'s available at:
';
- buf += '
https://replay.pokemonshowdown.com/' + data.id + '
';
+ buf += '
https://' + Config.routes.replays + '/' + data.id + '
';
buf += '
';
this.$el.html(buf).css('max-width', 620);
},
diff --git a/js/replay-embed.js b/js/replay-embed.template.js
similarity index 100%
rename from js/replay-embed.js
rename to js/replay-embed.template.js
index c72a79ba84..acd7875c92 100644
--- a/js/replay-embed.js
+++ b/js/replay-embed.template.js
@@ -17,11 +17,11 @@ linkStyle('https://play.pokemonshowdown.com/style/battle.css?a7');
linkStyle('https://play.pokemonshowdown.com/style/replay.css?a7');
linkStyle('https://play.pokemonshowdown.com/style/utilichart.css?a7');
+requireScript('https://play.pokemonshowdown.com/js/config.js?a7');
requireScript('https://play.pokemonshowdown.com/js/lib/jquery-1.11.0.min.js');
requireScript('https://play.pokemonshowdown.com/js/lib/lodash.compat.js');
requireScript('https://play.pokemonshowdown.com/js/lib/html-sanitizer-minified.js');
requireScript('https://play.pokemonshowdown.com/js/lib/soundmanager2-nodebug-jsmin.js');
-requireScript('https://play.pokemonshowdown.com/js/config.js?a7');
requireScript('https://play.pokemonshowdown.com/js/battledata.js?a7');
requireScript('https://play.pokemonshowdown.com/data/pokedex-mini.js?a7');
requireScript('https://play.pokemonshowdown.com/data/pokedex-mini-bw.js?a7');
diff --git a/js/storage.js b/js/storage.js
index 81c23bc904..b68d724346 100644
--- a/js/storage.js
+++ b/js/storage.js
@@ -1,15 +1,3 @@
-Config.origindomain = 'play.pokemonshowdown.com';
-// `defaultserver` specifies the server to use when the domain name in the
-// address bar is `Config.origindomain`.
-Config.defaultserver = {
- id: 'showdown',
- host: 'sim3.psim.us',
- port: 443,
- httpport: 8000,
- altport: 80,
- registered: true
-};
-
function Storage() {}
Storage.initialize = function () {
@@ -64,7 +52,7 @@ Storage.bg = {
if (!bgid) {
if (location.host === 'smogtours.psim.us') {
bgid = 'shaymin';
- } else if (location.host === 'play.pokemonshowdown.com') {
+ } else if (location.host === Config.routes.client) {
bgid = ['horizon', 'ocean', 'waterfall', 'shaymin', 'charizards', 'psday'][Math.floor(Math.random() * 6)];
} else {
$(document.body).css({
@@ -226,7 +214,7 @@ if (!Storage.bg.id) {
// localStorage is banned, and since prefs are cached in other
// places in certain cases.
-Storage.origin = 'https://play.pokemonshowdown.com';
+Storage.origin = 'https://' + Config.routes.client;
Storage.prefs = function (prop, value, save) {
if (value === undefined) {
@@ -357,9 +345,9 @@ Storage.initPrefs = function () {
$(window).on('message', Storage.onMessage);
- if (document.location.hostname !== Config.origindomain) {
+ if (document.location.hostname !== Config.routes.client) {
$(
- '
'
+ '
'
).appendTo('body');
setTimeout(function () {
// HTTPS may be blocked
@@ -397,7 +385,7 @@ Storage.onMessage = function ($e) {
Config.server = JSON.parse(data.substr(1));
if (Config.server.registered && Config.server.id !== 'showdown' && Config.server.id !== 'smogtours') {
var $link = $('
');
$('head').append($link);
}
@@ -432,7 +420,7 @@ Storage.onMessage = function ($e) {
// in Safari, cross-origin local storage is apparently treated as session
// storage, so mirror the storage in the current origin just in case
- if (document.location.hostname === Config.origindomain) {
+ if (document.location.hostname === Config.routes.client) {
try {
localStorage.setItem('showdown_teams_local', packedTeams);
} catch (e) {}
diff --git a/lib/dispatcher.lib.php b/lib/dispatcher.lib.php
index 03deec2fe3..8e9ce48dcc 100644
--- a/lib/dispatcher.lib.php
+++ b/lib/dispatcher.lib.php
@@ -243,7 +243,7 @@ public function changeusername($dispatcher, &$reqData, &$out) {
}
public function logout($dispatcher, &$reqData, &$out) {
- global $users, $curuser;
+ global $users, $curuser, $psconfig;
if (!$_POST ||
!isset($reqData['userid']) ||
@@ -252,7 +252,7 @@ public function logout($dispatcher, &$reqData, &$out) {
die;
}
$users->logout(); // this kills the `sid` cookie
- setcookie('showdown_username', '', time()-60*60*24*2, '/', 'play.pokemonshowdown.com');
+ setcookie('showdown_username', '', time()-60*60*24*2, '/', $psconfig['routes']['client']);
$out['actionsuccess'] = true;
}
@@ -492,7 +492,7 @@ public function addfriend($dispatcher, &$reqData, &$out) {
// The ] denotes that it was successful
die(']A friend request has been sent to ' . $player['username'] . '!');
}
-
+
/**
* This function simply removes the friend given in the query string.
*/
diff --git a/lib/ntbb-ladder.lib.php b/lib/ntbb-ladder.lib.php
index 76415934c0..34421f165a 100644
--- a/lib/ntbb-ladder.lib.php
+++ b/lib/ntbb-ladder.lib.php
@@ -158,7 +158,7 @@ function getRating(&$user, $create=false) {
}
$rp = $this->getrp();
$ladderdb->query(
- "INSERT INTO `{$ladderdb->prefix}ladder` (`formatid`,`userid`,`username`,`rptime`) VALUES (?,?,?,?)",
+ "INSERT INTO `{$ladderdb->prefix}ladder` (`formatid`,`userid`,`username`,`rptime`,`rpdata`,`col1`) VALUES (?,?,?,?,'',0)",
[$this->formatid, $user['userid'], $user['username'], $rp]
);
$user['rating'] = array(
diff --git a/lib/ntbb-session.lib.php b/lib/ntbb-session.lib.php
index 7c18bd9a30..5b9c9c3026 100644
--- a/lib/ntbb-session.lib.php
+++ b/lib/ntbb-session.lib.php
@@ -1,12 +1,12 @@
logout();
@@ -296,31 +296,33 @@ function login($name, $pass, $timeout = false, $debug = false) {
unset($curuser['nonce']);
unset($curuser['passwordhash']);
- // setcookie('sid', $this->scookie, ['expires' => time() + (363)*24*60*60, 'path' => '/', 'domain' => $this->cookiedomain, 'secure' => true, 'httponly' => true, 'samesite' => 'None']);
+ // setcookie('sid', $this->scookie, ['expires' => time() + (363)*24*60*60, 'path' => '/', 'domain' => $psconfig['routes']['root'], 'secure' => true, 'httponly' => true, 'samesite' => 'None']);
$encodedcookie = rawurlencode($this->scookie);
- header("Set-Cookie: sid=$encodedcookie; Max-Age=31363200; Domain={$this->cookiedomain}; Path=/; Secure; SameSite=None");
+ header("Set-Cookie: sid=$encodedcookie; Max-Age=31363200; Domain={$psconfig['routes']['root']}; Path=/; Secure; SameSite=None");
return $curuser;
}
function updateCookie() {
+ global $psconfig;
if (!$this->sid) {
$this->sid = $this->mksid($this->sid);
$this->scookie = ',,' . $this->sid;
- // setcookie('sid', $this->scookie, ['expires' => time() + (363)*24*60*60, 'path' => '/', 'domain' => $this->cookiedomain, 'secure' => true, 'httponly' => true, 'samesite' => 'None']);
+ // setcookie('sid', $this->scookie, ['expires' => time() + (363)*24*60*60, 'path' => '/', 'domain' => $psconfig['routes']['root'], 'secure' => true, 'httponly' => true, 'samesite' => 'None']);
$encodedcookie = rawurlencode($this->scookie);
- header("Set-Cookie: sid=$encodedcookie; Max-Age=31363200; Domain={$this->cookiedomain}; Path=/; Secure; SameSite=None");
+ header("Set-Cookie: sid=$encodedcookie; Max-Age=31363200; Domain={$psconfig['routes']['root']}; Path=/; Secure; SameSite=None");
}
}
function killCookie() {
+ global $psconfig;
if ($this->sid) {
$this->scookie = ',,' . $this->sid;
- // setcookie('sid', $this->scookie, ['expires' => time() + (363)*24*60*60, 'path' => '/', 'domain' => $this->cookiedomain, 'secure' => true, 'httponly' => true, 'samesite' => 'None']);
+ // setcookie('sid', $this->scookie, ['expires' => time() + (363)*24*60*60, 'path' => '/', 'domain' => $psconfig['routes']['root'], 'secure' => true, 'httponly' => true, 'samesite' => 'None']);
$encodedcookie = rawurlencode($this->scookie);
- header("Set-Cookie: sid=$encodedcookie; Max-Age=31363200; Domain={$this->cookiedomain}; Path=/; Secure; SameSite=None");
+ header("Set-Cookie: sid=$encodedcookie; Max-Age=31363200; Domain={$psconfig['routes']['root']}; Path=/; Secure; SameSite=None");
} else {
- // setcookie('sid', '', ['expires' => time() - 60*60*24*2, 'path' => '/', 'domain' => $this->cookiedomain, 'secure' => true, 'httponly' => true, 'samesite' => 'None']);
- header("Set-Cookie: sid=; Max-Age=0; Domain={$this->cookiedomain}; Path=/; Secure; SameSite=None");
+ // setcookie('sid', '', ['expires' => time() - 60*60*24*2, 'path' => '/', 'domain' => $psconfig['routes']['root'], 'secure' => true, 'httponly' => true, 'samesite' => 'None']);
+ header("Set-Cookie: sid=; Max-Age=0; Domain={$psconfig['routes']['root']}; Path=/; Secure; SameSite=None");
}
}
diff --git a/preactalpha.template.html b/preactalpha.template.html
index f7ed8d64ba..bd86a2724f 100644
--- a/preactalpha.template.html
+++ b/preactalpha.template.html
@@ -51,6 +51,7 @@