smrealms / smr

lib/Default/SmrScoutDrones.class.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		$damage['Launched'] = ICeil($this->getNumberOfSDs() * $this->getModifiedForceAccuracyAgainstPlayer($forces, $targetPlayer) / 100);
 		$damage['MaxDamage'] = ICeil($damage['Launched'] * $damage['MaxDamage']);
 		$damage['Shield'] = ICeil($damage['Launched'] * $damage['Shield']);

tools/npc/chess.php

Spacing +13 added lines, -13 removed lines

@@ -10,22 +10,22 @@ 
 
 	debug('Script started');
 	define('SCRIPT_ID', $db->getInsertID());
-	$db->query('UPDATE npc_logs SET script_id='.SCRIPT_ID.' WHERE log_id='.SCRIPT_ID);
+	$db->query('UPDATE npc_logs SET script_id=' . SCRIPT_ID . ' WHERE log_id=' . SCRIPT_ID);
 
 	define('NPC_SCRIPT', true);
 
 	$descriptorSpec = array(
-		0 => array("pipe", "r"),  // stdin is a pipe that the child will read from
+		0 => array("pipe", "r"), // stdin is a pipe that the child will read from
 		1 => array("pipe", "w")  // stdout is a pipe that the child will write to
 	);
 	$engine = proc_open(UCI_CHESS_ENGINE, $descriptorSpec, $pipes);
