Revert recent changes for now

These changes introduced some unexpected issues.
cyap · Feb 18, 2013 · 4c2526b · 4c2526b
1 parent e2f3b23
commit 4c2526b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 69 deletions.
diff --git a/action.php b/action.php
@@ -217,22 +217,6 @@ function stripNonAscii($str) { return preg_replace('/[^(\x20-\x7F)]+/','', $str)
 			$out = ($user['rating']['r']+$user['rating']['rpr'])/2;
 		}
 		break;
-	case 'serverlist':
-		if ($multiReqs) die(); // necessary for security purposes
-		if (empty($PokemonServers)) die(); // shouldn't happen
-		header('Access-Control-Allow-Origin: *');	// allow cross-domain requests
-		$out['servers'] = array();
-		foreach ($PokemonServers as &$i) {
-			if (!empty($i['hidden'])) continue;
-			$out['servers'][] = array(
-				'serverid' => @$i['id'],
-				'name' => @$i['name'],
-				'server' => @$i['server'],
-				'serverport' => @$i['port'],
-				'serverprotocol' => @$i['protocol']
-			);
-		}
-		break;
 	}
 
 	if ($multiReqs) $outArray[] = $out;

diff --git a/index.php.template.txt b/index.php.template.txt
@@ -206,7 +206,6 @@ if (!$challengeresponse) {
 
 		<script>
 			if (Config.down) overlay('down');
-			else connect();
 		</script>
 
 		<script src="/data/learnsets.js?"></script>

diff --git a/js/sim.js b/js/sim.js
@@ -1,9 +1,19 @@
-// these three variables are populated in connect()
-var socket;
-var locPrefix;
-var actionphp;
+// some setting-like stuff
+Config.server = Config.server || 'sim.smogon.com';
+Config.serverport = Config.serverport || 8000;
+Config.serverprotocol = Config.serverprotocol || 'ws';
 
-var _gaq = _gaq || [];	// google analytics queue
+var socket;
+var locPrefix = '/';
+if (Config.urlPrefix) locPrefix += Config.urlPrefix;
+var actionphp = (function() {
+	var ret = '/~~' + Config.serverid + '/action.php';
+	if (Config.testclient) {
+		ret = 'http://play.pokemonshowdown.com' + ret;
+	}
+	return ret;
+})();
+var _gaq = _gaq || [];
 
 // initialize sockets
 var socket = null;
@@ -2942,18 +2952,6 @@ function overlay(overlayType, data) {
 		contents += '<p><button type="submit"><strong>Log in</strong></button> <button onclick="overlayClose();return false">Cancel</button></p>';
 		selectElem = '#overlay_assertion';
 		break;
-	case 'testclientserverlist':
-		contents += '<p>Choose a server to join:</p>'
-		var servers = data.servers;
-		for (var i = 0; i < servers.length; ++i) {
-			var server = servers[i];
-			var onclick = 'overlayClose();Config=$.parseJSON(decodeURIComponent(\'' + encodeURIComponent($.toJSON(server)).replace(/[!'()]/g, escape).replace(/\*/g, "%2A") + '\'));connect();updateResize();if (init) init();return false;';
-			var display = server.name + ' (' + server.server;
-			if (server.serverport) display += ':' + server.serverport;
-			display += ')';
-			contents += '<p><button onclick="' + onclick + '">' + display + '</button></p>';
-		}
-		break;
 	case 'betalogin':
 		if (!data) data = {};
 		contents += '<p><strong>Pokemon Showdown is in private beta testing.</strong></p>';
@@ -3185,26 +3183,13 @@ var cookieTeams = true;
 	}
 })();
 
-function connect() {
-	Config.server = Config.server || 'sim.smogon.com';
-	Config.serverport = Config.serverport || 8000;
-	Config.serverprotocol = Config.serverprotocol || 'ws';
+// time to connect
+(function(data, name) {
+	if (Config.down) return;
 
-	var name = $.cookie('showdown_username') || '';
-	var data = Config.upkeep || {};
+	if (!data) data = {};
 	var token = data.assertion || '';
 
-	locPrefix = (function() {
-		var ret = '/';
-		if (Config.testclient) ret += Config.urlPrefix;
-		return ret;
-	})();
-	actionphp = (function() {
-		var ret = '/~~' + Config.serverid + '/action.php';
-		if (Config.testclient) ret = 'http://play.pokemonshowdown.com' + ret;
-		return ret;
-	})();
-
 	if (data.curuser && data.curuser.loggedin) {
 		me.registered = data.curuser;
 		name = data.curuser.username;
@@ -3399,4 +3384,4 @@ function connect() {
 			overlay('disconnect');
 		};
 	}
-}
+})(Config.upkeep, $.cookie('showdown_username') || '');
diff --git a/testclient.html b/testclient.html
@@ -11,6 +11,15 @@
 		<link rel="stylesheet" href="style/font-awesome.css" />
 		<meta id="viewport" name="viewport" content="width=640"/>
 		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
+	<script>
+		var Config = {
+			serverid: 'showdown',
+			server: 'sim.smogon.com',
+			serverport: 8000,
+			serverprotocol: 'ws',
+			testclient: true
+		};
+	</script>
 	<!--[if lte IE 8]><script>
 		oldie = true;
 	</script><![endif]-->
@@ -93,24 +102,9 @@ <h1 style="margin-top:2px;margin-right:10em;padding-top:0;"><img src="pokemonsho
 		<script src="js/utilichart.js?test"></script>
 
 		<script src="data/aliases.js?test"></script>
-
 		<script>
-			(function() {
-				// This uri accepts cross-domain requests.
-				var uri = 'http://play.pokemonshowdown.com/action.php?act=serverlist';
-				$.get(uri, Tools.safeJson(function(data) {
-					var servers = data.servers;
-					servers.unshift({
-						serverid: 'localhost',
-						name: 'localhost',
-						server: 'localhost',
-					});
-					servers.forEach(function(server) {
-						server.testclient = true;
-					});
-					overlay('testclientserverlist', {servers: servers});
-				}), 'text');
-			})();
+			updateResize();
+			if (init) init();
 		</script>
 	</body>
 </html>