-	$toEngine =& $pipes[0];
-	$fromEngine =& $pipes[1];
+	$toEngine = & $pipes[0];
+	$fromEngine = & $pipes[1];
 
 	function readFromEngine($block = true) {
 		global $fromEngine;
 		stream_set_blocking($fromEngine, $block == true ? 1 : 0);
-		while(($s = fgets($fromEngine)) !== false) {
+		while (($s = fgets($fromEngine)) !== false) {
 			debug('<-- ' . trim($s));
 			stream_set_blocking($fromEngine, 0);
 		}
@@ -34,7 +34,7 @@ 
 		global $toEngine;
 		debug('--> ' . $s);
 		fputs($toEngine, $s . EOL);
-		if($read === true) {
+		if ($read === true) {
 			readFromEngine($block);
 		}
 	}
@@ -45,7 +45,7 @@ 
 	writeToEngine('isready');
 	writeToEngine('ucinewgame', false);
 
-	while(true) {
+	while (true) {
 		//Redefine MICRO_TIME and TIME, the rest of the game expects them to be the single point in time that the script is executing, with it being redefined for each page load - unfortunately NPCs are one consistent script so we have to do a hack and redefine it (or change every instance of the TIME constant).
 		runkit_constant_redefine('MICRO_TIME', microtime(true));
 		runkit_constant_redefine('TIME', IFloor(MICRO_TIME));
@@ -55,9 +55,9 @@ 
 			writeToEngine('position fen ' . $chessGame->getFENString(), false);
 			writeToEngine('go ' . ($chessGame->getCurrentTurnColour() == ChessGame::PLAYER_WHITE ? 'w' : 'b') . 'time ' . UCI_TIME_PER_MOVE_MS, true, false);
 			stream_set_blocking($fromEngine, 1);
-			while(stripos($move = trim(fgets($fromEngine)), 'bestmove') !== 0) {
+			while (stripos($move = trim(fgets($fromEngine)), 'bestmove') !== 0) {
 				debug('<-- ' . $move);
-				if(stripos($move, 'Seg') === 0) {
+				if (stripos($move, 'Seg') === 0) {
 					// Segfault
 					debug('UCI engine segfaulted?');
 					exit;
@@ -78,12 +78,12 @@ 
 	fclose($fromEngine);
 	proc_close($engine);
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	logException($e);
 	exit;
 }
 function debug($message, $debugObject = null) {
-	global $account,$var,$db;
-	echo date('Y-m-d H:i:s - ').$message.($debugObject!==null?EOL.var_export($debugObject,true):'').EOL;
-	$db->query('INSERT INTO npc_logs (script_id, npc_id, time, message, debug_info, var) VALUES ('.(defined('SCRIPT_ID')?SCRIPT_ID:0).', '.(is_object($account)?$account->getAccountID():0).',NOW(),'.$db->escapeString($message).','.$db->escapeString(var_export($debugObject,true)).','.$db->escapeString(var_export($var,true)).')');
+	global $account, $var, $db;
+	echo date('Y-m-d H:i:s - ') . $message . ($debugObject !== null ?EOL.var_export($debugObject, true) : '') . EOL;
+	$db->query('INSERT INTO npc_logs (script_id, npc_id, time, message, debug_info, var) VALUES (' . (defined('SCRIPT_ID') ?SCRIPT_ID:0) . ', ' . (is_object($account) ? $account->getAccountID() : 0) . ',NOW(),' . $db->escapeString($message) . ',' . $db->escapeString(var_export($debugObject, true)) . ',' . $db->escapeString(var_export($var, true)) . ')');
 }

lib/Default/Routes/RouteGenerator.class.php

Spacing +20 added lines, -20 removed lines

@@ -72,24 +72,24 @@ 
 		$routes = array();
 		foreach ($distances as $currentSectorId => $d) {
 			$raceID = $sectors[$currentSectorId]->getPort()->getRaceID();
-			if (isset($races[$raceID])===false) {
-				echo 'Error with Race ID: '.$sectors[$currentSectorId]->getPort()->getRaceID();
+			if (isset($races[$raceID]) === false) {
+				echo 'Error with Race ID: ' . $sectors[$currentSectorId]->getPort()->getRaceID();
 				continue;
 			}
-			if($races[$raceID]===false)
+			if ($races[$raceID] === false)
 				continue;
 			$rl = array();
 			foreach ($d as $targetSectorId => $distance) {
 				if (!$races[$sectors[$targetSectorId]->getPort()->getRaceID()])
 					continue;
-				if($routesForPort!==-1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort)
+				if ($routesForPort !== -1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort)
 					continue;
 
-				if ($goods[GOOD_NOTHING]===true)
+				if ($goods[GOOD_NOTHING] === true)
 					$rl[] = new OneWayRoute($currentSectorId, $targetSectorId, $raceID, $sectors[$targetSectorId]->getPort()->getRaceID(), 0, 0, $distance, GOOD_NOTHING);
 
 				foreach (\Globals::getGoods() as $goodId => $value) {
-					if ($goods[$goodId]===true) {
+					if ($goods[$goodId] === true) {
 						if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_SELLS &&
 						    $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_BUYS) {
 							$rl[] = new OneWayRoute($currentSectorId, $targetSectorId, $raceID, $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId);
@@ -105,16 +105,16 @@ 
 	public static function generateOneWayRoutes(array $sectors, array $distances, array $goods, array $races, int $routesForPort) : array {
 		self::initialize();
 		foreach ($distances as $currentSectorId => $d) {
-			if ($races[$sectors[$currentSectorId]->getPort()->getRaceID()]===false)
+			if ($races[$sectors[$currentSectorId]->getPort()->getRaceID()] === false)
 				continue;
 			foreach ($d as $targetSectorId => $distance) {
-				if ($races[$sectors[$targetSectorId]->getPort()->getRaceID()]===false)
+				if ($races[$sectors[$targetSectorId]->getPort()->getRaceID()] === false)
 					continue;
-				if($routesForPort!==-1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort)
+				if ($routesForPort !== -1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort)
 					continue;
 
 				foreach (\Globals::getGoods() as $goodId => $value) {
-					if ($goods[$goodId]===true) {
+					if ($goods[$goodId] === true) {
 						if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_SELLS &&
 						    $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_BUYS) {
 							$owr = new OneWayRoute($currentSectorId, $targetSectorId, $sectors[$currentSectorId]->getPort()->getRaceID(), $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId);
@@ -160,18 +160,18 @@ 
 		$i = 0;
 		krsort(self::$expRoutes, SORT_NUMERIC);
 		foreach (self::$expRoutes as $multi => $routesByMulti) {
-			if(count($routesByMulti)+$i < $trimToBestXRoutes) {
+			if (count($routesByMulti) + $i < $trimToBestXRoutes) {
 				$i += count($routesByMulti);
 			}
-			else if($i > $trimToBestXRoutes) {
+			else if ($i > $trimToBestXRoutes) {
 				unset(self::$expRoutes[$multi]);
 			}
 			else {
-				foreach($routesByMulti as $key => $value) {
+				foreach ($routesByMulti as $key => $value) {
 					$i++;
-					if($i < $trimToBestXRoutes)
+					if ($i < $trimToBestXRoutes)
 						continue;
-					if($i === $trimToBestXRoutes) {
+					if ($i === $trimToBestXRoutes) {
 						self::$dontAddWorseThan[self::EXP_ROUTE] = $multi;
 						continue;
 					}
@@ -183,19 +183,19 @@ 
 		$i = 0;
 		krsort(self::$moneyRoutes, SORT_NUMERIC);
 		foreach (self::$moneyRoutes as $multi => $routesByMulti) {
-			if(count($routesByMulti)+$i < $trimToBestXRoutes) {
+			if (count($routesByMulti) + $i < $trimToBestXRoutes) {
 				$i += count($routesByMulti);
 			}
-			else if($i > $trimToBestXRoutes) {
+			else if ($i > $trimToBestXRoutes) {
 				unset(self::$moneyRoutes[$multi]);
 				continue;
 			}
 			else {
-				foreach($routesByMulti as $key => $value) {
+				foreach ($routesByMulti as $key => $value) {
 					$i++;
-					if($i < $trimToBestXRoutes)
+					if ($i < $trimToBestXRoutes)
 						continue;
-					if($i === $trimToBestXRoutes) {
+					if ($i === $trimToBestXRoutes) {
 						self::$dontAddWorseThan[self::MONEY_ROUTE] = $multi;
 						continue;
 					}

lib/Default/AbstractSmrAccount.class.php

Spacing +282 added lines, -282 removed lines

@@ -10,23 +10,23 @@ 
 	protected const USER_RANKINGS_SCORE = array(
 		// [Stat, a, b]
 		// Used as: pow(Stat * a, USER_RANKINGS_EACH_STAT_POW) * b
-		array(array('Trade','Experience','Total'),.1,0.5),
-		array(array('Trade','Money','Profit'),0.00005,0.5),
-		array(array('Killing','Kills'),1000,1)
+		array(array('Trade', 'Experience', 'Total'), .1, 0.5),
+		array(array('Trade', 'Money', 'Profit'), 0.00005, 0.5),
+		array(array('Killing', 'Kills'), 1000, 1)
 		);
 
 	protected static $CACHE_ACCOUNTS = array();
 	protected const DEFAULT_HOTKEYS = array(
-		'MoveUp' => array('w','up'),
-		'ScanUp' => array('shift+w','shift+up'),
-		'MoveLeft' => array('a','left'),
-		'ScanLeft' => array('shift+a','shift+left'),
-		'MoveRight' => array('d','right'),
-		'ScanRight' => array('shift+d','shift+right'),
-		'MoveDown' => array('s','down'),
-		'ScanDown' => array('shift+s','shift+down'),
-		'MoveWarp' => array('e','0'),
-		'ScanWarp' => array('shift+e','shift+0'),
+		'MoveUp' => array('w', 'up'),
+		'ScanUp' => array('shift+w', 'shift+up'),
+		'MoveLeft' => array('a', 'left'),
+		'ScanLeft' => array('shift+a', 'shift+left'),
+		'MoveRight' => array('d', 'right'),
+		'ScanRight' => array('shift+d', 'shift+right'),
+		'MoveDown' => array('s', 'down'),
+		'ScanDown' => array('shift+s', 'shift+down'),
+		'MoveWarp' => array('e', '0'),
+		'ScanWarp' => array('shift+e', 'shift+0'),
 		'ScanCurrent' => array('shift+1'),
 		'CurrentSector' => array('1'),
 		'LocalMap' => array('2'),
@@ -67,7 +67,7 @@ 
 	protected $oldAccountIDs = array();
 	protected $maxRankAchieved;
 	protected $referrerID;
-	protected $credits;       // SMR credits
+	protected $credits; // SMR credits
 	protected $rewardCredits; // SMR reward credits
 	protected $dateShort;
 	protected $timeShort;
@@ -88,8 +88,8 @@ 
 		return self::DEFAULT_HOTKEYS;
 	}
 
-	public static function getAccount($accountID,$forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_ACCOUNTS[$accountID])) {
+	public static function getAccount($accountID, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_ACCOUNTS[$accountID])) {
 			self::$CACHE_ACCOUNTS[$accountID] = new SmrAccount($accountID);
 		}
 		return self::$CACHE_ACCOUNTS[$accountID];
@@ -98,17 +98,17 @@ 
 	public static function getAccountByName($login, $forceUpdate = false) {
 		if (empty($login)) { return null; }
 		$db = new SmrMySqlDatabase();
-		$db->query('SELECT account_id FROM account WHERE login = '.$db->escapeString($login).' LIMIT 1');
-		if($db->nextRecord())
+		$db->query('SELECT account_id FROM account WHERE login = ' . $db->escapeString($login) . ' LIMIT 1');
+		if ($db->nextRecord())
 			return self::getAccount($db->getInt('account_id'), $forceUpdate);
 		$return = null;
 		return $return;
 	}
 
-	public static function getAccountByEmail($email, $forceUpdate=false) {
+	public static function getAccountByEmail($email, $forceUpdate = false) {
 		if (empty($email)) { return null; }
 		$db = new SmrMySqlDatabase();
-		$db->query('SELECT account_id FROM account WHERE email = '.$db->escapeString($email).' LIMIT 1');
+		$db->query('SELECT account_id FROM account WHERE email = ' . $db->escapeString($email) . ' LIMIT 1');
 		if ($db->nextRecord()) {
 			return self::getAccount($db->getInt('account_id'), $forceUpdate);
 		} else {
@@ -116,10 +116,10 @@ 
 		}
 	}
 
-	public static function getAccountByDiscordId($id, $forceUpdate=false) {
+	public static function getAccountByDiscordId($id, $forceUpdate = false) {
 		if (empty($id)) { return null; }
 		$db = new SmrMySqlDatabase();
-		$db->query('SELECT account_id FROM account where discord_id = '.$db->escapeString($id).' LIMIT 1');
+		$db->query('SELECT account_id FROM account where discord_id = ' . $db->escapeString($id) . ' LIMIT 1');
 		if ($db->nextRecord()) {
 			return self::getAccount($db->getInt('account_id'), $forceUpdate);
 		} else {
@@ -130,7 +130,7 @@ 
 	public static function getAccountByIrcNick($nick, $forceUpdate = false) {
 		if (empty($nick)) { return null; }
 		$db = new SmrMySqlDatabase();
-		$db->query('SELECT account_id FROM account WHERE irc_nick = '.$db->escapeString($nick).' LIMIT 1');
+		$db->query('SELECT account_id FROM account WHERE irc_nick = ' . $db->escapeString($nick) . ' LIMIT 1');
 		if ($db->nextRecord()) {
 			return self::getAccount($db->getInt('account_id'), $forceUpdate);
 		} else {
@@ -138,12 +138,12 @@ 
 		}
 	}
 
-	public static function getAccountBySocialLogin(SocialLogin $social, $forceUpdate=false) {
+	public static function getAccountBySocialLogin(SocialLogin $social, $forceUpdate = false) {
 		if (!$social->isValid()) { return null; }
 		$db = new SmrMySqlDatabase();
 		$db->query('SELECT account_id FROM account JOIN account_auth USING(account_id)
-		            WHERE login_type = '.$db->escapeString($social->getLoginType()).'
-		              AND auth_key = '.$db->escapeString($social->getUserID()).' LIMIT 1');
+		            WHERE login_type = '.$db->escapeString($social->getLoginType()) . '
+		              AND auth_key = '.$db->escapeString($social->getUserID()) . ' LIMIT 1');
 		if ($db->nextRecord()) {
 			return self::getAccount($db->getInt('account_id'), $forceUpdate);
 		} else {
@@ -152,7 +152,7 @@ 
 	}
 
 	public static function createAccount($login, $password, $email, $timez, $referral) {
-		if($referral!=0) {
+		if ($referral != 0) {
 			// Will throw if referral account doesn't exist
 			SmrAccount::getAccount($referral);
 		}
@@ -160,60 +160,60 @@ 
 		$passwordHash = password_hash($password, PASSWORD_DEFAULT);
 		$db->query('INSERT INTO account (login, password, email, validation_code, last_login, offset,referral_id,hof_name) VALUES(' .
 			$db->escapeString($login) . ', ' . $db->escapeString($passwordHash) . ', ' . $db->escapeString($email) . ', ' .
-			$db->escapeString(random_string(10)) . ',' . $db->escapeNumber(TIME) . ',' . $db->escapeNumber($timez) . ',' . $db->escapeNumber($referral).','.$db->escapeString($login).')');
+			$db->escapeString(random_string(10)) . ',' . $db->escapeNumber(TIME) . ',' . $db->escapeNumber($timez) . ',' . $db->escapeNumber($referral) . ',' . $db->escapeString($login) . ')');
 		return self::getAccountByName($login);
 	}
 
 	public static function getUserScoreCaseStatement($db) {
 		$userRankingTypes = array();
 		$case = 'FLOOR(SUM(CASE type ';
-		foreach(self::USER_RANKINGS_SCORE as $userRankingScore) {
-			$userRankingType = $db->escapeArray($userRankingScore[0],false,false,':',false);
+		foreach (self::USER_RANKINGS_SCORE as $userRankingScore) {
+			$userRankingType = $db->escapeArray($userRankingScore[0], false, false, ':', false);
 			$userRankingTypes[] = $userRankingType;
-			$case.= ' WHEN '.$db->escapeString($userRankingType).' THEN POW(amount*'.$userRankingScore[1].','.SmrAccount::USER_RANKINGS_EACH_STAT_POW.')*'.$userRankingScore[2];
+			$case .= ' WHEN ' . $db->escapeString($userRankingType) . ' THEN POW(amount*' . $userRankingScore[1] . ',' . SmrAccount::USER_RANKINGS_EACH_STAT_POW . ')*' . $userRankingScore[2];
 		}
 		$case .= ' END))';
-		return array('CASE'=>$case,'IN'=>$db->escapeArray($userRankingTypes));
+		return array('CASE'=>$case, 'IN'=>$db->escapeArray($userRankingTypes));
 	}
 
 	protected function __construct($accountID) {
 		$this->db = new SmrMySqlDatabase();
 		$this->SQL = 'account_id = ' . $this->db->escapeNumber($accountID);
-		$this->db->query('SELECT * FROM account WHERE '.$this->SQL.' LIMIT 1');
+		$this->db->query('SELECT * FROM account WHERE ' . $this->SQL . ' LIMIT 1');
 
 		if ($this->db->nextRecord()) {
 			$row = $this->db->getRow();
-			$this->account_id		= $row['account_id'];
+			$this->account_id = $row['account_id'];
 
 			$this->login			= $row['login'];
-			$this->passwordHash		= $row['password'];
+			$this->passwordHash = $row['password'];
 			$this->email			= $row['email'];
-			$this->validated		= $this->db->getBoolean('validated');
+			$this->validated = $this->db->getBoolean('validated');
 
-			$this->last_login		= $row['last_login'];
-			$this->validation_code 	= $row['validation_code'];
-			$this->veteranForced	= $this->db->getBoolean('veteran');
-			$this->logging			= $this->db->getBoolean('logging');
+			$this->last_login = $row['last_login'];
+			$this->validation_code = $row['validation_code'];
+			$this->veteranForced = $this->db->getBoolean('veteran');
+			$this->logging = $this->db->getBoolean('logging');
 			$this->offset			= $row['offset'];
 			$this->images			= $row['images'];
-			$this->fontSize			= $row['fontsize'];
+			$this->fontSize = $row['fontsize'];
 
-			$this->passwordReset	= $row['password_reset'];
-			$this->useAJAX			= $this->db->getBoolean('use_ajax');
-			$this->mailBanned		= (int)$row['mail_banned'];
+			$this->passwordReset = $row['password_reset'];
+			$this->useAJAX = $this->db->getBoolean('use_ajax');
+			$this->mailBanned = (int)$row['mail_banned'];
 			
-			$this->friendlyColour 	= $row['friendly_colour'];
-			$this->neutralColour 	= $row['neutral_colour'];
-			$this->enemyColour 		= $row['enemy_colour'];
+			$this->friendlyColour = $row['friendly_colour'];
+			$this->neutralColour = $row['neutral_colour'];
+			$this->enemyColour = $row['enemy_colour'];
 
-			$this->cssLink			= $row['css_link'];
-			$this->defaultCSSEnabled	= $this->db->getBoolean('default_css_enabled');
-			$this->centerGalaxyMapOnPlayer	= $this->db->getBoolean('center_galaxy_map_on_player');
+			$this->cssLink = $row['css_link'];
+			$this->defaultCSSEnabled = $this->db->getBoolean('default_css_enabled');
+			$this->centerGalaxyMapOnPlayer = $this->db->getBoolean('center_galaxy_map_on_player');
 
 			$this->messageNotifications = $this->db->getObject('message_notifications');
 			$this->hotkeys = $this->db->getObject('hotkeys');
-			foreach(self::DEFAULT_HOTKEYS as $hotkey => $binding) {
-				if(!isset($this->hotkeys[$hotkey])) {
+			foreach (self::DEFAULT_HOTKEYS as $hotkey => $binding) {
+				if (!isset($this->hotkeys[$hotkey])) {
 					$this->hotkeys[$hotkey] = $binding;
 				}
 			}
@@ -222,8 +222,8 @@ 
 				$this->oldAccountIDs[$databaseName] = $row[$oldColumn];
 			}
 
-			$this->referrerID		= $row['referral_id'];
-			$this->maxRankAchieved	= $row['max_rank_achieved'];
+			$this->referrerID = $row['referral_id'];
+			$this->maxRankAchieved = $row['max_rank_achieved'];
 
 			$this->hofName			= $row['hof_name'];
 			$this->discordId		= $row['discord_id'];
@@ -233,19 +233,19 @@ 
 			$this->timeShort		= $row['time_short'];
 
 			$this->template			= $row['template'];
-			$this->colourScheme		= $row['colour_scheme'];
+			$this->colourScheme = $row['colour_scheme'];
 
-			if(empty($this->hofName))
-				$this->hofName=$this->login;
+			if (empty($this->hofName))
+				$this->hofName = $this->login;
 		}
 		else {
-			throw new AccountNotFoundException('Account ID '.$accountID.' does not exist!');
+			throw new AccountNotFoundException('Account ID ' . $accountID . ' does not exist!');
 		}
 	}
 
 	public function isDisabled() {
 		$this->db->query('SELECT * FROM account_is_closed JOIN closing_reason USING(reason_id) ' .
-			'WHERE '.$this->SQL.' LIMIT 1');
+			'WHERE ' . $this->SQL . ' LIMIT 1');
 		if ($this->db->nextRecord()) {
 			// get the expire time
 			$expireTime = $this->db->getInt('expires');
@@ -267,64 +267,64 @@ 
 	}
 
 	public function update() {
-		$this->db->query('UPDATE account SET email = '.$this->db->escapeString($this->email).
-			', validation_code = '.$this->db->escapeString($this->validation_code).
-			', validated = '.$this->db->escapeBoolean($this->validated).
-			', password = '.$this->db->escapeString($this->passwordHash).
-			', images = '.$this->db->escapeString($this->images).
-			', password_reset = '.$this->db->escapeString($this->passwordReset).
-			', use_ajax='.$this->db->escapeBoolean($this->useAJAX).
-			', mail_banned='.$this->db->escapeNumber($this->mailBanned).
-			', max_rank_achieved='.$this->db->escapeNumber($this->maxRankAchieved).
-			', default_css_enabled='.$this->db->escapeBoolean($this->defaultCSSEnabled).
-			', center_galaxy_map_on_player='.$this->db->escapeBoolean($this->centerGalaxyMapOnPlayer).
-			', message_notifications='.$this->db->escapeObject($this->messageNotifications).
-			', hotkeys='.$this->db->escapeObject($this->hotkeys).
-			', last_login = '.$this->db->escapeNumber($this->last_login).
-			', logging = '.$this->db->escapeBoolean($this->logging).
-			', time_short = ' . $this->db->escapeString($this->timeShort).
-			', date_short = ' . $this->db->escapeString($this->dateShort).
-			', discord_id = ' . $this->db->escapeString($this->discordId, true, true).
-			', irc_nick = ' . $this->db->escapeString($this->ircNick, true, true).
-			', hof_name = ' . $this->db->escapeString($this->hofName).
-			', colour_scheme = ' . $this->db->escapeString($this->colourScheme).
-			', fontsize = ' . $this->db->escapeNumber($this->fontSize).
-			', css_link = ' . $this->db->escapeString($this->cssLink,true,true).
-			', friendly_colour = ' . $this->db->escapeString($this->friendlyColour, true, true).
-			', neutral_colour = ' . $this->db->escapeString($this->neutralColour, true, true).
-			', enemy_colour = ' . $this->db->escapeString($this->enemyColour, true, true).
-			' WHERE '.$this->SQL.' LIMIT 1');
+		$this->db->query('UPDATE account SET email = ' . $this->db->escapeString($this->email) .
+			', validation_code = ' . $this->db->escapeString($this->validation_code) .
+			', validated = ' . $this->db->escapeBoolean($this->validated) .
+			', password = ' . $this->db->escapeString($this->passwordHash) .
+			', images = ' . $this->db->escapeString($this->images) .
+			', password_reset = ' . $this->db->escapeString($this->passwordReset) .
+			', use_ajax=' . $this->db->escapeBoolean($this->useAJAX) .
+			', mail_banned=' . $this->db->escapeNumber($this->mailBanned) .
+			', max_rank_achieved=' . $this->db->escapeNumber($this->maxRankAchieved) .
+			', default_css_enabled=' . $this->db->escapeBoolean($this->defaultCSSEnabled) .
+			', center_galaxy_map_on_player=' . $this->db->escapeBoolean($this->centerGalaxyMapOnPlayer) .
+			', message_notifications=' . $this->db->escapeObject($this->messageNotifications) .
+			', hotkeys=' . $this->db->escapeObject($this->hotkeys) .
+			', last_login = ' . $this->db->escapeNumber($this->last_login) .
+			', logging = ' . $this->db->escapeBoolean($this->logging) .
+			', time_short = ' . $this->db->escapeString($this->timeShort) .
+			', date_short = ' . $this->db->escapeString($this->dateShort) .
+			', discord_id = ' . $this->db->escapeString($this->discordId, true, true) .
+			', irc_nick = ' . $this->db->escapeString($this->ircNick, true, true) .
+			', hof_name = ' . $this->db->escapeString($this->hofName) .
+			', colour_scheme = ' . $this->db->escapeString($this->colourScheme) .
+			', fontsize = ' . $this->db->escapeNumber($this->fontSize) .
+			', css_link = ' . $this->db->escapeString($this->cssLink, true, true) .
+			', friendly_colour = ' . $this->db->escapeString($this->friendlyColour, true, true) .
+			', neutral_colour = ' . $this->db->escapeString($this->neutralColour, true, true) .
+			', enemy_colour = ' . $this->db->escapeString($this->enemyColour, true, true) .
+			' WHERE ' . $this->SQL . ' LIMIT 1');
 		$this->hasChanged = false;
 	}
 
 	public function updateIP() {
 		$curr_ip = getIpAddress();
-		$this->log(LOG_TYPE_LOGIN, 'logged in from '.$curr_ip);
+		$this->log(LOG_TYPE_LOGIN, 'logged in from ' . $curr_ip);
 
 		// more than 50 elements in it?
 
-		$this->db->query('SELECT time,ip FROM account_has_ip WHERE '.$this->SQL.' ORDER BY time ASC');
+		$this->db->query('SELECT time,ip FROM account_has_ip WHERE ' . $this->SQL . ' ORDER BY time ASC');
 		if ($this->db->getNumRows() > 50 && $this->db->nextRecord()) {
 			$delete_time = $this->db->getInt('time');
 			$delete_ip = $this->db->getField('ip');
 
 			$this->db->query('DELETE FROM account_has_ip
-				WHERE '.$this->SQL.' AND
-				time = '.$this->db->escapeNumber($delete_time).' AND
+				WHERE '.$this->SQL . ' AND
+				time = '.$this->db->escapeNumber($delete_time) . ' AND
 				ip = '.$this->db->escapeString($delete_ip));
 		}
-		list($fi,$se,$th,$fo) = preg_split('/[.\s,]/', $curr_ip, 4);
+		list($fi, $se, $th, $fo) = preg_split('/[.\s,]/', $curr_ip, 4);
 		if ($curr_ip != 'unknown' && $curr_ip != 'unknown...' && $curr_ip != 'unknown, unknown') {
-			$curr_ip = $fi.'.'.$se.'.'.$th.'.'.$fo;
+			$curr_ip = $fi . '.' . $se . '.' . $th . '.' . $fo;
 			$host = gethostbyaddr($curr_ip);
 		} else $host = 'unknown';
 
 		// save...first make sure there isn't one for these keys (someone could double click and get error)
-		$this->db->query('REPLACE INTO account_has_ip (account_id, time, ip, host) VALUES ('.$this->db->escapeNumber($this->account_id).', '.$this->db->escapeNumber(TIME).', '.$this->db->escapeString($curr_ip).', '.$this->db->escapeString($host).')');
+		$this->db->query('REPLACE INTO account_has_ip (account_id, time, ip, host) VALUES (' . $this->db->escapeNumber($this->account_id) . ', ' . $this->db->escapeNumber(TIME) . ', ' . $this->db->escapeString($curr_ip) . ', ' . $this->db->escapeString($host) . ')');
 	}
 
 	public function updateLastLogin() {
-		if($this->last_login == TIME)
+		if ($this->last_login == TIME)
 			return;
 		$this->last_login = TIME;
 		$this->hasChanged = true;
@@ -336,9 +336,9 @@ 
 	}
 
 	public function setLoggingEnabled($bool) {
-		if($this->logging==$bool)
+		if ($this->logging == $bool)
 			return;
-		$this->logging=$bool;
+		$this->logging = $bool;
 		$this->hasChanged = true;
 		$this->update();
 	}
@@ -358,26 +358,26 @@ 
 	}
 
 	public function isNPC() {
-		if(!isset($this->npc)) {
-			$this->db->query('SELECT login FROM npc_logins WHERE login = '.$this->db->escapeString($this->getLogin()).' LIMIT 1;');
+		if (!isset($this->npc)) {
+			$this->db->query('SELECT login FROM npc_logins WHERE login = ' . $this->db->escapeString($this->getLogin()) . ' LIMIT 1;');
 			$this->npc = $this->db->nextRecord();
 		}
 		return $this->npc;
 	}
 
 	protected function getHOFData() {
-		if(!isset($this->HOF)) {
+		if (!isset($this->HOF)) {
 			//Get Player HOF
 			$this->db->query('SELECT type,sum(amount) as amount FROM player_hof WHERE ' . $this->SQL . ' AND game_id IN (SELECT game_id FROM game WHERE ignore_stats = \'FALSE\') GROUP BY type');
 			$this->HOF = array();
-			while($this->db->nextRecord()) {
-				$hof =& $this->HOF;
-				$typeList = explode(':',$this->db->getField('type'));
-				foreach($typeList as $type) {
-					if(!isset($hof[$type])) {
+			while ($this->db->nextRecord()) {
+				$hof = & $this->HOF;
+				$typeList = explode(':', $this->db->getField('type'));
+				foreach ($typeList as $type) {
+					if (!isset($hof[$type])) {
 						$hof[$type] = array();
 					}
-					$hof =& $hof[$type];
+					$hof = & $hof[$type];
 				}
 				$hof = $this->db->getFloat('amount');
 			}
@@ -386,11 +386,11 @@ 
 
 	public function getHOF(array $typeList = null) {
 		$this->getHOFData();
-		if($typeList==null)
+		if ($typeList == null)
 			return $this->HOF;
-		$hof=$this->HOF;
-		foreach($typeList as $type) {
-			if(!isset($hof[$type]))
+		$hof = $this->HOF;
+		foreach ($typeList as $type) {
+			if (!isset($hof[$type]))
 				return 0;
 			$hof = $hof[$type];
 		}
@@ -399,58 +399,58 @@ 
 
 	public function getRankName() {
 		$rankings = Globals::getUserRanking();
-		if(isset($rankings[$this->getRank()]))
+		if (isset($rankings[$this->getRank()]))
 			return $rankings[$this->getRank()];
 		else
 			return end($rankings);
 	}
 
 	public function getScore() {
-		if(!isset($this->score)) {
-			$score=0;
-			foreach($this->getIndividualScores() as $each) {
-				$score+=$each['Score'];
+		if (!isset($this->score)) {
+			$score = 0;
+			foreach ($this->getIndividualScores() as $each) {
+				$score += $each['Score'];
 			}
-			$this->score=round($score);
+			$this->score = round($score);
 		}
 		return $this->score;
 	}
 
 	public function getIndividualScores(SmrPlayer $player = null) {
-		$gameID=0;
-		if($player!=null)
+		$gameID = 0;
+		if ($player != null)
 			$gameID = $player->getGameID();
-		if(!isset($this->individualScores[$gameID])) {
+		if (!isset($this->individualScores[$gameID])) {
 			$this->individualScores[$gameID] = array();
-			foreach(self::USER_RANKINGS_SCORE as $statScore) {
-				if($player==null)
+			foreach (self::USER_RANKINGS_SCORE as $statScore) {
+				if ($player == null)
 					$stat = $this->getHOF($statScore[0]);
 				else
 					$stat = $player->getHOF($statScore[0]);
-				$this->individualScores[$gameID][]=array('Stat'=>$statScore[0],'Score'=>pow($stat*$statScore[1],self::USER_RANKINGS_EACH_STAT_POW)*$statScore[2]);
+				$this->individualScores[$gameID][] = array('Stat'=>$statScore[0], 'Score'=>pow($stat * $statScore[1], self::USER_RANKINGS_EACH_STAT_POW) * $statScore[2]);
 			}
 		}
 		return $this->individualScores[$gameID];
 	}
 
 	public function getRank() : int {
-		$rank = ICeil(pow($this->getScore(),self::USER_RANKINGS_TOTAL_SCORE_POW)/self::USER_RANKINGS_RANK_BOUNDARY);
-		if($rank<1)
-			$rank=1;
-		if($rank > $this->maxRankAchieved)
+		$rank = ICeil(pow($this->getScore(), self::USER_RANKINGS_TOTAL_SCORE_POW) / self::USER_RANKINGS_RANK_BOUNDARY);
+		if ($rank < 1)
+			$rank = 1;
+		if ($rank > $this->maxRankAchieved)
 			$this->updateMaxRankAchieved($rank);
 		return $rank;
 	}
 
 	protected function updateMaxRankAchieved($rank) {
-		if($rank <= $this->maxRankAchieved)
+		if ($rank <= $this->maxRankAchieved)
 			throw new Exception('Trying to set max rank achieved to a lower value: ' . $rank);
 		$delta = $rank - $this->maxRankAchieved;
-		if($this->hasReferrer()) {
+		if ($this->hasReferrer()) {
 			$this->getReferrer()->increaseSmrRewardCredits($delta * CREDITS_PER_DOLLAR);
 		}
-		$this->maxRankAchieved+=$delta;
-		$this->hasChanged=true;
+		$this->maxRankAchieved += $delta;
+		$this->hasChanged = true;
 		$this->update();
 	}
 
@@ -459,7 +459,7 @@ 
 	}
 
 	public function hasReferrer() {
-		return $this->referrerID>0;
+		return $this->referrerID > 0;
 	}
 
 	public function getReferrer() {
@@ -470,15 +470,15 @@ 
 		if ($this->isLoggingEnabled()) {
 			$this->db->query('INSERT INTO account_has_logs ' .
 				'(account_id, microtime, log_type_id, message, sector_id) ' .
-				'VALUES('.$this->db->escapeNumber($this->account_id).', '. $this->db->escapeMicrotime(MICRO_TIME) . ', '.$this->db->escapeNumber($log_type_id).', ' . $this->db->escapeString($msg) . ', '.$this->db->escapeNumber($sector_id).')');
+				'VALUES(' . $this->db->escapeNumber($this->account_id) . ', ' . $this->db->escapeMicrotime(MICRO_TIME) . ', ' . $this->db->escapeNumber($log_type_id) . ', ' . $this->db->escapeString($msg) . ', ' . $this->db->escapeNumber($sector_id) . ')');
 		}
 	}
 
 	protected function getSmrCreditsData() {
-		if(!isset($this->credits)||!isset($this->rewardCredits)) {
+		if (!isset($this->credits) || !isset($this->rewardCredits)) {
 			$this->credits = 0;
 			$this->rewardCredits = 0;
-			$this->db->query('SELECT * FROM account_has_credits WHERE '.$this->SQL.' LIMIT 1');
+			$this->db->query('SELECT * FROM account_has_credits WHERE ' . $this->SQL . ' LIMIT 1');
 			if ($this->db->nextRecord()) {
 				$this->credits = $this->db->getInt('credits_left');
 				$this->rewardCredits = $this->db->getInt('reward_credits');
@@ -491,26 +491,26 @@ 
 	}
 
 	public function decreaseTotalSmrCredits($totalCredits) {
-		if($totalCredits==0)
+		if ($totalCredits == 0)
 			return;
-		if($totalCredits<0)
+		if ($totalCredits < 0)
 			throw new Exception('You cannot use negative total credits');
-		if($totalCredits>$this->getTotalSmrCredits())
+		if ($totalCredits > $this->getTotalSmrCredits())
 			throw new Exception('You do not have that many credits in total to use');
 
-		$rewardCredits=$this->rewardCredits;
-		$credits=$this->credits;
-		$rewardCredits-=$totalCredits;
-		if($rewardCredits<0) {
-			$credits+=$rewardCredits;
-			$rewardCredits=0;
+		$rewardCredits = $this->rewardCredits;
+		$credits = $this->credits;
+		$rewardCredits -= $totalCredits;
+		if ($rewardCredits < 0) {
+			$credits += $rewardCredits;
+			$rewardCredits = 0;
 		}
-		if($this->credits==0 && $this->rewardCredits==0)
-			$this->db->query('REPLACE INTO account_has_credits (account_id, credits_left, reward_credits) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).','.$this->db->escapeNumber($rewardCredits).')');
+		if ($this->credits == 0 && $this->rewardCredits == 0)
+			$this->db->query('REPLACE INTO account_has_credits (account_id, credits_left, reward_credits) VALUES(' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber($credits) . ',' . $this->db->escapeNumber($rewardCredits) . ')');
 		else
-			$this->db->query('UPDATE account_has_credits SET credits_left='.$this->db->escapeNumber($credits).', reward_credits='.$this->db->escapeNumber($rewardCredits).' WHERE '.$this->SQL.' LIMIT 1');
-		$this->credits=$credits;
-		$this->rewardCredits=$rewardCredits;
+			$this->db->query('UPDATE account_has_credits SET credits_left=' . $this->db->escapeNumber($credits) . ', reward_credits=' . $this->db->escapeNumber($rewardCredits) . ' WHERE ' . $this->SQL . ' LIMIT 1');
+		$this->credits = $credits;
+		$this->rewardCredits = $rewardCredits;
 	}
 
 	public function getSmrCredits() {
@@ -524,49 +524,49 @@ 
 	}
 
 	public function setSmrCredits($credits) {
-		if($this->getSmrCredits()==$credits)
+		if ($this->getSmrCredits() == $credits)
 			return;
-		if($this->credits==0 && $this->rewardCredits==0)
-			$this->db->query('REPLACE INTO account_has_credits (account_id, credits_left) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).')');
+		if ($this->credits == 0 && $this->rewardCredits == 0)
+			$this->db->query('REPLACE INTO account_has_credits (account_id, credits_left) VALUES(' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber($credits) . ')');
 		else
-			$this->db->query('UPDATE account_has_credits SET credits_left='.$this->db->escapeNumber($credits).' WHERE '.$this->SQL.' LIMIT 1');
-		$this->credits=$credits;
+			$this->db->query('UPDATE account_has_credits SET credits_left=' . $this->db->escapeNumber($credits) . ' WHERE ' . $this->SQL . ' LIMIT 1');
+		$this->credits = $credits;
 	}
 
 	public function increaseSmrCredits($credits) {
-		if($credits==0)
+		if ($credits == 0)
 			return;
-		if($credits<0)
+		if ($credits < 0)
 			throw new Exception('You cannot gain negative credits');
-		$this->setSmrCredits($this->getSmrCredits()+$credits);
+		$this->setSmrCredits($this->getSmrCredits() + $credits);
 	}
 
 	public function decreaseSmrCredits($credits) {
-		if($credits==0)
+		if ($credits == 0)
 			return;
-		if($credits<0)
+		if ($credits < 0)
 			throw new Exception('You cannot use negative credits');
-		if($credits>$this->getSmrCredits())
+		if ($credits > $this->getSmrCredits())
 			throw new Exception('You cannot use more credits than you have');
-		$this->setSmrCredits($this->getSmrCredits()-$credits);
+		$this->setSmrCredits($this->getSmrCredits() - $credits);
 	}
 
 	public function setSmrRewardCredits($credits) {
-		if($this->getSmrRewardCredits()==$credits)
+		if ($this->getSmrRewardCredits() == $credits)
 			return;
-		if($this->credits==0 && $this->rewardCredits==0)
-			$this->db->query('REPLACE INTO account_has_credits (account_id, reward_credits) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).')');
+		if ($this->credits == 0 && $this->rewardCredits == 0)
+			$this->db->query('REPLACE INTO account_has_credits (account_id, reward_credits) VALUES(' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber($credits) . ')');
 		else
-			$this->db->query('UPDATE account_has_credits SET reward_credits='.$this->db->escapeNumber($credits).' WHERE '.$this->SQL.' LIMIT 1');
-		$this->rewardCredits=$credits;
+			$this->db->query('UPDATE account_has_credits SET reward_credits=' . $this->db->escapeNumber($credits) . ' WHERE ' . $this->SQL . ' LIMIT 1');
+		$this->rewardCredits = $credits;
 	}
 
 	public function increaseSmrRewardCredits($credits) {
-		if($credits==0)
+		if ($credits == 0)
 			return;
-		if($credits<0)
+		if ($credits < 0)
 			throw new Exception('You cannot gain negative reward credits');
-		$this->setSmrRewardCredits($this->getSmrRewardCredits()+$credits);
+		$this->setSmrRewardCredits($this->getSmrRewardCredits() + $credits);
 	}
 
 	public function sendMessageToBox($boxTypeID, $message) {
@@ -574,7 +574,7 @@ 
 		self::doMessageSendingToBox($this->getAccountID(), $boxTypeID, $message);
 	}
 
-	public static function doMessageSendingToBox($senderID, $boxTypeID, $message, $gameID=0) {
+	public static function doMessageSendingToBox($senderID, $boxTypeID, $message, $gameID = 0) {
 		$db = new SmrMySqlDatabase();
 		// send him the message
 		$db->query('INSERT INTO message_boxes
@@ -597,13 +597,13 @@ 
 	}
 
 	public function getOldAccountID($dbName) {
-		return isset($this->oldAccountIDs[$dbName])?$this->oldAccountIDs[$dbName]:0;
+		return isset($this->oldAccountIDs[$dbName]) ? $this->oldAccountIDs[$dbName] : 0;
 	}
 
-	public function hasOldAccountID($dbName=false) {
-		if($dbName===false)
-			return count($this->getOldAccountIDs())!=0;
-		return $this->getOldAccountID($dbName)!=0;
+	public function hasOldAccountID($dbName = false) {
+		if ($dbName === false)
+			return count($this->getOldAccountIDs()) != 0;
+		return $this->getOldAccountID($dbName) != 0;
 	}
 
 	public function getLogin() {
@@ -615,7 +615,7 @@ 
 	}
 
 	public function setEmail($email) {
-		if($this->email==$email) {
+		if ($this->email == $email) {
 			return;
 		}
 		$this->email = $email;
@@ -632,14 +632,14 @@ 
 
 		// check if the host got a MX or at least an A entry
 		if (!checkdnsrr($host, 'MX') && !checkdnsrr($host, 'A')) {
-			create_error('This is not a valid email address! The domain '.$host.' does not exist.');
+			create_error('This is not a valid email address! The domain ' . $host . ' does not exist.');
 		}
 
 		if (strstr($email, ' ')) {
 			create_error('The email is invalid! It cannot contain any spaces.');
 		}
 
-		$this->db->query('SELECT 1 FROM account WHERE email = '.$this->db->escapeString($email).' and account_id != ' . $this->db->escapeNumber($this->getAccountID()) . ' LIMIT 1');
+		$this->db->query('SELECT 1 FROM account WHERE email = ' . $this->db->escapeString($email) . ' and account_id != ' . $this->db->escapeNumber($this->getAccountID()) . ' LIMIT 1');
 		if ($this->db->getNumRows() > 0) {
 			create_error('This email address is already registered.');
 		}
@@ -650,12 +650,12 @@ 
 
 		// remember when we sent validation code
 		$this->db->query('REPLACE INTO notification (notification_type, account_id, time)
-				VALUES(\'validation_code\', '.$this->db->escapeNumber($this->getAccountID()).', ' . $this->db->escapeNumber(TIME) . ')');
+				VALUES(\'validation_code\', '.$this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber(TIME) . ')');
 
 		$emailMessage =
-			'You changed your email address registered with SMR and need to revalidate now!'.EOL.EOL.
-			'   Your new validation code is: '.$this->getValidationCode().EOL.EOL.
-			'The Space Merchant Realms server is on the web at '.URL;
+			'You changed your email address registered with SMR and need to revalidate now!' . EOL . EOL .
+			'   Your new validation code is: ' . $this->getValidationCode() . EOL . EOL .
+			'The Space Merchant Realms server is on the web at ' . URL;
 
 		$mail = setupMailer();
 		$mail->Subject = 'Your validation code!';
@@ -681,7 +681,7 @@ 
 	}
 
 	public function setFontSize($size) {
-		if($this->fontSize==$size)
+		if ($this->fontSize == $size)
 			return;
 		$this->fontSize = $size;
 		$this->hasChanged = true;
@@ -695,7 +695,7 @@ 
 
 	// sets the extra CSS file linked in preferences
 	public function setCssLink($link) {
-		if($this->cssLink==$link)
+		if ($this->cssLink == $link)
 			return;
 		$this->cssLink = $link;
 		$this->hasChanged = true;
@@ -707,11 +707,11 @@ 
 	}
 
 	public function setTemplate($template) {
-		if($this->template==$template)
+		if ($this->template == $template)
 			return;
-		if(!in_array($template,array_keys(Globals::getAvailableTemplates())))
-			throw new Exception('Template not allowed: '.$template);
-		$this->db->query('UPDATE account SET template = ' . $this->db->escapeString($template) . ' WHERE '.$this->SQL.' LIMIT 1');
+		if (!in_array($template, array_keys(Globals::getAvailableTemplates())))
+			throw new Exception('Template not allowed: ' . $template);
+		$this->db->query('UPDATE account SET template = ' . $this->db->escapeString($template) . ' WHERE ' . $this->SQL . ' LIMIT 1');
 		$this->template = $template;
 		$colourSchemes = Globals::getAvailableColourSchemes($template);
 		$this->setColourScheme($colourSchemes[0]);
@@ -722,10 +722,10 @@ 
 	}
 
 	public function setColourScheme($colourScheme) {
-		if($this->colourScheme==$colourScheme)
+		if ($this->colourScheme == $colourScheme)
 			return;
-		if(!in_array($colourScheme,array_keys(Globals::getAvailableColourSchemes($this->getTemplate()))))
-			throw new Exception('Colour scheme not allowed: '.$colourScheme);
+		if (!in_array($colourScheme, array_keys(Globals::getAvailableColourSchemes($this->getTemplate()))))
+			throw new Exception('Colour scheme not allowed: ' . $colourScheme);
 		$this->colourScheme = $colourScheme;
 		$this->hasChanged = true;
 		$this->update();
@@ -745,7 +745,7 @@ 
 	 * The Hall Of Fame name is not html-escaped in the database, so to display
 	 * it correctly we must escape html entities.
 	 */
-	public function getHofDisplayName($linked=false) {
+	public function getHofDisplayName($linked = false) {
 		$hofDisplayName = htmlspecialchars($this->getHofName());
 		if ($linked) {
 			return '<a href="' . $this->getPersonalHofHREF() . '">' . $hofDisplayName . '</a>';
@@ -759,7 +759,7 @@ 
 	}
 
 	public function setHofName($name) {
-		if($this->hofName==$name)
+		if ($this->hofName == $name)
 			return;
 		$this->hofName = $name;
 		$this->hasChanged = true;
@@ -771,7 +771,7 @@ 
 	}
 
 	public function setIrcNick($nick) {
-		if($this->ircNick==$nick)
+		if ($this->ircNick == $nick)
 			return;
 		$this->ircNick = $nick;
 		$this->hasChanged = true;
@@ -792,7 +792,7 @@ 
 	}
 
 	public function getReferralLink() {
-		return URL . '/login_create.php?ref='.$this->getAccountID();
+		return URL . '/login_create.php?ref=' . $this->getAccountID();
 	}
 
 	public function getShortDateFormat() {
@@ -800,7 +800,7 @@ 
 	}
 
 	public function setShortDateFormat($format) {
-		if($this->dateShort==$format)
+		if ($this->dateShort == $format)
 			return;
 		$this->dateShort = $format;
 		$this->hasChanged = true;
@@ -812,7 +812,7 @@ 
 	}
 
 	public function setShortTimeFormat($format) {
-		if($this->timeShort==$format)
+		if ($this->timeShort == $format)
 			return;
 		$this->timeShort = $format;
 		$this->hasChanged = true;
@@ -824,15 +824,15 @@ 
 	}
 
 	protected function setValidationCode($code) {
-		if($this->validation_code == $code)
+		if ($this->validation_code == $code)
 			return;
-		$this->validation_code=$code;
-		$this->hasChanged=true;
+		$this->validation_code = $code;
+		$this->hasChanged = true;
 		$this->update();
 	}
 
 	public function setValidated($bool) {
-		if($this->validated == $bool)
+		if ($this->validated == $bool)
 			return;
 		$this->validated = $bool;
 		$this->hasChanged = true;
@@ -844,7 +844,7 @@ 
 	}
 
 	public function isLoggedIn() {
-		$this->db->query('SELECT 1 FROM active_session WHERE account_id = '.$this->db->escapeNumber($this->getAccountID()).' LIMIT 1');
+		$this->db->query('SELECT 1 FROM active_session WHERE account_id = ' . $this->db->escapeNumber($this->getAccountID()) . ' LIMIT 1');
 		return $this->db->nextRecord();
 	}
 
@@ -885,15 +885,15 @@ 
 		$this->update();
 	}
 
-	public function addAuthMethod($loginType,$authKey) {
-		$this->db->query('SELECT account_id FROM account_auth WHERE login_type='.$this->db->escapeString($loginType).' AND auth_key = '.$this->db->escapeString($authKey).';');
-		if($this->db->nextRecord()) {
-			if($this->db->getInt('account_id')!=$this->getAccountID()) {
+	public function addAuthMethod($loginType, $authKey) {
+		$this->db->query('SELECT account_id FROM account_auth WHERE login_type=' . $this->db->escapeString($loginType) . ' AND auth_key = ' . $this->db->escapeString($authKey) . ';');
+		if ($this->db->nextRecord()) {
+			if ($this->db->getInt('account_id') != $this->getAccountID()) {
 				throw new Exception('Another account already uses this form of auth.');
 			}
 			return true;
 		}
-		$this->db->query('INSERT INTO account_auth values ('.$this->db->escapeNumber($this->getAccountID()).','.$this->db->escapeString($loginType).','.$this->db->escapeString($authKey).');');
+		$this->db->query('INSERT INTO account_auth values (' . $this->db->escapeNumber($this->getAccountID()) . ',' . $this->db->escapeString($loginType) . ',' . $this->db->escapeString($authKey) . ');');
 		return true;
 	}
 
@@ -906,10 +906,10 @@ 
 	}
 
 	protected function setPasswordReset($passwordReset) {
-		if($this->passwordReset == $passwordReset)
+		if ($this->passwordReset == $passwordReset)
 			return;
-		$this->passwordReset=$passwordReset;
-		$this->hasChanged=true;
+		$this->passwordReset = $passwordReset;
+		$this->hasChanged = true;
 		$this->update();
 	}
 
@@ -918,7 +918,7 @@ 
 	}
 
 	public function setDisplayShipImages($yesNo) {
-		if($this->images == $yesNo)
+		if ($this->images == $yesNo)
 			return;
 		$this->images = $yesNo;
 		$this->hasChanged = true;
@@ -930,10 +930,10 @@ 
 	}
 
 	public function setUseAJAX($bool) {
-		if($this->useAJAX == $bool)
+		if ($this->useAJAX == $bool)
 			return;
-		$this->useAJAX=$bool;
-		$this->hasChanged=true;
+		$this->useAJAX = $bool;
+		$this->hasChanged = true;
 		$this->update();
 	}
 
@@ -942,16 +942,16 @@ 
 	}
 
 	public function setDefaultCSSEnabled($bool) {
-		if($this->defaultCSSEnabled == $bool)
+		if ($this->defaultCSSEnabled == $bool)
 			return;
-		$this->defaultCSSEnabled=$bool;
-		$this->hasChanged=true;
+		$this->defaultCSSEnabled = $bool;
+		$this->hasChanged = true;
 		$this->update();
 	}
 
 	public function getHotkeys($hotkeyType = false) {
-		if($hotkeyType!==false) {
-			if(isset($this->hotkeys[$hotkeyType])) {
+		if ($hotkeyType !== false) {
+			if (isset($this->hotkeys[$hotkeyType])) {
 				return $this->hotkeys[$hotkeyType];
 			}
 			else {
@@ -961,42 +961,42 @@ 
 		return $this->hotkeys;
 	}
 
-	public function setHotkey($hotkeyType,$binding) {
-		if($this->getHotkeys($hotkeyType) == $binding)
+	public function setHotkey($hotkeyType, $binding) {
+		if ($this->getHotkeys($hotkeyType) == $binding)
 			return;
 		$this->hotkeys[$hotkeyType] = $binding;
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 		$this->update();
 	}
 
 	public function isReceivingMessageNotifications($messageTypeID) {
-		return isset($this->messageNotifications[$messageTypeID])?$this->messageNotifications[$messageTypeID]>0:false;
+		return isset($this->messageNotifications[$messageTypeID]) ? $this->messageNotifications[$messageTypeID] > 0 : false;
 	}
 
 	public function getMessageNotifications($messageTypeID) {
-		return isset($this->messageNotifications[$messageTypeID])?$this->messageNotifications[$messageTypeID]:0;
+		return isset($this->messageNotifications[$messageTypeID]) ? $this->messageNotifications[$messageTypeID] : 0;
 	}
 
-	public function setMessageNotifications($messageTypeID,$num) {
-		if($this->getMessageNotifications($messageTypeID) == $num)
+	public function setMessageNotifications($messageTypeID, $num) {
+		if ($this->getMessageNotifications($messageTypeID) == $num)
 			return;
-		$this->messageNotifications[$messageTypeID]=$num;
-		$this->hasChanged=true;
+		$this->messageNotifications[$messageTypeID] = $num;
+		$this->hasChanged = true;
 		$this->update();
 	}
 
-	public function increaseMessageNotifications($messageTypeID,$num) {
-		if($num==0)
+	public function increaseMessageNotifications($messageTypeID, $num) {
+		if ($num == 0)
 			return;
-		if($num<0)
+		if ($num < 0)
 			throw new Exception('You cannot increase by a negative amount');
 		$this->setMessageNotifications($messageTypeID, $this->getMessageNotifications($messageTypeID) + $num);
 	}
 
-	public function decreaseMessageNotifications($messageTypeID,$num) {
-		if($num==0)
+	public function decreaseMessageNotifications($messageTypeID, $num) {
+		if ($num == 0)
 			return;
-		if($num<0)
+		if ($num < 0)
 			throw new Exception('You cannot decrease by a negative amount');
 		$this->setMessageNotifications($messageTypeID, $this->getMessageNotifications($messageTypeID) - $num);
 	}
@@ -1006,10 +1006,10 @@ 
 	}
 
 	public function setCenterGalaxyMapOnPlayer($bool) {
-		if($this->centerGalaxyMapOnPlayer == $bool)
+		if ($this->centerGalaxyMapOnPlayer == $bool)
 			return;
-		$this->centerGalaxyMapOnPlayer=$bool;
-		$this->hasChanged=true;
+		$this->centerGalaxyMapOnPlayer = $bool;
+		$this->hasChanged = true;
 		$this->update();
 	}
 
@@ -1018,26 +1018,26 @@ 
 	}
 
 	public function isMailBanned() {
-		return $this->mailBanned>TIME;
+		return $this->mailBanned > TIME;
 	}
 
 	public function setMailBanned($time) {
-		if($this->mailBanned == $time)
+		if ($this->mailBanned == $time)
 			return;
-		$this->mailBanned=$time;
-		$this->hasChanged=true;
+		$this->mailBanned = $time;
+		$this->hasChanged = true;
 	}
 
 	public function increaseMailBanned($increaseTime) {
-		$time = max(TIME,$this->getMailBanned());
-		$this->setMailBanned($time+$increaseTime);
+		$time = max(TIME, $this->getMailBanned());
+		$this->setMailBanned($time + $increaseTime);
 	}
 	
 	public function getPermissions() {
-		if(!isset($this->permissions)) {
+		if (!isset($this->permissions)) {
 			$this->permissions = array();
 			$this->db->query('SELECT permission_id FROM account_has_permission WHERE ' . $this->SQL);
-			while($this->db->nextRecord()) {
+			while ($this->db->nextRecord()) {
 				$this->permissions[$this->db->getInt('permission_id')] = true;
 			}
 		}
@@ -1046,28 +1046,28 @@ 
 
 	public function hasPermission($permissionID = false) {
 		$permissions = $this->getPermissions();
-		if($permissionID === false) {
+		if ($permissionID === false) {
 			return count($permissions) > 0;
 		}
 		return isset($permissions[$permissionID]) ? $permissions[$permissionID] : false;
 	}
 
 	public function getPoints() {
-		if(!isset($this->points)) {
-			$this->points=0;
+		if (!isset($this->points)) {
+			$this->points = 0;
 			$this->db->lockTable('account_has_points');
-			$this->db->query('SELECT * FROM account_has_points WHERE '.$this->SQL.' LIMIT 1');
-			if($this->db->nextRecord()) {
-				$this->points=$this->db->getInt('points');
+			$this->db->query('SELECT * FROM account_has_points WHERE ' . $this->SQL . ' LIMIT 1');
+			if ($this->db->nextRecord()) {
+				$this->points = $this->db->getInt('points');
 				$lastUpdate = $this->db->getInt('last_update');
 				//we are gonna check for reducing points...
-				if($this->points>0 && $lastUpdate < TIME - (7 * 86400)) {
-					$removePoints=0;
-					while($lastUpdate < TIME - (7 * 86400)) {
+				if ($this->points > 0 && $lastUpdate < TIME - (7 * 86400)) {
+					$removePoints = 0;
+					while ($lastUpdate < TIME - (7 * 86400)) {
 						$removePoints++;
 						$lastUpdate += (7 * 86400);
 					}
-					$this->removePoints($removePoints,$lastUpdate);
+					$this->removePoints($removePoints, $lastUpdate);
 				}
 			}
 			$this->db->unlock();
@@ -1075,30 +1075,30 @@ 
 		return $this->points;
 	}
 
-	public function setPoints($numPoints,$lastUpdate=false) {
-		$numPoints = max($numPoints,0);
-		if($this->getPoints()==$numPoints)
+	public function setPoints($numPoints, $lastUpdate = false) {
+		$numPoints = max($numPoints, 0);
+		if ($this->getPoints() == $numPoints)
 			return;
-		if ($this->points==0)
-			$this->db->query('INSERT INTO account_has_points (account_id, points, last_update) VALUES ('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($numPoints).', '.$this->db->escapeNumber($lastUpdate?$lastUpdate:TIME).')');
-		else if($numPoints<=0)
-			$this->db->query('DELETE FROM account_has_points WHERE '.$this->SQL.' LIMIT 1');
+		if ($this->points == 0)
+			$this->db->query('INSERT INTO account_has_points (account_id, points, last_update) VALUES (' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber($numPoints) . ', ' . $this->db->escapeNumber($lastUpdate ? $lastUpdate : TIME) . ')');
+		else if ($numPoints <= 0)
+			$this->db->query('DELETE FROM account_has_points WHERE ' . $this->SQL . ' LIMIT 1');
 		else
-			$this->db->query('UPDATE account_has_points SET points = '.$this->db->escapeNumber($numPoints).($lastUpdate ? ', last_update = '.$this->db->escapeNumber(TIME) : '').' WHERE '.$this->SQL.' LIMIT 1');
-		$this->points=$numPoints;
+			$this->db->query('UPDATE account_has_points SET points = ' . $this->db->escapeNumber($numPoints) . ($lastUpdate ? ', last_update = ' . $this->db->escapeNumber(TIME) : '') . ' WHERE ' . $this->SQL . ' LIMIT 1');
+		$this->points = $numPoints;
 	}
 
-	public function removePoints($numPoints,$lastUpdate=false) {
-		if($numPoints>0)
-			$this->setPoints($this->getPoints()-$numPoints,$lastUpdate);
+	public function removePoints($numPoints, $lastUpdate = false) {
+		if ($numPoints > 0)
+			$this->setPoints($this->getPoints() - $numPoints, $lastUpdate);
 	}
 
-	public function addPoints($numPoints,SmrAccount $admin,$reasonID,$suspicion) {
+	public function addPoints($numPoints, SmrAccount $admin, $reasonID, $suspicion) {
 		//do we have points
-		$this->setPoints($this->getPoints() + $numPoints,TIME);
+		$this->setPoints($this->getPoints() + $numPoints, TIME);
 		$totalPoints = $this->getPoints();
 		if ($totalPoints < 10)
-			return false;//leave scripts its only a warning
+			return false; //leave scripts its only a warning
 		elseif ($totalPoints < 20)
 			$days = 2;
 		elseif ($totalPoints < 30)
@@ -1106,7 +1106,7 @@ 
 		elseif ($totalPoints < 50)
 			$days = 7;
 		elseif ($totalPoints < 75)
-			$days = 15 ;
+			$days = 15;
 		elseif ($totalPoints < 100)
 			$days = 30;
 		elseif ($totalPoints < 125)
@@ -1120,13 +1120,13 @@ 
 		else
 			$days = 0; //Forever/indefinite
 
-		if($days==0) {
+		if ($days == 0) {
 			$expireTime = 0;
 		}
 		else {
 			$expireTime = TIME + $days * 86400;
 		}
-		$this->banAccount($expireTime,$admin,$reasonID,$suspicion);
+		$this->banAccount($expireTime, $admin, $reasonID, $suspicion);
 
 		return $days;
 	}
@@ -1153,12 +1153,12 @@ 
 		$this->hasChanged = true;
 	}
 
-	public function banAccount($expireTime,SmrAccount $admin,$reasonID,$suspicion,$removeExceptions = false) {
+	public function banAccount($expireTime, SmrAccount $admin, $reasonID, $suspicion, $removeExceptions = false) {
 		$this->db->query('REPLACE INTO account_is_closed
 					(account_id, reason_id, suspicion, expires)
-					VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($reasonID).', '.$this->db->escapeString($suspicion).', '.$this->db->escapeNumber($expireTime).')');
+					VALUES('.$this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber($reasonID) . ', ' . $this->db->escapeString($suspicion) . ', ' . $this->db->escapeNumber($expireTime) . ')');
 		$this->db->lockTable('active_session');
-		$this->db->query('DELETE FROM active_session WHERE '.$this->SQL.' LIMIT 1');
+		$this->db->query('DELETE FROM active_session WHERE ' . $this->SQL . ' LIMIT 1');
 		$this->db->unlock();
 
 		$this->db->query('INSERT INTO account_has_closing_history
@@ -1178,38 +1178,38 @@ 
 			$player->update();
 		}
 		$this->log(LOG_TYPE_ACCOUNT_CHANGES, 'Account closed by ' . $admin->getLogin() . '.');
-		if($removeExceptions!==false)
+		if ($removeExceptions !== false)
 			$this->db->query('DELETE FROM account_exceptions WHERE ' . $this->SQL);
 	}
 
-	public function unbanAccount(SmrAccount $admin = null,$currException=false) {
+	public function unbanAccount(SmrAccount $admin = null, $currException = false) {
 		$adminID = 0;
-		if($admin!==null)
+		if ($admin !== null)
 			$adminID = $admin->getAccountID();
 		$this->db->query('DELETE FROM account_is_closed WHERE ' . $this->SQL . ' LIMIT 1');
 		$this->db->query('INSERT INTO account_has_closing_history
 						(account_id, time, admin_id, action)
 						VALUES(' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber(TIME) . ', ' . $this->db->escapeNumber($adminID) . ', ' . $this->db->escapeString('Opened') . ')');
 		$this->db->query('UPDATE player SET last_turn_update = GREATEST(' . $this->db->escapeNumber(TIME) . ', last_turn_update) WHERE ' . $this->SQL);
-		if($admin!==null)
+		if ($admin !== null)
 			$this->log(LOG_TYPE_ACCOUNT_CHANGES, 'Account reopened by ' . $admin->getLogin() . '.');
 		else
 			$this->log(LOG_TYPE_ACCOUNT_CHANGES, 'Account automatically reopened.');
-		if($currException!==false)
+		if ($currException !== false)
 			$this->db->query('REPLACE INTO account_exceptions (account_id, reason)
 							VALUES (' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeString($currException) . ')');
 	}
 
 	public function getToggleAJAXHREF() {
 		global $var;
-		return SmrSession::getNewHREF(create_container('skeleton.php','toggle_processing.php',array('toggle'=>'AJAX','referrer'=>$var['body'])));
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'toggle_processing.php', array('toggle'=>'AJAX', 'referrer'=>$var['body'])));
 	}
 
 	public function getUserRankingHREF() {
-		return SmrSession::getNewHREF(create_container('skeleton.php','rankings_view.php'));
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'rankings_view.php'));
 	}
 
 	public function getPersonalHofHREF() {
-		return SmrSession::getNewHREF(create_container('skeleton.php','hall_of_fame_player_detail.php',array('account_id' => $this->getAccountID())));
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'hall_of_fame_player_detail.php', array('account_id' => $this->getAccountID())));
 	}
 }

lib/Default/DummyShip.class.php

Spacing +9 added lines, -9 removed lines

@@ -17,7 +17,7 @@ 
 		$this->cargo_left = $this->getCargoHolds();
 	}
 	protected function doFullUNO() {
-		foreach($this->getMaxHardware() as $hardwareTypeID => $max) {
+		foreach ($this->getMaxHardware() as $hardwareTypeID => $max) {
 			$this->hardware[$hardwareTypeID] = $max;
 			$this->oldHardware[$hardwareTypeID] = $max;
 		}
@@ -47,8 +47,8 @@ 
 	}
 	
 	public function getIllusionShip() {
-		if(!isset($this->illusionShip)) {
-			$this->illusionShip=false;
+		if (!isset($this->illusionShip)) {
+			$this->illusionShip = false;
 		}
 		return $this->illusionShip;
 	}
@@ -58,20 +58,20 @@ 
 		$db = new SmrMySqlDatabase();
 		$db->query('REPLACE INTO cached_dummys ' .
 					'(type, id, info) ' .
-					'VALUES (\'DummyShip\', '.$db->escapeString($this->getPlayer()->getPlayerName()).', '.$db->escapeString($cache).')');
+					'VALUES (\'DummyShip\', ' . $db->escapeString($this->getPlayer()->getPlayerName()) . ', ' . $db->escapeString($cache) . ')');
 		unserialize($cache);
 	}
 	
 	public static function getCachedDummyShip(AbstractSmrPlayer $player) {
-		if(!isset(self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()])) {
+		if (!isset(self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()])) {
 			$db = new SmrMySqlDatabase();
 			$db->query('SELECT info FROM cached_dummys
 						WHERE type = \'DummyShip\'
 						AND id = ' . $db->escapeString($player->getPlayerName()) . ' LIMIT 1');
-			if($db->nextRecord()) {
+			if ($db->nextRecord()) {
 				$return = unserialize($db->getField('info'));
 				$return->regenerate($player);
-				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] =& $return;
+				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] = & $return;
 			}
 			else {
 				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] = new DummyShip($player);
@@ -85,7 +85,7 @@ 
 		$db->query('SELECT id FROM cached_dummys
 					WHERE type = \'DummyShip\'');
 		$dummyNames = array();
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$dummyNames[] = $db->getField('id');
 		}
 		return $dummyNames;
@@ -94,7 +94,7 @@ 
 	
 	
 	public function __sleep() {
-		return array('gameID','weapons');
+		return array('gameID', 'weapons');
 	}
 	
 	public function __wakeup() {

lib/Default/SmrPlayer.class.php

Spacing +4 added lines, -4 removed lines

@@ -207,7 +207,7 @@ 
 	/**
 	 * Insert a new player into the database. Returns the new player object.
 	 */
-	public static function createPlayer($accountID, $gameID, $playerName, $raceID, $isNewbie, $npc=false) {
+	public static function createPlayer($accountID, $gameID, $playerName, $raceID, $isNewbie, $npc = false) {
 		// Put the player in a sector with an HQ
 		$startSectorID = self::getHome($gameID, $raceID);
 
@@ -1163,13 +1163,13 @@ 
 			$this->db->query('SELECT type,amount FROM player_hof WHERE ' . $this->SQL);
 			$this->HOF = array();
 			while ($this->db->nextRecord()) {
-				$hof =& $this->HOF;
+				$hof = & $this->HOF;
 				$typeList = explode(':', $this->db->getField('type'));
 				foreach ($typeList as $type) {
 					if (!isset($hof[$type])) {
 						$hof[$type] = array();
 					}
-					$hof =& $hof[$type];
+					$hof = & $hof[$type];
 				}
 				$hof = $this->db->getFloat('amount');
 			}
@@ -1611,7 +1611,7 @@ 
 			create_error('The saved sector must be in the box!');
 		}
 
-		$storedDestinations =& $this->getStoredDestinations();
+		$storedDestinations = & $this->getStoredDestinations();
 		foreach ($storedDestinations as &$sd) {
 			if ($sd['SectorID'] == $sectorID) {
 				$sd['OffsetTop'] = $offsetTop;

tools/npc/npc.php

Spacing +8 added lines, -8 removed lines

@@ -121,7 +121,7 @@ 
 		}
 
 		try {
-			$TRADE_ROUTE =& $GLOBALS['TRADE_ROUTE'];
+			$TRADE_ROUTE = & $GLOBALS['TRADE_ROUTE'];
 			debug('Action #' . $actions);
 
 			//We have to reload player on each loop
@@ -140,14 +140,14 @@ 
 			}
 
 			if (!isset($TRADE_ROUTE)) { //We only want to change trade route if there isn't already one set.
-				$TRADE_ROUTES =& findRoutes($player);
-				$TRADE_ROUTE =& changeRoute($TRADE_ROUTES);
+				$TRADE_ROUTES = & findRoutes($player);
+				$TRADE_ROUTE = & changeRoute($TRADE_ROUTES);
 			}
 
 			if ($player->isDead()) {
 				debug('Some evil person killed us, let\'s move on now.');
 				$previousContainer = null; //We died, we don't care what we were doing beforehand.
-				$TRADE_ROUTE =& changeRoute($TRADE_ROUTES); //Change route
+				$TRADE_ROUTE = & changeRoute($TRADE_ROUTES); //Change route
 				processContainer(create_container('death_processing.php'));
 			}
 			if ($player->getNewbieTurns() <= NEWBIE_TURNS_WARNING_LIMIT && $player->getNewbieWarning()) {
@@ -239,7 +239,7 @@ 
 							}
 							else {
 								//Move to next route or fed.
-								if (($TRADE_ROUTE =& changeRoute($TRADE_ROUTES)) === false) {
+								if (($TRADE_ROUTE = & changeRoute($TRADE_ROUTES)) === false) {
 									debug('Changing Route Failed');
 									processContainer(plotToFed($player));
 								}
@@ -271,7 +271,7 @@ 
 						}
 						else {
 							//Move to next route or fed.
-							if (($TRADE_ROUTE =& changeRoute($TRADE_ROUTES)) === false) {
+							if (($TRADE_ROUTE = & changeRoute($TRADE_ROUTES)) === false) {
 								debug('Changing Route Failed');
 								processContainer(plotToFed($player));
 							}
@@ -599,9 +599,9 @@ 
 	if (count($tradeRoutes) == 0)
 		return $false;
 	$routeKey = array_rand($tradeRoutes);
-	$tradeRoute =& $tradeRoutes[$routeKey];
+	$tradeRoute = & $tradeRoutes[$routeKey];
 	unset($tradeRoutes[$routeKey]);
-	$GLOBALS['TRADE_ROUTE'] =& $tradeRoute;
+	$GLOBALS['TRADE_ROUTE'] = & $tradeRoute;
 	debug('Switched route', $tradeRoute);
 	return $tradeRoute;
 }

lib/Default/ChessGame.class.php

Spacing +148 added lines, -149 removed lines

@@ -33,9 +33,9 @@ 
 					JOIN chess_game ON account_id = black_id OR account_id = white_id
 					WHERE end_time > ' . TIME . ' OR end_time IS NULL;');
 		$games = array();
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$game = self::getChessGame($db->getInt('chess_game_id'), $forceUpdate);
-			if($game->getCurrentTurnAccount()->isNPC()) {
+			if ($game->getCurrentTurnAccount()->isNPC()) {
 				$games[] = $game;
 			}
 		}
@@ -46,7 +46,7 @@ 
 		$db = new SmrMySqlDatabase();
 		$db->query('SELECT chess_game_id FROM chess_game WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND (black_id = ' . $db->escapeNumber($player->getAccountID()) . ' OR white_id = ' . $db->escapeNumber($player->getAccountID()) . ') AND (end_time > ' . TIME . ' OR end_time IS NULL);');
 		$games = array();
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$games[] = self::getChessGame($db->getInt('chess_game_id'));
 		}
 		return $games;
@@ -56,14 +56,14 @@ 
 		$db = new SmrMySqlDatabase();
 		$db->query('SELECT chess_game_id FROM chess_game WHERE black_id = ' . $db->escapeNumber($accountID) . ' OR white_id = ' . $db->escapeNumber($accountID) . ';');
 		$games = array();
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$games[] = self::getChessGame($db->getInt('chess_game_id'));
 		}
 		return $games;
 	}
 
-	public static function getChessGame($chessGameID,$forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_CHESS_GAMES[$chessGameID])) {
+	public static function getChessGame($chessGameID, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_CHESS_GAMES[$chessGameID])) {
 			self::$CACHE_CHESS_GAMES[$chessGameID] = new ChessGame($chessGameID);
 		}
 		return self::$CACHE_CHESS_GAMES[$chessGameID];
@@ -74,7 +74,7 @@ 
 		$this->db->query('SELECT *
 						FROM chess_game
 						WHERE chess_game_id=' . $this->db->escapeNumber($chessGameID) . ' LIMIT 1;');
-		if($this->db->nextRecord()) {
+		if ($this->db->nextRecord()) {
 			$this->chessGameID = $chessGameID;
 			$this->gameID = $this->db->getInt('game_id');
 			$this->startDate = $this->db->getInt('start_time');
@@ -94,9 +94,9 @@ 
 	}
 
 	public static function isPlayerChecked(array &$board, array &$hasMoved, $colour) {
-		foreach($board as &$row) {
-			foreach($row as &$p) {
-				if($p != null && $p->colour != $colour && $p->isAttacking($board, $hasMoved, true)) {
+		foreach ($board as &$row) {
+			foreach ($row as &$p) {
+				if ($p != null && $p->colour != $colour && $p->isAttacking($board, $hasMoved, true)) {
 					return true;
 				}
 			}
@@ -120,7 +120,7 @@ 
 					'King' => false
 				)
 			),
-			ChessPiece::PAWN => array(-1,-1)
+			ChessPiece::PAWN => array(-1, -1)
 		);
 	}
 
@@ -143,17 +143,17 @@ 
 		$this->resetHasMoved();
 
 		try {
-			while($db->nextRecord()) {
-				if($debugInfo === true) {
+			while ($db->nextRecord()) {
+				if ($debugInfo === true) {
 					echo 'x=', $db->getInt('start_x'), ', y=', $db->getInt('start_y'), ', endX=', $db->getInt('end_x'), ', endY=', $db->getInt('end_y'), ', forAccountID=', $db->getInt('move_id') % 2 == 1 ? $this->getWhiteID() : $this->getBlackID(), EOL;
 				}
-				if(0 != $this->tryMove($db->getInt('start_x'), $db->getInt('start_y'), $db->getInt('end_x'), $db->getInt('end_y'), $db->getInt('move_id') % 2 == 1 ? $this->getWhiteID() : $this->getBlackID())) {
+				if (0 != $this->tryMove($db->getInt('start_x'), $db->getInt('start_y'), $db->getInt('end_x'), $db->getInt('end_y'), $db->getInt('move_id') % 2 == 1 ? $this->getWhiteID() : $this->getBlackID())) {
 					break;
 				}
 			}
 		}
-		catch(Exception $e) {
-			if($debugInfo === true) {
+		catch (Exception $e) {
+			if ($debugInfo === true) {
 				echo $e->getMessage() . EOL . $e->getTraceAsString() . EOL;
 			}
 			// We probably tried an invalid move - move on.
@@ -161,10 +161,10 @@ 
 	}
 
 	public function getBoard() {
-		if($this->board == null) {
+		if ($this->board == null) {
 			$this->db->query('SELECT * FROM chess_game_pieces WHERE chess_game_id=' . $this->db->escapeNumber($this->chessGameID) . ';');
 			$pieces = array();
-			while($this->db->nextRecord()) {
+			while ($this->db->nextRecord()) {
 				$accountID = $this->db->getInt('account_id');
 				$pieces[] = new ChessPiece($this->chessGameID, $accountID, $this->getColourForAccountID($accountID), $this->db->getInt('piece_id'), $this->db->getInt('x'), $this->db->getInt('y'), $this->db->getInt('piece_no'));
 			}
@@ -179,20 +179,20 @@ 
 	}
 
 	public function getMoves() {
-		if($this->moves == null) {
+		if ($this->moves == null) {
 			$this->db->query('SELECT * FROM chess_game_moves WHERE chess_game_id = ' . $this->db->escapeNumber($this->chessGameID) . ' ORDER BY move_id;');
 			$this->moves = array();
 			$mate = false;
-			while($this->db->nextRecord()) {
+			while ($this->db->nextRecord()) {
 				$pieceTakenID = $this->db->getField('piece_taken') == null ? null : $this->db->getInt('piece_taken');
 				$this->moves[] = $this->createMove($this->db->getInt('piece_id'), $this->db->getInt('start_x'), $this->db->getInt('start_y'), $this->db->getInt('end_x'), $this->db->getInt('end_y'), $pieceTakenID, $this->db->getField('checked'), $this->db->getInt('move_id') % 2 == 1 ? self::PLAYER_WHITE : self::PLAYER_BLACK, $this->db->getField('castling'), $this->db->getBoolean('en_passant'), $this->db->getInt('promote_piece_id'));
 				$mate = $this->db->getField('checked') == 'MATE';
 			}
-			if(!$mate && $this->hasEnded()) {
-				if($this->getWinner() != 0) {
+			if (!$mate && $this->hasEnded()) {
+				if ($this->getWinner() != 0) {
 					$this->moves[] = ($this->getWinner() == $this->getWhiteID() ? 'Black' : 'White') . ' Resigned.';
 				}
-				else if(count($this->moves) < 2) {
+				else if (count($this->moves) < 2) {
 					$this->moves[] = 'Game Cancelled.';
 				}
 				else {
@@ -205,30 +205,30 @@ 
 
 	public function getFENString() {
 		$fen = '';
-		$board =& $this->getBoard();
+		$board = & $this->getBoard();
 		$blanks = 0;
-		for($y=0; $y < 8; $y++) {
-			if($y > 0) {
+		for ($y = 0; $y < 8; $y++) {
+			if ($y > 0) {
 				$fen .= '/';
 			}
-			for($x=0; $x < 8; $x++) {
-				if($board[$y][$x] == null) {
+			for ($x = 0; $x < 8; $x++) {
+				if ($board[$y][$x] == null) {
 					$blanks++;
 				}
 				else {
-					if($blanks > 0) {
+					if ($blanks > 0) {
 						$fen .= $blanks;
 						$blanks = 0;
 					}
 					$fen .= $board[$y][$x]->getPieceLetter();
 				}
 			}
-			if($blanks > 0) {
+			if ($blanks > 0) {
 				$fen .= $blanks;
 				$blanks = 0;
 			}
 		}
-		switch($this->getCurrentTurnColour()) {
+		switch ($this->getCurrentTurnColour()) {
 			case self::PLAYER_WHITE:
 				$fen .= ' w ';
 			break;
@@ -239,30 +239,30 @@ 
 
 		// Castling
 		$castling = '';
-		if($this->hasMoved[self::PLAYER_WHITE][ChessPiece::KING] !== true) {
-			if($this->hasMoved[self::PLAYER_WHITE][ChessPiece::ROOK]['King'] !== true) {
+		if ($this->hasMoved[self::PLAYER_WHITE][ChessPiece::KING] !== true) {
+			if ($this->hasMoved[self::PLAYER_WHITE][ChessPiece::ROOK]['King'] !== true) {
 				$castling .= 'K';
 			}
-			if($this->hasMoved[self::PLAYER_WHITE][ChessPiece::ROOK]['Queen'] !== true) {
+			if ($this->hasMoved[self::PLAYER_WHITE][ChessPiece::ROOK]['Queen'] !== true) {
 				$castling .= 'Q';
 			}
 		}
-		if($this->hasMoved[self::PLAYER_BLACK][ChessPiece::KING] !== true) {
-			if($this->hasMoved[self::PLAYER_BLACK][ChessPiece::ROOK]['King'] !== true) {
+		if ($this->hasMoved[self::PLAYER_BLACK][ChessPiece::KING] !== true) {
+			if ($this->hasMoved[self::PLAYER_BLACK][ChessPiece::ROOK]['King'] !== true) {
 				$castling .= 'k';
 			}
-			if($this->hasMoved[self::PLAYER_BLACK][ChessPiece::ROOK]['Queen'] !== true) {
+			if ($this->hasMoved[self::PLAYER_BLACK][ChessPiece::ROOK]['Queen'] !== true) {
 				$castling .= 'q';
 			}
 		}
-		if($castling == '') {
+		if ($castling == '') {
 			$castling = '-';
 		}
 		$fen .= $castling . ' ';
 
-		if($this->hasMoved[ChessPiece::PAWN][0] != -1) {
+		if ($this->hasMoved[ChessPiece::PAWN][0] != -1) {
 			$fen .= chr(ord('a') + $this->hasMoved[ChessPiece::PAWN][0]);
-			switch($this->hasMoved[ChessPiece::PAWN][1]) {
+			switch ($this->hasMoved[ChessPiece::PAWN][1]) {
 				case 3:
 					$fen .= '6';
 				break;
@@ -274,7 +274,7 @@ 
 		else {
 			$fen .= '-';
 		}
-		$fen .= ' 0 ' . floor(count($this->moves)/2);
+		$fen .= ' 0 ' . floor(count($this->moves) / 2);
 
 		return $fen;
 	}
@@ -282,14 +282,14 @@ 
 	private static function parsePieces(array $pieces) {
 		$board = array();
 		$row = array();
-		for($i=0;$i<8;$i++) {
+		for ($i = 0; $i < 8; $i++) {
 			$row[] = null;
 		}
-		for($i=0;$i<8;$i++) {
+		for ($i = 0; $i < 8; $i++) {
 			$board[] = $row;
 		}
-		foreach($pieces as $piece) {
-			if($board[$piece->getY()][$piece->getX()] != null) {
+		foreach ($pieces as $piece) {
+			if ($board[$piece->getY()][$piece->getX()] != null) {
 				throw new Exception('Two pieces found in the same tile.');
 			}
 			$board[$piece->getY()][$piece->getX()] = $piece;
@@ -300,8 +300,7 @@ 
 	public static function getStandardGame($chessGameID, AbstractSmrPlayer $whitePlayer, AbstractSmrPlayer $blackPlayer) {
 		$white = $whitePlayer->getAccountID();
 		$black = $blackPlayer->getAccountID();
-		return array
-			(
+		return array(
 				new ChessPiece($chessGameID, $black, self::PLAYER_BLACK, ChessPiece::ROOK, 0, 0),
 				new ChessPiece($chessGameID, $black, self::PLAYER_BLACK, ChessPiece::KNIGHT, 1, 0),
 				new ChessPiece($chessGameID, $black, self::PLAYER_BLACK, ChessPiece::BISHOP, 2, 0),
@@ -341,7 +340,7 @@ 
 	}
 
 	public static function insertNewGame($startDate, $endDate, AbstractSmrPlayer $whitePlayer, AbstractSmrPlayer $blackPlayer) {
-		if($startDate == null) {
+		if ($startDate == null) {
 			throw new Exception('Start date cannot be null.');
 		}
 
@@ -359,7 +358,7 @@ 
 	private static function insertPieces($chessGameID, AbstractSmrPlayer $whitePlayer, AbstractSmrPlayer $blackPlayer) {
 		$db = new SmrMySqlDatabase();
 		$pieces = self::getStandardGame($chessGameID, $whitePlayer, $blackPlayer);
-		foreach($pieces as $p) {
+		foreach ($pieces as $p) {
 			$db->query('INSERT INTO chess_game_pieces' .
 			'(chess_game_id,account_id,piece_id,x,y)' .
 			'values' .
@@ -371,63 +370,63 @@ 
 		// This move will be set as the most recent move
 		$this->lastMove = [
 			'From' => ['X' => $startX, 'Y' => $startY],
-			'To'   => ['X' => $endX,   'Y' => $endY],
+			'To'   => ['X' => $endX, 'Y' => $endY],
 		];
 
 		$otherPlayerColour = self::getOtherColour($playerColour);
-		if($pieceID == ChessPiece::KING) {
+		if ($pieceID == ChessPiece::KING) {
 			$this->hasMoved[$playerColour][ChessPiece::KING] = true;
 		}
 		// Check if the piece moving is a rook and mark it as moved to stop castling.
-		if($pieceID == ChessPiece::ROOK && ($startX == 0 || $startX == 7) && ($startY == ($playerColour == self::PLAYER_WHITE ? 7 : 0))) {
-			$this->hasMoved[$playerColour][ChessPiece::ROOK][$startX==0?'Queen':'King'] = true;
+		if ($pieceID == ChessPiece::ROOK && ($startX == 0 || $startX == 7) && ($startY == ($playerColour == self::PLAYER_WHITE ? 7 : 0))) {
+			$this->hasMoved[$playerColour][ChessPiece::ROOK][$startX == 0 ? 'Queen' : 'King'] = true;
 		}
 		// Check if we've taken a rook and marked them as moved, if they've already moved this does nothing, but if they were taken before moving this stops an issue with trying to castle with a non-existent castle.
-		if($pieceTaken == ChessPiece::ROOK && ($endX == 0 || $endX == 7) && $endY == ($otherPlayerColour == self::PLAYER_WHITE ? 7 : 0)) {
-			$this->hasMoved[$otherPlayerColour][ChessPiece::ROOK][$endX==0?'Queen':'King'] = true;
+		if ($pieceTaken == ChessPiece::ROOK && ($endX == 0 || $endX == 7) && $endY == ($otherPlayerColour == self::PLAYER_WHITE ? 7 : 0)) {
+			$this->hasMoved[$otherPlayerColour][ChessPiece::ROOK][$endX == 0 ? 'Queen' : 'King'] = true;
 		}
-		if($pieceID == ChessPiece::PAWN && ($startY == 1 || $startY == 6) && ($endY == 3 || $endY == 4)) {
+		if ($pieceID == ChessPiece::PAWN && ($startY == 1 || $startY == 6) && ($endY == 3 || $endY == 4)) {
 			$this->hasMoved[ChessPiece::PAWN] = array($endX, $endY);
 		}
 		else {
-			$this->hasMoved[ChessPiece::PAWN] = array(-1,-1);
+			$this->hasMoved[ChessPiece::PAWN] = array(-1, -1);
 		}
 		return ($castling == 'Queen' ? '0-0-0' : ($castling == 'King' ? '0-0' : ''))
 			. ChessPiece::getSymbolForPiece($pieceID, $playerColour)
-			. chr(ord('a')+$startX)
-			. (8-$startY)
+			. chr(ord('a') + $startX)
+			. (8 - $startY)
 			. ' '
 			. ($pieceTaken == null ? '' : ChessPiece::getSymbolForPiece($pieceTaken, $otherPlayerColour))
-			. chr(ord('a')+$endX)
-			. (8-$endY)
+			. chr(ord('a') + $endX)
+			. (8 - $endY)
 			. ($promotionPieceID == null ? '' : ChessPiece::getSymbolForPiece($promotionPieceID, $playerColour))
 			. ' '
-			. ($checking == null ? '' : ($checking == 'CHECK' ? '+' : '++') )
+			. ($checking == null ? '' : ($checking == 'CHECK' ? '+' : '++'))
 			. ($enPassant ? ' e.p.' : '');
 	}
 
 	public function isCheckmated($colour) {
 		$king = null;
-		foreach($this->board as $row) {
-			foreach($row as $piece) {
-				if($piece != null && $piece->pieceID == ChessPiece::KING && $piece->colour == $colour) {
+		foreach ($this->board as $row) {
+			foreach ($row as $piece) {
+				if ($piece != null && $piece->pieceID == ChessPiece::KING && $piece->colour == $colour) {
 					$king = $piece;
 					break;
 				}
 			}
 		}
-		if($king == null) {
+		if ($king == null) {
 			throw new Exception('Could not find the king: game id = ' . $this->chessGameID);
 		}
-		if(!self::isPlayerChecked($this->board, $this->getHasMoved(), $colour)) {
+		if (!self::isPlayerChecked($this->board, $this->getHasMoved(), $colour)) {
 			return false;
 		}
-		foreach($this->board as $row) {
-			foreach($row as $piece) {
-				if($piece != null && $piece->colour == $colour) {
+		foreach ($this->board as $row) {
+			foreach ($row as $piece) {
+				if ($piece != null && $piece->colour == $colour) {
 					$moves = $piece->getPossibleMoves($this->board, $this->getHasMoved());
 					//There are moves we can make, we are clearly not checkmated.
-					if(count($moves) > 0) {
+					if (count($moves) > 0) {
 						return false;
 					}
 				}
@@ -438,15 +437,15 @@ 
 
 	public static function isCastling($x, $toX) {
 		$movement = $toX - $x;
-		if(abs($movement) == 2) {
+		if (abs($movement) == 2) {
 			//To the left.
-			if($movement == -2) {
+			if ($movement == -2) {
 				return array('Type' => 'Queen',
 						'X' => 0,
 						'ToX' => 3
 					);
 			} //To the right
-			else if($movement == 2) {
+			else if ($movement == 2) {
 				return array('Type' => 'King',
 						'X' => 7,
 						'ToX' => 5
@@ -457,36 +456,36 @@ 
 	}
 
 	public static function movePiece(array &$board, array &$hasMoved, $x, $y, $toX, $toY, $pawnPromotionPiece = ChessPiece::QUEEN) {
-		if(!self::isValidCoord($x, $y, $board)) {
+		if (!self::isValidCoord($x, $y, $board)) {
 			throw new Exception('Invalid from coordinates, x=' . $x . ', y=' . $y);
 		}
-		if(!self::isValidCoord($toX, $toY, $board)) {
+		if (!self::isValidCoord($toX, $toY, $board)) {
 			throw new Exception('Invalid to coordinates, x=' . $toX . ', y=' . $toY);
 		}
 		$pieceTaken = $board[$toY][$toX];
 		$board[$toY][$toX] = $board[$y][$x];
-		$p =& $board[$toY][$toX];
+		$p = & $board[$toY][$toX];
 		$board[$y][$x] = null;
-		if($p == null) {
+		if ($p == null) {
 			throw new Exception('Trying to move non-existent piece: ' . var_export($board, true));
 		}
 		$p->setX($toX);
 		$p->setY($toY);
 
 		$oldPawnMovement = $hasMoved[ChessPiece::PAWN];
-		$nextPawnMovement = array(-1,-1);
+		$nextPawnMovement = array(-1, -1);
 		$castling = false;
 		$enPassant = false;
 		$rookMoved = false;
 		$rookTaken = false;
 		$pawnPromotion = false;
-		if($p->pieceID == ChessPiece::KING) {
+		if ($p->pieceID == ChessPiece::KING) {
 			//Castling?
 			$castling = self::isCastling($x, $toX);
-			if($castling !== false) {
+			if ($castling !== false) {
 				$hasMoved[$p->colour][ChessPiece::KING] = true;
 				$hasMoved[$p->colour][ChessPiece::ROOK][$castling['Type']] = true;
-				if($board[$y][$castling['X']] == null) {
+				if ($board[$y][$castling['X']] == null) {
 					throw new Exception('Cannot castle with non-existent castle.');
 				}
 				$board[$toY][$castling['ToX']] = $board[$y][$castling['X']];
@@ -494,37 +493,37 @@ 
 				$board[$y][$castling['X']] = null;
 			}
 		}
-		else if($p->pieceID == ChessPiece::PAWN) {
-			if($toY == 0 || $toY == 7) {
+		else if ($p->pieceID == ChessPiece::PAWN) {
+			if ($toY == 0 || $toY == 7) {
 				$pawnPromotion = $p->promote($pawnPromotionPiece, $board);
 			}
 			//Double move to track?
-			else if(($y == 1 || $y == 6) && ($toY == 3 || $toY == 4)) {
+			else if (($y == 1 || $y == 6) && ($toY == 3 || $toY == 4)) {
 				$nextPawnMovement = array($toX, $toY);
 			}
 			//En passant?
-			else if($hasMoved[ChessPiece::PAWN][0] == $toX &&
+			else if ($hasMoved[ChessPiece::PAWN][0] == $toX &&
 					($hasMoved[ChessPiece::PAWN][1] == 3 && $toY == 2 || $hasMoved[ChessPiece::PAWN][1] == 4 && $toY == 5)) {
 				$enPassant = true;
 				$pieceTaken = $board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]];
-				if($board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] == null) {
+				if ($board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] == null) {
 					throw new Exception('Cannot en passant a non-existent pawn.');
 				}
 				$board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] = null;
 			}
 		}
-		else if($p->pieceID == ChessPiece::ROOK && ($x == 0 || $x == 7) && $y == ($p->colour == self::PLAYER_WHITE ? 7 : 0)) {
+		else if ($p->pieceID == ChessPiece::ROOK && ($x == 0 || $x == 7) && $y == ($p->colour == self::PLAYER_WHITE ? 7 : 0)) {
 			//Rook moved?
-			if($hasMoved[$p->colour][ChessPiece::ROOK][$x==0?'Queen':'King'] === false) {
+			if ($hasMoved[$p->colour][ChessPiece::ROOK][$x == 0 ? 'Queen' : 'King'] === false) {
 				// We set rook moved in here as it's used for move info.
-				$rookMoved = $x==0?'Queen':'King';
+				$rookMoved = $x == 0 ? 'Queen' : 'King';
 				$hasMoved[$p->colour][ChessPiece::ROOK][$rookMoved] = true;
 			}
 		}
 		// Check if we've taken a rook and marked them as moved, if they've already moved this does nothing, but if they were taken before moving this stops an issue with trying to castle with a non-existent castle.
-		if($pieceTaken != null && $pieceTaken->pieceID == ChessPiece::ROOK && ($toX == 0 || $toX == 7) && $toY == ($pieceTaken->colour == self::PLAYER_WHITE ? 7 : 0)) {
-			if($hasMoved[$pieceTaken->colour][ChessPiece::ROOK][$toX==0?'Queen':'King'] === false) {
-				$rookTaken = $toX==0?'Queen':'King';
+		if ($pieceTaken != null && $pieceTaken->pieceID == ChessPiece::ROOK && ($toX == 0 || $toX == 7) && $toY == ($pieceTaken->colour == self::PLAYER_WHITE ? 7 : 0)) {
+			if ($hasMoved[$pieceTaken->colour][ChessPiece::ROOK][$toX == 0 ? 'Queen' : 'King'] === false) {
+				$rookTaken = $toX == 0 ? 'Queen' : 'King';
 				$hasMoved[$pieceTaken->colour][ChessPiece::ROOK][$rookTaken] = true;
 			}
 		}
@@ -541,18 +540,18 @@ 
 	}
 
 	public static function undoMovePiece(array &$board, array &$hasMoved, $x, $y, $toX, $toY, $moveInfo) {
-		if(!self::isValidCoord($x, $y, $board)) {
+		if (!self::isValidCoord($x, $y, $board)) {
 			throw new Exception('Invalid from coordinates, x=' . $x . ', y=' . $y);
 		}
-		if(!self::isValidCoord($toX, $toY, $board)) {
+		if (!self::isValidCoord($toX, $toY, $board)) {
 			throw new Exception('Invalid to coordinates, x=' . $toX . ', y=' . $toY);
 		}
-		if($board[$y][$x] != null) {
+		if ($board[$y][$x] != null) {
 			throw new Exception('Undoing move onto another piece? x=' . $x . ', y=' . $y);
 		}
 		$board[$y][$x] = $board[$toY][$toX];
-		$p =& $board[$y][$x];
-		if($p == null) {
+		$p = & $board[$y][$x];
+		if ($p == null) {
 			throw new Exception('Trying to undo move of a non-existent piece: ' . var_export($board, true));
 		}
 		$board[$toY][$toX] = $moveInfo['PieceTaken'];
@@ -561,12 +560,12 @@ 
 
 		$hasMoved[ChessPiece::PAWN] = $moveInfo['OldPawnMovement'];
 		//Castling
-		if($p->pieceID == ChessPiece::KING) {
+		if ($p->pieceID == ChessPiece::KING) {
 			$castling = self::isCastling($x, $toX);
-			if($castling !== false) {
+			if ($castling !== false) {
 				$hasMoved[$p->colour][ChessPiece::KING] = false;
 				$hasMoved[$p->colour][ChessPiece::ROOK][$castling['Type']] = false;
-				if($board[$toY][$castling['ToX']] == null) {
+				if ($board[$toY][$castling['ToX']] == null) {
 					throw new Exception('Cannot undo castle with non-existent castle.');
 				}
 				$board[$y][$castling['X']] = $board[$toY][$castling['ToX']];
@@ -574,25 +573,25 @@ 
 				$board[$toY][$castling['ToX']] = null;
 			}
 		}
-		else if($moveInfo['EnPassant'] === true) {
+		else if ($moveInfo['EnPassant'] === true) {
 			$board[$toY][$toX] = null;
 			$board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] = $moveInfo['PieceTaken'];
 		}
-		else if($moveInfo['RookMoved'] !== false) {
+		else if ($moveInfo['RookMoved'] !== false) {
 			$hasMoved[$p->colour][ChessPiece::ROOK][$moveInfo['RookMoved']] = false;
 		}
-		if($moveInfo['RookTaken'] !== false) {
+		if ($moveInfo['RookTaken'] !== false) {
 			$hasMoved[$moveInfo['PieceTaken']->colour][ChessPiece::ROOK][$moveInfo['RookTaken']] = false;
 		}
 	}
 
 	public function tryAlgebraicMove($move) {
-		if(strlen($move) != 4 && strlen($move) != 5) {
+		if (strlen($move) != 4 && strlen($move) != 5) {
 			throw new Exception('Move of length "' . strlen($move) . '" is not valid, full move: ' . $move);
 		}
 		$aVal = ord('a');
 		$hVal = ord('h');
-		if(ord($move[0]) < $aVal || ord($move[2]) < $aVal
+		if (ord($move[0]) < $aVal || ord($move[2]) < $aVal
 				|| ord($move[0]) > $hVal || ord($move[2]) > $hVal
 				|| $move[1] < 1 || $move[3] < 1
 				|| $move[1] > 8 || $move[3] > 8) {
@@ -603,73 +602,73 @@ 
 		$toX = ord($move[2]) - $aVal;
 		$toY = 8 - $move[3];
 		$pawnPromotionPiece = null;
-		if(isset($move[4])) {
+		if (isset($move[4])) {
 			$pawnPromotionPiece = ChessPiece::getPieceForLetter($move[4]);
 		}
 		return $this->tryMove($x, $y, $toX, $toY, $this->getCurrentTurnAccountID(), $pawnPromotionPiece);
 	}
 
 	public function tryMove($x, $y, $toX, $toY, $forAccountID, $pawnPromotionPiece) {
-		if($this->hasEnded()) {
+		if ($this->hasEnded()) {
 			return 5;
 		}
-		if($this->getCurrentTurnAccountID() != $forAccountID) {
+		if ($this->getCurrentTurnAccountID() != $forAccountID) {
 			return 4;
 		}
 		$lastTurnPlayer = $this->getCurrentTurnPlayer();
 		$this->getBoard();
 		$p = $this->board[$y][$x];
-		if($p == null || $p->colour != $this->getColourForAccountID($forAccountID)) {
+		if ($p == null || $p->colour != $this->getColourForAccountID($forAccountID)) {
 			return 2;
 		}
 
 		$moves = $p->getPossibleMoves($this->board, $this->getHasMoved(), $forAccountID);
-		foreach($moves as $move) {
-			if($move[0]==$toX && $move[1]==$toY) {
+		foreach ($moves as $move) {
+			if ($move[0] == $toX && $move[1] == $toY) {
 				$chessType = $this->isNPCGame() ? 'Chess (NPC)' : 'Chess';
 				$currentPlayer = $this->getCurrentTurnPlayer();
 
 				$moveInfo = ChessGame::movePiece($this->board, $this->getHasMoved(), $x, $y, $toX, $toY, $pawnPromotionPiece);
 
 				//We have taken the move, we should refresh $p
-				$p =& $this->board[$toY][$toX];
+				$p = & $this->board[$toY][$toX];
 
 				$pieceTakenID = null;
-				if($moveInfo['PieceTaken'] != null) {
+				if ($moveInfo['PieceTaken'] != null) {
 					$pieceTakenID = $moveInfo['PieceTaken']->pieceID;
-					if($moveInfo['PieceTaken']->pieceID == ChessPiece::KING) {
+					if ($moveInfo['PieceTaken']->pieceID == ChessPiece::KING) {
 						throw new Exception('King was taken.');
 					}
 				}
 
 				$pieceID = $p->pieceID;
 				$pieceNo = $p->pieceNo;
-				if($moveInfo['PawnPromotion'] !== false) {
+				if ($moveInfo['PawnPromotion'] !== false) {
 					$p->pieceID = $moveInfo['PawnPromotion']['PieceID'];
 					$p->pieceNo = $moveInfo['PawnPromotion']['PieceNo'];
 				}
 
 				$checking = null;
-				if($p->isAttacking($this->board, $this->getHasMoved(), true)) {
+				if ($p->isAttacking($this->board, $this->getHasMoved(), true)) {
 					$checking = 'CHECK';
 				}
-				if($this->isCheckmated(self::getOtherColour($p->colour))) {
+				if ($this->isCheckmated(self::getOtherColour($p->colour))) {
 					$checking = 'MATE';
 				}
-				if($this->moves!=null) {
+				if ($this->moves != null) {
 					$this->moves[] = $this->createMove($pieceID, $x, $y, $toX, $toY, $pieceTakenID, $checking, $this->getCurrentTurnColour(), $moveInfo['Castling']['Type'], $moveInfo['EnPassant'], $moveInfo['PawnPromotion'] === false ? null : $moveInfo['PawnPromotion']['PieceID']);
 				}
-				if(self::isPlayerChecked($this->board, $this->getHasMoved(), $p->colour)) {
+				if (self::isPlayerChecked($this->board, $this->getHasMoved(), $p->colour)) {
 					return 3;
 				}
 
 				$otherPlayer = $this->getCurrentTurnPlayer();
-				if($moveInfo['PawnPromotion'] !== false) {
+				if ($moveInfo['PawnPromotion'] !== false) {
 					$piecePromotedSymbol = $p->getPieceSymbol();
-					$currentPlayer->increaseHOF(1, array($chessType,'Moves','Own Pawns Promoted','Total'), HOF_PUBLIC);
-					$otherPlayer->increaseHOF(1, array($chessType,'Moves','Opponent Pawns Promoted','Total'), HOF_PUBLIC);
-					$currentPlayer->increaseHOF(1, array($chessType,'Moves','Own Pawns Promoted',$piecePromotedSymbol), HOF_PUBLIC);
-					$otherPlayer->increaseHOF(1, array($chessType,'Moves','Opponent Pawns Promoted',$piecePromotedSymbol), HOF_PUBLIC);
+					$currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Own Pawns Promoted', 'Total'), HOF_PUBLIC);
+					$otherPlayer->increaseHOF(1, array($chessType, 'Moves', 'Opponent Pawns Promoted', 'Total'), HOF_PUBLIC);
+					$currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Own Pawns Promoted', $piecePromotedSymbol), HOF_PUBLIC);
+					$otherPlayer->increaseHOF(1, array($chessType, 'Moves', 'Opponent Pawns Promoted', $piecePromotedSymbol), HOF_PUBLIC);
 				}
 
 				$castlingType = $moveInfo['Castling'] === false ? null : $moveInfo['Castling']['Type'];
@@ -679,37 +678,37 @@ 
 								(' . $this->db->escapeNumber($p->chessGameID) . ',' . $this->db->escapeNumber($pieceID) . ',' . $this->db->escapeNumber($x) . ',' . $this->db->escapeNumber($y) . ',' . $this->db->escapeNumber($toX) . ',' . $this->db->escapeNumber($toY) . ',' . $this->db->escapeString($checking, true, true) . ',' . ($moveInfo['PieceTaken'] == null ? 'NULL' : $this->db->escapeNumber($moveInfo['PieceTaken']->pieceID)) . ',' . $this->db->escapeString($castlingType, true, true) . ',' . $this->db->escapeBoolean($moveInfo['EnPassant']) . ',' . ($moveInfo['PawnPromotion'] == false ? 'NULL' : $this->db->escapeNumber($moveInfo['PawnPromotion']['PieceID'])) . ');');
 
 
-				$currentPlayer->increaseHOF(1, array($chessType,'Moves','Total Taken'), HOF_PUBLIC);
-				if($moveInfo['PieceTaken'] != null) {
+				$currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Total Taken'), HOF_PUBLIC);
+				if ($moveInfo['PieceTaken'] != null) {
 					$this->db->query('DELETE FROM chess_game_pieces
 									WHERE chess_game_id=' . $this->db->escapeNumber($this->chessGameID) . ' AND account_id=' . $this->db->escapeNumber($moveInfo['PieceTaken']->accountID) . ' AND piece_id=' . $this->db->escapeNumber($moveInfo['PieceTaken']->pieceID) . ' AND piece_no=' . $this->db->escapeNumber($moveInfo['PieceTaken']->pieceNo) . ';');
 
 					$pieceTakenSymbol = $moveInfo['PieceTaken']->getPieceSymbol();
-					$currentPlayer->increaseHOF(1, array($chessType,'Moves','Opponent Pieces Taken','Total'), HOF_PUBLIC);
-					$otherPlayer->increaseHOF(1, array($chessType,'Moves','Own Pieces Taken','Total'), HOF_PUBLIC);
-					$currentPlayer->increaseHOF(1, array($chessType,'Moves','Opponent Pieces Taken',$pieceTakenSymbol), HOF_PUBLIC);
-					$otherPlayer->increaseHOF(1, array($chessType,'Moves','Own Pieces Taken',$pieceTakenSymbol), HOF_PUBLIC);
+					$currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Opponent Pieces Taken', 'Total'), HOF_PUBLIC);
+					$otherPlayer->increaseHOF(1, array($chessType, 'Moves', 'Own Pieces Taken', 'Total'), HOF_PUBLIC);
+					$currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Opponent Pieces Taken', $pieceTakenSymbol), HOF_PUBLIC);
+					$otherPlayer->increaseHOF(1, array($chessType, 'Moves', 'Own Pieces Taken', $pieceTakenSymbol), HOF_PUBLIC);
 				}
 				$this->db->query('UPDATE chess_game_pieces
 							SET x=' . $this->db->escapeNumber($toX) . ', y=' . $this->db->escapeNumber($toY) .
 								($moveInfo['PawnPromotion'] !== false ? ', piece_id=' . $this->db->escapeNumber($moveInfo['PawnPromotion']['PieceID']) . ', piece_no=' . $this->db->escapeNumber($moveInfo['PawnPromotion']['PieceNo']) : '') . '
 							WHERE chess_game_id=' . $this->db->escapeNumber($this->chessGameID) . ' AND account_id=' . $this->db->escapeNumber($p->accountID) . ' AND piece_id=' . $this->db->escapeNumber($pieceID) . ' AND piece_no=' . $this->db->escapeNumber($pieceNo) . ';');
-				if($moveInfo['Castling'] !== false) {
+				if ($moveInfo['Castling'] !== false) {
 					$this->db->query('UPDATE chess_game_pieces
 								SET x=' . $this->db->escapeNumber($moveInfo['Castling']['ToX']) . '
 								WHERE chess_game_id=' . $this->db->escapeNumber($this->chessGameID) . ' AND account_id=' . $this->db->escapeNumber($p->accountID) . ' AND x = ' . $this->db->escapeNumber($moveInfo['Castling']['X']) . ' AND y = ' . $this->db->escapeNumber($y) . ';');
 				}
 				$return = 0;
-				if($checking == 'MATE') {
+				if ($checking == 'MATE') {
 					$this->setWinner($forAccountID);
 					$return = 1;
 					SmrPlayer::sendMessageFromCasino($lastTurnPlayer->getGameID(), $this->getCurrentTurnAccountID(), 'You have just lost [chess=' . $this->getChessGameID() . '] against [player=' . $lastTurnPlayer->getPlayerID() . '].');
 				}
 				else {
 					SmrPlayer::sendMessageFromCasino($lastTurnPlayer->getGameID(), $this->getCurrentTurnAccountID(), 'It is now your turn in [chess=' . $this->getChessGameID() . '] against [player=' . $lastTurnPlayer->getPlayerID() . '].');
-					if($checking == 'CHECK') {
-						$currentPlayer->increaseHOF(1, array($chessType,'Moves','Check Given'), HOF_PUBLIC);
-						$otherPlayer->increaseHOF(1, array($chessType,'Moves','Check Received'), HOF_PUBLIC);
+					if ($checking == 'CHECK') {
+						$currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Check Given'), HOF_PUBLIC);
+						$otherPlayer->increaseHOF(1, array($chessType, 'Moves', 'Check Received'), HOF_PUBLIC);
 					}
 				}
 				$currentPlayer->saveHOF();
@@ -748,10 +747,10 @@ 
 	}
 
 	public function getColourID($colour) {
-		if($colour == self::PLAYER_WHITE) {
+		if ($colour == self::PLAYER_WHITE) {
 			return $this->getWhiteID();
 		}
-		if($colour == self::PLAYER_BLACK) {
+		if ($colour == self::PLAYER_BLACK) {
 			return $this->getBlackID();
 		}
 	}
@@ -761,10 +760,10 @@ 
 	}
 
 	public function getColourForAccountID($accountID) {
-		if($accountID == $this->getWhiteID()) {
+		if ($accountID == $this->getWhiteID()) {
 			return self::PLAYER_WHITE;
 		}
-		if($accountID == $this->getBlackID()) {
+		if ($accountID == $this->getBlackID()) {
 			return self::PLAYER_BLACK;
 		}
 		return false;
@@ -792,8 +791,8 @@ 
 		$winningPlayer = $this->getColourPlayer($winnerColour);
 		$losingPlayer = $this->getColourPlayer(self::getOtherColour($winnerColour));
 		$chessType = $this->isNPCGame() ? 'Chess (NPC)' : 'Chess';
-		$winningPlayer->increaseHOF(1, array($chessType,'Games','Won'), HOF_PUBLIC);
-		$losingPlayer->increaseHOF(1, array($chessType,'Games','Lost'), HOF_PUBLIC);
+		$winningPlayer->increaseHOF(1, array($chessType, 'Games', 'Won'), HOF_PUBLIC);
+		$losingPlayer->increaseHOF(1, array($chessType, 'Games', 'Lost'), HOF_PUBLIC);
 		return array('Winner' => $winningPlayer, 'Loser' => $losingPlayer);
 	}
 
@@ -834,21 +833,21 @@ 
 	}
 
 	public static function getOtherColour($colour) {
-		if($colour == self::PLAYER_WHITE) {
+		if ($colour == self::PLAYER_WHITE) {
 			return self::PLAYER_BLACK;
 		}
-		if($colour == self::PLAYER_BLACK) {
+		if ($colour == self::PLAYER_BLACK) {
 			return self::PLAYER_WHITE;
 		}
 		return false;
 	}
 
 	public function resign($accountID) {
-		if($this->hasEnded() || !$this->getColourForAccountID($accountID)) {
+		if ($this->hasEnded() || !$this->getColourForAccountID($accountID)) {
 			return false;
 		}
 		// If only 1 person has moved then just end the game.
-		if(count($this->getMoves()) < 2) {
+		if (count($this->getMoves()) < 2) {
 			$this->endDate = TIME;
 			$this->db->query('UPDATE chess_game
 							SET end_time=' . $this->db->escapeNumber(TIME) . '
@@ -860,17 +859,17 @@ 
 			$winnerAccountID = $this->getColourID(self::getOtherColour($loserColour));
 			$results = $this->setWinner($winnerAccountID);
 			$chessType = $this->isNPCGame() ? 'Chess (NPC)' : 'Chess';
-			$results['Loser']->increaseHOF(1, array($chessType,'Games','Resigned'), HOF_PUBLIC);
+			$results['Loser']->increaseHOF(1, array($chessType, 'Games', 'Resigned'), HOF_PUBLIC);
 			SmrPlayer::sendMessageFromCasino($results['Winner']->getGameID(), $results['Winner']->getPlayerID(), '[player=' . $results['Loser']->getPlayerID() . '] just resigned against you in [chess=' . $this->getChessGameID() . '].');
 			return 0;
 		}
 	}
 
 	public function getPlayGameHREF() {
-		return SmrSession::getNewHREF(create_container('skeleton.php','chess_play.php',array('ChessGameID' => $this->chessGameID)));
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'chess_play.php', array('ChessGameID' => $this->chessGameID)));
 	}
 
 	public function getResignHREF() {
-		return SmrSession::getNewHREF(create_container('skeleton.php','chess_resign_processing.php',array('ChessGameID' => $this->chessGameID)));
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'chess_resign_processing.php', array('ChessGameID' => $this->chessGameID)));
 	}
 }