smrealms / smr

tools/testDistancePlotters.php

Spacing +19 added lines, -19 removed lines

@@ -8,50 +8,50 @@ 
 function testDistances($gameID)
 {
 	//Initialise cache for fairness
-	$galaxies =& SmrGalaxy::getGameGalaxies($gameID);
+	$galaxies = & SmrGalaxy::getGameGalaxies($gameID);
 	$galaxySectors = array();
-	foreach($galaxies as &$galaxy)
+	foreach ($galaxies as &$galaxy)
 	{
-		$galaxiesSectors[] =& $galaxy->getSectors();
+		$galaxiesSectors[] = & $galaxy->getSectors();
 	} unset($galaxy);
-	foreach($galaxiesSectors as &$galaxySectors)
+	foreach ($galaxiesSectors as &$galaxySectors)
 	{
-		foreach($galaxySectors as &$galaxySector)
+		foreach ($galaxySectors as &$galaxySector)
 		{
-			if($galaxySector->hasPort())
+			if ($galaxySector->hasPort())
 				$galaxySector->getPort();
 		} unset($galaxySector);
 	} unset($galaxySectors);
 	//Test plotters
 	$newTime = 0;
 	$oldTime = 0;
-	foreach($galaxiesSectors as &$galaxySectors)
+	foreach ($galaxiesSectors as &$galaxySectors)
 	{
-		foreach($galaxySectors as &$galaxySector)
+		foreach ($galaxySectors as &$galaxySector)
 		{
-			if($galaxySector->hasPort())
+			if ($galaxySector->hasPort())
 			{
-				$goodIDs =& $galaxySector->getPort()->getAllGoodIDs();
-				foreach($goodIDs as $goodID)
+				$goodIDs = & $galaxySector->getPort()->getAllGoodIDs();
+				foreach ($goodIDs as $goodID)
 				{
 					$transaction = $galaxySector->getPort->getGoodTransaction($goodID);
 					$time = microtime(true);
-					$newDI = getGoodDistanceNew($galaxySector,$goodID,$transaction);
+					$newDI = getGoodDistanceNew($galaxySector, $goodID, $transaction);
 					$newTime += microtime(true) - $time;
 					
 					$time = microtime(true);
-					$oldDI = getGoodDistanceOld($galaxySector,$goodID,$transaction);
+					$oldDI = getGoodDistanceOld($galaxySector, $goodID, $transaction);
 					$oldTime += microtime(true) - $time;
 					
-					if($newDI!=$oldDI)
+					if ($newDI != $oldDI)
 					{
-						echo 'Difference, new: '.$newDI.', old:'.$oldDI.', sector:'.$galaxySector->getSectorID().', good:'.$goodID.EOL;
+						echo 'Difference, new: ' . $newDI . ', old:' . $oldDI . ', sector:' . $galaxySector->getSectorID() . ', good:' . $goodID . EOL;
 					}
 				}
 			}
 		} unset($galaxySector);
 	} unset($galaxySectors);
-	echo 'New time: '.$newTime.', old time:'.$oldTime.EOL;
+	echo 'New time: ' . $newTime . ', old time:' . $oldTime . EOL;
 }
 
 
@@ -69,7 +69,7 @@ 
 		return $var['good_distance'];
 	}
 	$x = Globals::getGood($goodID);
-	switch($transaction)
+	switch ($transaction)
 	{
 		case 'Buy':
 			$x['TransactionType'] = 'Sell';
@@ -78,7 +78,7 @@ 
 			$x['TransactionType'] = 'Buy';
 	}
 	$di = Plotter::findDistanceToX($x, $sector, true);
-	if(is_object($di))
+	if (is_object($di))
 		$di = $di->getRelativeDistance();
 	$container['good_distance'] = $di;
 	return $di;
@@ -114,7 +114,7 @@ 
 		$distance = $sector_distance[$curr_sector_id];
 
 		// create a new sector object
-		$curr_sector =& SmrSector::getSector($sector->getGameID(), $curr_sector_id);
+		$curr_sector = & SmrSector::getSector($sector->getGameID(), $curr_sector_id);
 
 		// does the current sector buy/sell the good we're looking for?
         if ($good_distance != 0) {

tools/rerunChessGames.php

Spacing +5 added lines, -5 removed lines

@@ -6,21 +6,21 @@
 $db = new SmrMySqlDatabase();
 $db->query('DELETE FROM player_hof WHERE type LIKE \'Chess%\'');
 $db->query('SELECT chess_game_id FROM chess_game');
-while($db->nextRecord()) {
+while ($db->nextRecord()) {
 	$chessGameID = $db->getInt('chess_game_id');
-	$game =& ChessGame::getChessGame($chessGameID);
-	echo 'Running game ' . $chessGameID . ' for white id "' . $game->getWhiteID() . '", black id "' . $game->getBlackID() .'", winner "' . $game->getWinner() . '"' . EOL;
+	$game = & ChessGame::getChessGame($chessGameID);
+	echo 'Running game ' . $chessGameID . ' for white id "' . $game->getWhiteID() . '", black id "' . $game->getBlackID() . '", winner "' . $game->getWinner() . '"' . EOL;
 	echoChessMoves($game);
 	
 	$game->rerunGame(true);
-	echo 'Finished game ' . $chessGameID . ' for white id "' . $game->getWhiteID() . '", black id "' . $game->getBlackID() .'", winner "' . $game->getWinner() . '"' . EOL;
+	echo 'Finished game ' . $chessGameID . ' for white id "' . $game->getWhiteID() . '", black id "' . $game->getBlackID() . '", winner "' . $game->getWinner() . '"' . EOL;
 	echoChessMoves($game);
 }
 
 function echoChessMoves($game) {
 	echo 'Moves: ' . EOL;
 	$moves = $game->getMoves();
-	foreach($moves as $move) {
+	foreach ($moves as $move) {
 		echo $move . EOL;
 	}
 	echo EOL;

lib/autoload.inc

Spacing +4 added lines, -4 removed lines

@@ -54,17 +54,17 @@
 
 	$startPaths = array(ENGINE, LIB, ADMIN);
 	$midPaths = array($gameDir, 'Default/');
-	foreach($midPaths as $midPath) {
-		foreach($startPaths as $startPath) {
+	foreach ($midPaths as $midPath) {
+		foreach ($startPaths as $startPath) {
 			$filePath = $startPath . $midPath . $fileName;
-			if(is_file($filePath) && is_readable($filePath)) {
+			if (is_file($filePath) && is_readable($filePath)) {
 				$cache[$cacheKey] = $filePath;
 				return $filePath;
 			}
 		}
 	}
 	$filePath = WWW . $fileName;
-	if(is_file($filePath) && is_readable($filePath)) {
+	if (is_file($filePath) && is_readable($filePath)) {
 		$cache[$cacheKey] = $filePath;
 		return WWW . $fileName;
 	}

lib/Default/DummyPlayer.class.inc

Spacing +30 added lines, -30 removed lines

@@ -1,31 +1,31 @@ 
 <?php
 
 class DummyPlayer extends AbstractSmrPlayer {
-	public function __construct($gameID=0,$playerName='Dummy',$raceID=1,$experience=1000,$alignment=100,$allianceID=0,$shipTypeID=60) {
+	public function __construct($gameID = 0, $playerName = 'Dummy', $raceID = 1, $experience = 1000, $alignment = 100, $allianceID = 0, $shipTypeID = 60) {
 		parent::__construct();
 		$this->accountID				= 0;
-		$this->gameID					= (int) $gameID;
-		$this->playerName				= (string) $playerName;
+		$this->gameID = (int)$gameID;
+		$this->playerName = (string)$playerName;
 		$this->playerID					= 0;
 		$this->sectorID					= 0;
-		$this->lastSectorID				= 0;
+		$this->lastSectorID = 0;
 		$this->turns					= 1000;
-		$this->newbieTurns				= 0;
+		$this->newbieTurns = 0;
 		$this->lastNewsUpdate			= 0;
 		$this->dead						= false;
 		$this->landedOnPlanet			= false;
-		$this->lastActive				= 0;
-		$this->lastCPLAction			= 0;
-		$this->raceID					= (int) $raceID;
-		$this->credits					= 0;
-		$this->experience				= (int) $experience;
-		$this->alignment				= (int) $alignment;
-		$this->militaryPayment			= 0;
-		$this->allianceID				= (int) $allianceID;
-		$this->shipID					= (int) $shipTypeID;
+		$this->lastActive = 0;
+		$this->lastCPLAction = 0;
+		$this->raceID = (int)$raceID;
+		$this->credits = 0;
+		$this->experience				= (int)$experience;
+		$this->alignment = (int)$alignment;
+		$this->militaryPayment = 0;
+		$this->allianceID				= (int)$allianceID;
+		$this->shipID					= (int)$shipTypeID;
 		$this->kills					= 0;
 		$this->deaths					= 0;
-		$this->lastPort					= 0;
+		$this->lastPort = 0;
 		$this->bank						= 0;
 		$this->zoom						= 0;
 		
@@ -90,9 +90,9 @@ 
 	}
 	
 	public function setAllianceID($ID) {
-		if($this->allianceID == $ID)
+		if ($this->allianceID == $ID)
 			return;
-		$this->allianceID=$ID;
+		$this->allianceID = $ID;
 	}
 	
 	public function &killPlayerByPlayer(AbstractSmrPlayer $killer) {
@@ -126,7 +126,7 @@ 
 //		$this->sendMessage($killer->getAccountID(),MSG_PLAYER,'You <span class="red">DESTROYED</span> ' . $this->getPlayerName() . ' in sector <span class="blue">#' . $this->getSectorID() . '</span>',false);
 		
 		// The person who got the kill gains experience
-		$gainedExp = ceil(0.75*((((($this->getLevelID() - $killer->getLevelID()) / max($this->getLevelID(), $killer->getLevelID())) + 1) * 0.04 * $this->getExperience()) + (0.025 * $this->getExperience())));
+		$gainedExp = ceil(0.75 * ((((($this->getLevelID() - $killer->getLevelID()) / max($this->getLevelID(), $killer->getLevelID())) + 1) * 0.04 * $this->getExperience()) + (0.025 * $this->getExperience())));
 		
 		$return['KillerExp'] = $gainedExp;
 		$killer->increaseExperience($gainedExp);
@@ -135,7 +135,7 @@ 
 		// Dead player loses experience
 		$expLossPercentage = 0.20 + (($this->getLevelID() - $killer->getLevelID()) * 0.005);
 		$return['DeadExp'] = 0;
-		if($expLossPercentage > 0) {
+		if ($expLossPercentage > 0) {
 			$lostExp = floor($this->getExperience() * $expLossPercentage);
 			$return['DeadExp'] = $lostExp;
 			$this->decreaseExperience($lostExp);
@@ -152,18 +152,18 @@ 
 		$relation = $relations[$killer->getRaceID()];
 
 		$alignChangePerRelation = 0.1;
-		if($relation >= RELATIONS_PEACE || $relation <= RELATIONS_WAR)
+		if ($relation >= RELATIONS_PEACE || $relation <= RELATIONS_WAR)
 			$alignChangePerRelation = 0.04;
 
 		$alignChange = $relation * $alignChangePerRelation;
 		$return['KillerAlign'] = $alignChange;
-		if($alignChange>0)
+		if ($alignChange > 0)
 			$killer->increaseAlignment($alignChange);
 		else
 			$killer->decreaseAlignment(-$alignChange);
 		// War setting gives them military pay
-		if($relation <= RELATIONS_WAR) {
-			$killer->increaseMilitaryPayment(-floor($relation * 100 * (pow($gainedExp/2,0.25))));
+		if ($relation <= RELATIONS_WAR) {
+			$killer->increaseMilitaryPayment(-floor($relation * 100 * (pow($gainedExp / 2, 0.25))));
 		}
 		
 		//check for federal bounty being offered for current port raiders
@@ -192,17 +192,17 @@ 
 
 		// If the alignment difference is greater than 200 then a bounty may be set
 		$alignment_diff = abs($this->getAlignment() - $killer->getAlignment());
-		if($alignment_diff >= 200) {
+		if ($alignment_diff >= 200) {
 			// If the podded players alignment makes them deputy or member then set bounty
-			if($this->getAlignment() >= 100) {
+			if ($this->getAlignment() >= 100) {
 				$bounty_type = 'HQ';
 			}
 			else if ($this->getAlignment() <= 100) {
 				$bounty_type = 'UG';
 			}
 
-			if(isset($bounty_type)) {
-				$killer->increaseCurrentBountyAmount($bounty_type,floor(pow($alignment_diff, 2.56)));
+			if (isset($bounty_type)) {
+				$killer->increaseCurrentBountyAmount($bounty_type, floor(pow($alignment_diff, 2.56)));
 			}
 		}
 		
@@ -250,7 +250,7 @@ 
 		$db = new SmrMySqlDatabase();
 		$db->query('REPLACE INTO cached_dummys ' .
 					'(type, id, info) ' .
-					'VALUES (\'DummyPlayer\', '.$db->escapeString($this->getPlayerName()).', '.$db->escapeString($cache).')');	
+					'VALUES (\'DummyPlayer\', ' . $db->escapeString($this->getPlayerName()) . ', ' . $db->escapeString($cache) . ')');	
 		 unserialize($cache);
 	}
 	
@@ -259,7 +259,7 @@ 
 		$db->query('SELECT info FROM cached_dummys
 					WHERE type = \'DummyPlayer\'
 						AND id = ' . $db->escapeString($name) . ' LIMIT 1');
-		if($db->nextRecord()) {
+		if ($db->nextRecord()) {
 			$return = unserialize($db->getField('info'));
 			return $return;
 		}
@@ -274,7 +274,7 @@ 
 		$db->query('SELECT id FROM cached_dummys
 					WHERE type = \'DummyPlayer\'');
 		$dummyNames = array();
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$dummyNames[] = $db->getField('id');
 		}
 		return $dummyNames;

lib/Default/SmrScoutDrones.class.inc

Spacing +10 added lines, -10 removed lines

@@ -3,7 +3,7 @@ 
 class SmrScoutDrones extends AbstractSmrCombatWeapon {
 	protected $numberOfSDs;
 	
-	public function __construct($gameTypeID,$numberOfSDs) {
+	public function __construct($gameTypeID, $numberOfSDs) {
 		$this->gameTypeID = $gameTypeID;
 		$this->numberOfSDs = $numberOfSDs;
 		$this->name = 'Scout Drones';
@@ -25,19 +25,19 @@ 
 		return $modifiedAccuracy;
 	}
 	
-	public function getModifiedForceAccuracyAgainstPlayer(SmrForce $forces,AbstractSmrPlayer $targetPlayer) {
-		return $this->getModifiedForceAccuracyAgainstPlayerUsingRandom($forces,$targetPlayer,mt_rand(1,7) * mt_rand(1,7));
+	public function getModifiedForceAccuracyAgainstPlayer(SmrForce $forces, AbstractSmrPlayer $targetPlayer) {
+		return $this->getModifiedForceAccuracyAgainstPlayerUsingRandom($forces, $targetPlayer, mt_rand(1, 7) * mt_rand(1, 7));
 	}
 	
-	protected function getModifiedForceAccuracyAgainstPlayerUsingRandom(SmrForce $forces,AbstractSmrPlayer $targetPlayer, $random) {
+	protected function getModifiedForceAccuracyAgainstPlayerUsingRandom(SmrForce $forces, AbstractSmrPlayer $targetPlayer, $random) {
 		$modifiedAccuracy = $this->getModifiedAccuracy();
 		$modifiedAccuracy -= $targetPlayer->getLevelID() + $random;
 	
-		return max(0,min(100,$modifiedAccuracy));
+		return max(0, min(100, $modifiedAccuracy));
 	}
 	
-	public function getMaxModifiedForceAccuracyAgainstPlayer(SmrForce $forces,AbstractSmrPlayer $targetPlayer) {
-		return $this->getModifiedForceAccuracyAgainstPlayerUsingRandom($forces,$targetPlayer,49);
+	public function getMaxModifiedForceAccuracyAgainstPlayer(SmrForce $forces, AbstractSmrPlayer $targetPlayer) {
+		return $this->getModifiedForceAccuracyAgainstPlayerUsingRandom($forces, $targetPlayer, 49);
 	}
 	
 	public function &getModifiedDamage() {
@@ -76,12 +76,12 @@ 
 	}
 	
 	public function &getModifiedForceDamageAgainstPlayer(SmrForce $forces, AbstractSmrPlayer $targetPlayer) {
-		if(!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculated any damage mods.
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
-		$damage['Launched'] = ceil($this->getNumberOfSDs() * $this->getModifiedForceAccuracyAgainstPlayer($forces,$targetPlayer) / 100);
+		$damage = & $this->getModifiedDamage();
+		$damage['Launched'] = ceil($this->getNumberOfSDs() * $this->getModifiedForceAccuracyAgainstPlayer($forces, $targetPlayer) / 100);
 		$damage['MaxDamage'] = ceil($damage['Launched'] * $damage['MaxDamage']);
 		$damage['Shield'] = ceil($damage['Launched'] * $damage['Shield']);
 		$damage['Armour'] = ceil($damage['Launched'] * $damage['Armour']);

lib/Default/SmrSession.class.inc

Spacing +47 added lines, -47 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if(!defined('USING_AJAX'))
-	define('USING_AJAX',false);
+if (!defined('USING_AJAX'))
+	define('USING_AJAX', false);
 class SmrSession {
 	const ALWAYS_AVAILABLE = 999999;
 	const TIME_BEFORE_EXPIRY = 3600;
@@ -140,7 +140,7 @@ 
 	public static $lastSN;
 
 	protected static $previousAjaxReturns;
-	protected static $ajaxReturns=array();
+	protected static $ajaxReturns = array();
 
 	public static function init() {
 		// Initialize the db connector here, since `init` is always called
@@ -153,9 +153,9 @@ 
 		else {
 			// create a new session id
 			do {
-				self::$session_id = md5 (uniqid (mt_rand()) );
+				self::$session_id = md5(uniqid(mt_rand()));
 				self::$db->query('SELECT 1 FROM active_session WHERE session_id = ' . self::$db->escapeString(self::$session_id) . ' LIMIT 1');
-			} while(self::$db->nextRecord()); //Make sure we haven't somehow clashed with someone else's session.
+			} while (self::$db->nextRecord()); //Make sure we haven't somehow clashed with someone else's session.
 			setcookie('session_id', self::$session_id);
 		}
 
@@ -163,13 +163,13 @@ 
 		self::$db->query('DELETE FROM active_session WHERE last_accessed < ' . self::$db->escapeNumber(time() - self::TIME_BEFORE_EXPIRY));
 		self::fetchVarInfo();
 
-		if(!USING_AJAX && isset($_REQUEST['sn']) && isset(self::$var[$_REQUEST['sn']]) && !empty(self::$var[$_REQUEST['sn']])) {
+		if (!USING_AJAX && isset($_REQUEST['sn']) && isset(self::$var[$_REQUEST['sn']]) && !empty(self::$var[$_REQUEST['sn']])) {
 			$var = self::$var[$_REQUEST['sn']];
 			$currentPage = $var['url'] == 'skeleton.php' ? $var['body'] : $var['url'];
 			$loadDelay = isset(self::URL_LOAD_DELAY[$currentPage]) ? self::URL_LOAD_DELAY[$currentPage] : 0;
 			$initialTimeBetweenLoads = microtime(true) - $var['PreviousRequestTime'];
-			while(($timeBetweenLoads = microtime(true) - $var['PreviousRequestTime']) < $loadDelay) {
-				$sleepTime = round(($loadDelay-$timeBetweenLoads)*1000000);
+			while (($timeBetweenLoads = microtime(true) - $var['PreviousRequestTime']) < $loadDelay) {
+				$sleepTime = round(($loadDelay - $timeBetweenLoads) * 1000000);
 			//	echo 'Sleeping for: ' . $sleepTime . 'us';
 				usleep($sleepTime);
 			}
@@ -186,7 +186,7 @@ 
 			self::$session_id		= self::$db->getField('session_id');
 			self::$account_id		= self::$db->getInt('account_id');
 			self::$game_id			= self::$db->getInt('game_id');
-			self::$last_accessed	= self::$db->getInt('last_accessed');
+			self::$last_accessed = self::$db->getInt('last_accessed');
 			self::$var = @unserialize(@gzuncompress(self::$db->getField('session_var')));
 			self::$commonIDs	= array();
 			self::$lastSN = self::$db->getField('last_sn');
@@ -195,13 +195,13 @@ 
 			if (!empty($ajaxReturns)) {
 				self::$previousAjaxReturns = unserialize(gzuncompress($ajaxReturns));
 			}
-			if(!is_array(self::$var)) {
-				self::$account_id	= 0;
-				self::$game_id		= 0;
-				self::$var			= array();
+			if (!is_array(self::$var)) {
+				self::$account_id = 0;
+				self::$game_id = 0;
+				self::$var = array();
 			}
 			else {
-				foreach(self::$var as $key => &$value) {
+				foreach (self::$var as $key => &$value) {
 					if ($value['Expires'] > 0 && $value['Expires'] <= TIME) { // Use 0 for infinity
 						//This link is no longer valid
 						unset(self::$var[$key]);
@@ -212,7 +212,7 @@ 
 					}
 					else {
 						--$value['RemainingPageLoads'];
-						if(isset($value['CommonID'])) {
+						if (isset($value['CommonID'])) {
 							self::$commonIDs[$value['CommonID']] = $key;
 						}
 					}
@@ -221,25 +221,25 @@ 
 		}
 		else {
 			self::$generate = true;
-			self::$account_id	= 0;
+			self::$account_id = 0;
 			self::$game_id		= 0;
-			self::$var			= array();
-			self::$commonIDs	= array();
+			self::$var = array();
+			self::$commonIDs = array();
 		}
 	}
 
 	public static function update() {
-		foreach(self::$var as $key => &$value) {
+		foreach (self::$var as $key => &$value) {
 			if ($value['RemainingPageLoads'] <= 0) {
 				//This link was valid this load but will not be in the future, removing it now saves database space and data transfer.
 				unset(self::$var[$key]);
 			}
 		} unset($value);
 		$compressed = gzcompress(serialize(self::$var));
-		if(!self::$generate) {
+		if (!self::$generate) {
 			self::$db->query('UPDATE active_session SET account_id=' . self::$db->escapeNumber(self::$account_id) . ',game_id=' . self::$db->escapeNumber(self::$game_id) . (!USING_AJAX ? ',last_accessed=' . self::$db->escapeNumber(TIME) : '') . ',session_var=' . self::$db->escapeBinary($compressed) .
-					',last_sn='.self::$db->escapeString(self::$SN).
-					' WHERE session_id=' . self::$db->escapeString(self::$session_id) . (USING_AJAX ? ' AND last_sn='.self::$db->escapeString(self::$lastSN) : '') . ' LIMIT 1');
+					',last_sn=' . self::$db->escapeString(self::$SN) .
+					' WHERE session_id=' . self::$db->escapeString(self::$session_id) . (USING_AJAX ? ' AND last_sn=' . self::$db->escapeString(self::$lastSN) : '') . ' LIMIT 1');
 		}
 		else {
 			self::$db->query('DELETE FROM active_session WHERE account_id = ' . self::$db->escapeNumber(self::$account_id) . ' AND game_id = ' . self::$db->escapeNumber(self::$game_id));
@@ -276,8 +276,8 @@ 
 	}
 
 	public static function updateSN() {
-		if(!USING_AJAX)
-			self::$db->query('UPDATE active_session SET last_sn='.self::$db->escapeString(self::$SN).
+		if (!USING_AJAX)
+			self::$db->query('UPDATE active_session SET last_sn=' . self::$db->escapeString(self::$SN) .
 				' WHERE session_id=' . self::$db->escapeString(self::$session_id) . ' LIMIT 1');
 	}
 
@@ -289,11 +289,11 @@ 
 	}
 
 	public static function retrieveVar($sn) {
-		if(!isset(self::$var[$sn]) || empty(self::$var[$sn]))
+		if (!isset(self::$var[$sn]) || empty(self::$var[$sn]))
 			return false;
 		self::$SN = $sn;
 		SmrSession::updateSN();
-		if(isset(self::$var[$sn]['body']) && isset(self::$var[$sn]['CommonID'])) {
+		if (isset(self::$var[$sn]['body']) && isset(self::$var[$sn]['CommonID'])) {
 //			if(preg_match('/processing/',self::$var[$sn]['body']))
 			unset(self::$commonIDs[self::$var[$sn]['CommonID']]); //Do not store common id for current page
 			unset(self::$var[$sn]['CommonID']);
@@ -309,7 +309,7 @@ 
 	 * session so that it can still be retrieved when the page auto-refreshes.
 	 * This is the recommended way to get $_REQUEST data.
 	 */
-	public static function getRequestVar($varName, $default=null) {
+	public static function getRequestVar($varName, $default = null) {
 		global $var;
 		// Set the session var, if in $_REQUESTS or if a default is given
 		if (isset($_REQUEST[$varName])) {
@@ -325,31 +325,31 @@ 
 
 	public static function resetLink($container, $sn) { //Do not allow sharing SN, useful for forwarding.
 		global $lock;
-		if(isset(self::$var[$sn]['CommonID'])) {
+		if (isset(self::$var[$sn]['CommonID'])) {
 			unset(self::$commonIDs[self::$var[$sn]['CommonID']]); //Do not store common id for reset page, to allow refreshing to always give the same page in response
 		}
 		self::$SN = $sn;
-		if(!isset($container['Expires'])) {
+		if (!isset($container['Expires'])) {
 			$container['Expires'] = 0; // Lasts forever
 		}
-		if(!isset($container['RemainingPageLoads'])) {
+		if (!isset($container['RemainingPageLoads'])) {
 			$container['RemainingPageLoads'] = 1; // Allow refreshing
 		}
-		if(!isset($container['PreviousRequestTime'])) {
-			if(isset(self::$var[$sn]['PreviousRequestTime'])) {
+		if (!isset($container['PreviousRequestTime'])) {
+			if (isset(self::$var[$sn]['PreviousRequestTime'])) {
 				$container['PreviousRequestTime'] = self::$var[$sn]['PreviousRequestTime']; // Copy across the previous request time if not explicitly set.
 			}
 		}
 
 		self::$var[$sn] = $container;
-		if(!$lock && !USING_AJAX)
+		if (!$lock && !USING_AJAX)
 			self::update();
 		return $sn;
 	}
 
-	public static function updateVar($key,$value) {
+	public static function updateVar($key, $value) {
 		global $var;
-		if($value===null) {
+		if ($value === null) {
 			unset($var[$key]);
 			unset(self::$var[self::$SN][$key]);
 		}
@@ -365,15 +365,15 @@ 
 	}
 
 	public static function addLink($container, $sn = false) { // Container['ID'] MUST be unique to a specific action, if there will be two different outcomes from containers given the same ID then problems will likely arise.
-		if(!isset($container['Expires'])) {
+		if (!isset($container['Expires'])) {
 			$container['Expires'] = 0; // Lasts forever
 		}
-		if(!isset($container['RemainingPageLoads'])) {
+		if (!isset($container['RemainingPageLoads'])) {
 			$pageURL = $container['url'] == 'skeleton.php' ? $container['body'] : $container['url'];
 			$container['RemainingPageLoads'] = isset(self::URL_DEFAULT_REMAINING_PAGE_LOADS[$pageURL]) ? self::URL_DEFAULT_REMAINING_PAGE_LOADS[$pageURL] : 1; // Allow refreshing
 		}
 
-		if($sn === false) {
+		if ($sn === false) {
 			$sn = self::generateSN($container);
 		}
 		else {
@@ -386,14 +386,14 @@ 
 
 	protected static function generateSN(&$container) {
 		$container['CommonID'] = self::getCommonID($container);
-		if(isset(self::$commonIDs[$container['CommonID']])) {
+		if (isset(self::$commonIDs[$container['CommonID']])) {
 			$sn = self::$commonIDs[$container['CommonID']];
 			$container['PreviousRequestTime'] = isset(self::$var[$sn]) ? self::$var[$sn]['PreviousRequestTime'] : MICRO_TIME;
 		}
 		else {
 			do {
-				$sn = substr(md5(mt_rand()),0,8);
-			} while(isset(self::$var[$sn]));
+				$sn = substr(md5(mt_rand()), 0, 8);
+			} while (isset(self::$var[$sn]));
 			$container['PreviousRequestTime'] = MICRO_TIME;
 		}
 		self::$commonIDs[$container['CommonID']] = $sn;
@@ -408,21 +408,21 @@ 
 		return md5(serialize($commonContainer));
 	}
 
-	public static function getNewHREF($container, $forceFullURL=false) {
-		$sn = self::addLink($container) . (isset($container['AJAX']) && $container['AJAX'] == true ? '&ajax=1':'');
-		if($forceFullURL===true||stripos($_SERVER['REQUEST_URI'],'loader.php')===false)
+	public static function getNewHREF($container, $forceFullURL = false) {
+		$sn = self::addLink($container) . (isset($container['AJAX']) && $container['AJAX'] == true ? '&ajax=1' : '');
+		if ($forceFullURL === true || stripos($_SERVER['REQUEST_URI'], 'loader.php') === false)
 			return '/loader.php?sn=' . $sn;
 		else
 			return '?sn=' . $sn;
 	}
 
-	public static function addAjaxReturns($element,$contents) {
+	public static function addAjaxReturns($element, $contents) {
 		self::$ajaxReturns[$element] = $contents;
-		return isset(self::$previousAjaxReturns[$element])&&self::$previousAjaxReturns[$element]==$contents;
+		return isset(self::$previousAjaxReturns[$element]) && self::$previousAjaxReturns[$element] == $contents;
 	}
 
 	public static function saveAjaxReturns() {
-		if(empty(self::$ajaxReturns))
+		if (empty(self::$ajaxReturns))
 			return;
 		$compressed = gzcompress(serialize(self::$ajaxReturns));
 		self::$db->query('UPDATE active_session SET ajax_returns=' . self::$db->escapeBinary($compressed) .

lib/Default/Council.class.inc

Spacing +6 added lines, -6 removed lines

@@ -9,20 +9,20 @@ 
 	}
 
 	protected static function initialiseDatabase() {
-		if(self::$db==null)
+		if (self::$db == null)
 			self::$db = new SmrMySqlDatabase();
 	}
 
 	/**
 	 * Returns an array of Account ID's of the Council for this race.
 	 */
-	public static function &getRaceCouncil($gameID,$raceID) {
+	public static function &getRaceCouncil($gameID, $raceID) {
 		if (!isset(self::$COUNCILS[$gameID][$raceID])) {
 			self::initialiseDatabase();
 			self::$COUNCILS[$gameID][$raceID] = array();
 			self::$PRESIDENTS[$gameID][$raceID] = false;
 
-			$i=1;
+			$i = 1;
 			self::$db->query('SELECT account_id, alignment
 								FROM player
 								WHERE game_id = ' . self::$db->escapeNumber($gameID) . '
@@ -30,7 +30,7 @@ 
 									AND npc = \'FALSE\'
 								ORDER by experience DESC
 								LIMIT ' . MAX_COUNCIL_MEMBERS);
-			while(self::$db->nextRecord()) {
+			while (self::$db->nextRecord()) {
 				// Add this player to the council
 				self::$COUNCILS[$gameID][$raceID][$i++] = self::$db->getInt('account_id');
 
@@ -56,7 +56,7 @@ 
 		return self::$PRESIDENTS[$gameID][$raceID];
 	}
 
-	public static function isOnCouncil($gameID,$raceID,$accountID) {
-		return in_array($accountID,self::getRaceCouncil($gameID,$raceID));
+	public static function isOnCouncil($gameID, $raceID, $accountID) {
+		return in_array($accountID, self::getRaceCouncil($gameID, $raceID));
 	}
 }

lib/Default/SmrGame.class.inc

Spacing +73 added lines, -73 removed lines

@@ -46,8 +46,8 @@ 
 		self::GAME_TYPE_NEWBIE => 'Newbie',
 	];
 
-	public static function &getGame($gameID,$forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_GAMES[$gameID])) {
+	public static function &getGame($gameID, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_GAMES[$gameID])) {
 			$g = new SmrGame($gameID);
 			self::$CACHE_GAMES[$gameID] = $g;
 		}
@@ -55,45 +55,45 @@ 
 	}
 
 	public static function saveGames() {
-		foreach(self::$CACHE_GAMES as $game) {
+		foreach (self::$CACHE_GAMES as $game) {
 			$game->save();
 		}
 	}
 
 	public static function &createGame($gameID) {
-		if(!isset(self::$CACHE_GAMES[$gameID])) {
-			$g = new SmrGame($gameID,true);
+		if (!isset(self::$CACHE_GAMES[$gameID])) {
+			$g = new SmrGame($gameID, true);
 			self::$CACHE_GAMES[$gameID] = $g;
 		}
 		return self::$CACHE_GAMES[$gameID];
 	}
 
-	protected function __construct($gameID, $create=false) {
+	protected function __construct($gameID, $create = false) {
 		$this->db = new SmrMySqlDatabase();
 
 		$this->db->query('SELECT * FROM game WHERE game_id = ' . $this->db->escapeNumber($gameID) . ' LIMIT 1');
-		if($this->db->nextRecord()) {
-			$this->gameID				= $this->db->getInt('game_id');
-			$this->name					= $this->db->getField('game_name');
-			$this->description			= $this->db->getField('game_description');
-			$this->startDate			= $this->db->getInt('start_date');
-			$this->startTurnsDate		= $this->db->getInt('start_turns_date');
-			$this->endDate				= $this->db->getInt('end_date');
+		if ($this->db->nextRecord()) {
+			$this->gameID = $this->db->getInt('game_id');
+			$this->name = $this->db->getField('game_name');
+			$this->description = $this->db->getField('game_description');
+			$this->startDate = $this->db->getInt('start_date');
+			$this->startTurnsDate = $this->db->getInt('start_turns_date');
+			$this->endDate = $this->db->getInt('end_date');
 			$this->maxPlayers			= $this->db->getInt('max_players');
-			$this->maxTurns				= $this->db->getInt('max_turns');
-			$this->startTurnHours		= $this->db->getInt('start_turns');
+			$this->maxTurns = $this->db->getInt('max_turns');
+			$this->startTurnHours = $this->db->getInt('start_turns');
 			$this->gameTypeID			= $this->db->getInt('game_type');
-			$this->creditsNeeded		= $this->db->getInt('credits_needed');
-			$this->gameSpeed			= $this->db->getReal('game_speed');
-			$this->enabled				= $this->db->getBoolean('enabled');
-			$this->ignoreStats			= $this->db->getBoolean('ignore_stats');
-			$this->allianceMaxPlayers	= $this->db->getInt('alliance_max_players');
+			$this->creditsNeeded = $this->db->getInt('credits_needed');
+			$this->gameSpeed = $this->db->getReal('game_speed');
+			$this->enabled = $this->db->getBoolean('enabled');
+			$this->ignoreStats = $this->db->getBoolean('ignore_stats');
+			$this->allianceMaxPlayers = $this->db->getInt('alliance_max_players');
 			$this->allianceMaxVets		= $this->db->getInt('alliance_max_vets');
 			$this->startingCredits		= $this->db->getInt('starting_credits');
 		}
-		else if($create===true) {
-			$this->gameID		= (int)$gameID;
-			$this->isNew		= true;
+		else if ($create === true) {
+			$this->gameID = (int)$gameID;
+			$this->isNew = true;
 			return;
 		}
 		else {
@@ -102,8 +102,8 @@ 
 	}
 
 	public function save() {
-		if($this->hasChanged) {
-			if($this->isNew==false) {
+		if ($this->hasChanged) {
+			if ($this->isNew == false) {
 				$this->db->query('UPDATE game SET game_name = ' . $this->db->escapeString($this->getName()) .
 										', game_description = ' . $this->db->escapeString($this->getDescription()) .
 										', start_date = ' . $this->db->escapeNumber($this->getStartDate()) .
@@ -155,11 +155,11 @@ 
 	}
 
 	public function setName($name) {
-		if($this->name==$name) {
+		if ($this->name == $name) {
 			return;
 		}
-		$this->name=$name;
-		$this->hasChanged=true;
+		$this->name = $name;
+		$this->hasChanged = true;
 	}
 
 	public function getDescription() {
@@ -167,11 +167,11 @@ 
 	}
 
 	public function setDescription($description) {
-		if($this->description==$description) {
+		if ($this->description == $description) {
 			return;
 		}
-		$this->description=$description;
-		$this->hasChanged=true;
+		$this->description = $description;
+		$this->hasChanged = true;
 	}
 
 	public function getStartDate() {
@@ -179,11 +179,11 @@ 
 	}
 
 	public function setStartDate($startDate) {
-		if($this->startDate==$startDate) {
+		if ($this->startDate == $startDate) {
 			return;
 		}
-		$this->startDate=$startDate;
-		$this->hasChanged=true;
+		$this->startDate = $startDate;
+		$this->hasChanged = true;
 	}
 
 	public function getStartTurnsDate() {
@@ -191,11 +191,11 @@ 
 	}
 
 	public function setStartTurnsDate($startTurnsDate) {
-		if($this->startTurnsDate==$startTurnsDate) {
+		if ($this->startTurnsDate == $startTurnsDate) {
 			return;
 		}
-		$this->startTurnsDate=$startTurnsDate;
-		$this->hasChanged=true;
+		$this->startTurnsDate = $startTurnsDate;
+		$this->hasChanged = true;
 	}
 
 	public function getEndDate() {
@@ -203,11 +203,11 @@ 
 	}
 
 	public function setEndDate($endDate) {
-		if($this->endDate==$endDate) {
+		if ($this->endDate == $endDate) {
 			return;
 		}
-		$this->endDate=$endDate;
-		$this->hasChanged=true;
+		$this->endDate = $endDate;
+		$this->hasChanged = true;
 	}
 
 	public function getMaxPlayers() {
@@ -215,11 +215,11 @@ 
 	}
 
 	public function setMaxPlayers($maxPlayers) {
-		if($this->maxPlayers==$maxPlayers) {
+		if ($this->maxPlayers == $maxPlayers) {
 			return;
 		}
-		$this->maxPlayers=$maxPlayers;
-		$this->hasChanged=true;
+		$this->maxPlayers = $maxPlayers;
+		$this->hasChanged = true;
 	}
 
 	public function getMaxTurns() {
@@ -227,11 +227,11 @@ 
 	}
 
 	public function setMaxTurns($int) {
-		if($this->maxTurns==$int) {
+		if ($this->maxTurns == $int) {
 			return;
 		}
-		$this->maxTurns=$int;
-		$this->hasChanged=true;
+		$this->maxTurns = $int;
+		$this->hasChanged = true;
 	}
 
 	public function getStartTurnHours() {
@@ -239,11 +239,11 @@ 
 	}
 
 	public function setStartTurnHours($int) {
-		if($this->startTurnHours==$int) {
+		if ($this->startTurnHours == $int) {
 			return;
 		}
-		$this->startTurnHours=$int;
-		$this->hasChanged=true;
+		$this->startTurnHours = $int;
+		$this->hasChanged = true;
 	}
 
 	public function getGameType() {
@@ -255,7 +255,7 @@ 
 			return;
 		}
 		$this->gameTypeID = $gameTypeID;
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 	}
 
 	public function getCreditsNeeded() {
@@ -263,11 +263,11 @@ 
 	}
 
 	public function setCreditsNeeded($creditsNeeded) {
-		if($this->creditsNeeded==$creditsNeeded) {
+		if ($this->creditsNeeded == $creditsNeeded) {
 			return;
 		}
-		$this->creditsNeeded=$creditsNeeded;
-		$this->hasChanged=true;
+		$this->creditsNeeded = $creditsNeeded;
+		$this->hasChanged = true;
 	}
 
 	public function getGameSpeed() {
@@ -275,11 +275,11 @@ 
 	}
 
 	public function setGameSpeed($gameSpeed) {
-		if($this->gameSpeed==$gameSpeed) {
+		if ($this->gameSpeed == $gameSpeed) {
 			return;
 		}
-		$this->gameSpeed=$gameSpeed;
-		$this->hasChanged=true;
+		$this->gameSpeed = $gameSpeed;
+		$this->hasChanged = true;
 	}
 
 	public function isEnabled() {
@@ -287,11 +287,11 @@ 
 	}
 
 	public function setEnabled($bool) {
-		if($this->enabled === $bool) {
+		if ($this->enabled === $bool) {
 			return;
 		}
-		$this->enabled=$bool;
-		$this->hasChanged=true;
+		$this->enabled = $bool;
+		$this->hasChanged = true;
 	}
 
 	public function isIgnoreStats() {
@@ -299,11 +299,11 @@ 
 	}
 
 	public function setIgnoreStats($bool) {
-		if($this->ignoreStats === $bool) {
+		if ($this->ignoreStats === $bool) {
 			return;
 		}
-		$this->ignoreStats=$bool;
-		$this->hasChanged=true;
+		$this->ignoreStats = $bool;
+		$this->hasChanged = true;
 	}
 
 	public function getAllianceMaxPlayers() {
@@ -311,11 +311,11 @@ 
 	}
 
 	public function setAllianceMaxPlayers($int) {
-		if($this->allianceMaxPlayers==$int) {
+		if ($this->allianceMaxPlayers == $int) {
 			return;
 		}
-		$this->allianceMaxPlayers=$int;
-		$this->hasChanged=true;
+		$this->allianceMaxPlayers = $int;
+		$this->hasChanged = true;
 	}
 
 	public function getAllianceMaxVets() {
@@ -323,11 +323,11 @@ 
 	}
 
 	public function setAllianceMaxVets($int) {
-		if($this->allianceMaxVets==$int) {
+		if ($this->allianceMaxVets == $int) {
 			return;
 		}
-		$this->allianceMaxVets=$int;
-		$this->hasChanged=true;
+		$this->allianceMaxVets = $int;
+		$this->hasChanged = true;
 	}
 
 	public function getStartingCredits() {
@@ -335,15 +335,15 @@ 
 	}
 
 	public function setStartingCredits($int) {
-		if($this->startingCredits==$int) {
+		if ($this->startingCredits == $int) {
 			return;
 		}
-		$this->startingCredits=$int;
-		$this->hasChanged=true;
+		$this->startingCredits = $int;
+		$this->hasChanged = true;
 	}
 
 	public function getTotalPlayers() {
-		if(!isset($this->totalPlayers)) {
+		if (!isset($this->totalPlayers)) {
 			$this->db->query('SELECT count(*) FROM player WHERE game_id = ' . $this->db->escapeNumber($this->getGameID()));
 			$this->db->nextRecord();
 			$this->totalPlayers = $this->db->getInt('count(*)');
@@ -356,7 +356,7 @@ 
 	}
 
 	public function equals(SmrGame $otherGame) {
-		return $otherGame->getGameID()==$this->getGameID();
+		return $otherGame->getGameID() == $this->getGameID();
 	}
 
 	// Convenience function for printing the game name with id

lib/Default/Template.class.inc

Spacing +44 added lines, -44 removed lines

@@ -4,9 +4,9 @@ 
 	private $data = array();
 //	protected $ajax = array();
 //	protected $currentAjaxID=false;
-	private $captures=array('');
-	private $currentCaptureID=0;
-	private $ignoreMiddle=false;
+	private $captures = array('');
+	private $currentCaptureID = 0;
+	private $ignoreMiddle = false;
 	private $nestedIncludes = 0;
 	private $ajaxJS = array();
 	protected $jsAlerts = array();
@@ -35,7 +35,7 @@ 
 	 * Displays the template HTML. Stores any ajax-enabled elements for future
 	 * comparison, and outputs modified elements in XML for ajax if requested.
 	 */
-	public function display($templateName, $outputXml=false) {
+	public function display($templateName, $outputXml = false) {
 		// If we already started output buffering before calling `display`,
 		// we may have unwanted content in the buffer that we need to remove
 		// before we send the Content-Type headers below.
@@ -47,7 +47,7 @@ 
 		}
 		ob_start();
 		$this->includeTemplate($templateName);
-		$this->captures[$this->currentCaptureID].=ob_get_clean();
+		$this->captures[$this->currentCaptureID] .= ob_get_clean();
 		$output = join('', $this->captures);
 		$this->trimWhiteSpace($output);
 
@@ -59,10 +59,10 @@ 
 
 		$ajaxEnabled = ($this->data['AJAX_ENABLE_REFRESH'] ?? false) !== false;
 		if ($ajaxEnabled) {
-			$ajaxXml =& $this->convertHtmlToAjaxXml($output,USING_AJAX);
+			$ajaxXml = & $this->convertHtmlToAjaxXml($output, USING_AJAX);
 			if ($outputXml) {
 				/* Left out for size: <?xml version="1.0" encoding="ISO-8859-1"?>*/
-				$ajaxXml='<all>'.$ajaxXml.'</all>';
+				$ajaxXml = '<all>' . $ajaxXml . '</all>';
 				echo $ajaxXml;
 			} else {
 				echo $output;
@@ -121,21 +121,21 @@ 
 			return TEMPLATES_DIR . 'Default/' . $templateName;
 		}
 		elseif (file_exists($templateDir . 'default.inc')) {
-			return $templateDir.'default.inc';
+			return $templateDir . 'default.inc';
 		}
 		else {
-			return TEMPLATES_DIR.'Default/default.inc';//return $file_name;
+			return TEMPLATES_DIR . 'Default/default.inc'; //return $file_name;
 		}
 	}
 	
 	protected function includeTemplate($templateName, array $assignVars = null) {
-		if($this->nestedIncludes > 15) {
+		if ($this->nestedIncludes > 15) {
 			throw new Exception('Nested more than 15 template includes, is something wrong?');
 		}
 		foreach ($this->data as $key => $value) {
 			$$key = $value;
 		}
-		if($assignVars!==null) {
+		if ($assignVars !== null) {
 			foreach ($assignVars as $key => $value) {
 				$$key = $value;
 			}
@@ -146,14 +146,14 @@ 
 	}
 	
 	protected function startCapture() {
-		$this->captures[$this->currentCaptureID].=ob_get_contents();
+		$this->captures[$this->currentCaptureID] .= ob_get_contents();
 		ob_clean();
 		$this->currentCaptureID++;
 		$this->captures[$this->currentCaptureID] = '';
 	}
 	
 	protected function &stopCapture() {
-		$captured =& $this->captures[$this->currentCaptureID];
+		$captured = & $this->captures[$this->currentCaptureID];
 		unset($this->captures[$this->currentCaptureID]);
 		$captured .= ob_get_contents();
 		ob_clean();
@@ -187,7 +187,7 @@ 
 //	}
 	
 	protected function checkDisableAJAX($html) {
-		return preg_match('/<input'.'[^>]*'.'[^(submit)(hidden)(image)]'.'[^>]*'.'>/i', $html)!=0;
+		return preg_match('/<input' . '[^>]*' . '[^(submit)(hidden)(image)]' . '[^>]*' . '>/i', $html) != 0;
 	}
 	
 	protected function trimWhiteSpace(&$html) {
@@ -222,13 +222,13 @@ 
 		$html = trim(preg_replace('/> </', '><', $html));
 		
 		// replace span blocks
-		$this->replaceTrimHolder("@@@SMARTY:TRIM:SPAN@@@",$_span_blocks, $html);
+		$this->replaceTrimHolder("@@@SMARTY:TRIM:SPAN@@@", $_span_blocks, $html);
 		
 		// replace textarea blocks
-		$this->replaceTrimHolder("@@@SMARTY:TRIM:TEXTAREA@@@",$_textarea_blocks, $html);
+		$this->replaceTrimHolder("@@@SMARTY:TRIM:TEXTAREA@@@", $_textarea_blocks, $html);
 		
 		// replace pre blocks
-		$this->replaceTrimHolder("@@@SMARTY:TRIM:PRE@@@",$_pre_blocks, $html);
+		$this->replaceTrimHolder("@@@SMARTY:TRIM:PRE@@@", $_pre_blocks, $html);
 		
 		// replace script blocks
 //		$this->replaceTrimHolder("@@@SMARTY:TRIM:SCRIPT@@@",$_script_blocks, $html);
@@ -236,8 +236,8 @@ 
 	protected function replaceTrimHolder($search_str, $replace, &$subject) {
 		$_len = strlen($search_str);
 		$_pos = 0;
-		for ($_i=0, $_count=count($replace); $_i<$_count; $_i++) {
-			if (($_pos=strpos($subject, $search_str, $_pos))!==false) {
+		for ($_i = 0, $_count = count($replace); $_i < $_count; $_i++) {
+			if (($_pos = strpos($subject, $search_str, $_pos)) !== false) {
 				$subject = substr_replace($subject, $replace[$_i], $_pos, $_len);
 			}
 			else {
@@ -247,10 +247,10 @@ 
 	}
 	
 	protected function doDamageTypeReductionDisplay(&$damageTypes) {
-		if($damageTypes == 3) {
+		if ($damageTypes == 3) {
 			echo ', ';
 		}
-		else if($damageTypes == 2) {
+		else if ($damageTypes == 2) {
 			echo ' and ';
 		}
 		$damageTypes--;
@@ -258,7 +258,7 @@ 
 
 	protected function doAn($wordAfter) {
 		$char = strtoupper($wordAfter[0]);
-		if($char == 'A' || $char == 'E' || $char == 'I' || $char == 'O' || $char == 'U') {
+		if ($char == 'A' || $char == 'E' || $char == 'I' || $char == 'O' || $char == 'U') {
 			echo 'an';
 		}
 		else {
@@ -270,33 +270,33 @@ 
 	 * EVAL is special (well, will be when needed and implemented in the javascript).
 	 */
 	public function addJavascriptForAjax($varName, $obj) {
-		if($varName == 'EVAL') {
-			if(!isset($this->ajaxJS['EVAL'])) {
+		if ($varName == 'EVAL') {
+			if (!isset($this->ajaxJS['EVAL'])) {
 				return $this->ajaxJS['EVAL'] = $obj;
 			}
 			return $this->ajaxJS['EVAL'] .= ';' . $obj;
 		}
 		
-		if(isset($this->ajaxJS[$varName])) {
+		if (isset($this->ajaxJS[$varName])) {
 			throw new Exception('Trying to set javascript val twice: ' . $varName);
 		}
 		return $this->ajaxJS[$varName] = json_encode($obj);
 	}
 	
 	protected function addJavascriptAlert($string) {
-		if(!SmrSession::addAjaxReturns('ALERT:'.$string,$string)) {
+		if (!SmrSession::addAjaxReturns('ALERT:' . $string, $string)) {
 			$this->jsAlerts[] = $string;
 		}
 	}
 	
-	protected function &convertHtmlToAjaxXml($str,$returnXml) {
-		if(empty($str)) {
+	protected function &convertHtmlToAjaxXml($str, $returnXml) {
+		if (empty($str)) {
 			return '';
 		}
 
 		// To get inner html, we need to construct a separate DOMDocument.
 		// See PHP Bug #76285.
-		$getInnerHTML = function (DOMNode $node) {
+		$getInnerHTML = function(DOMNode $node) {
 			$dom = new DOMDocument();
 			$dom->formatOutput = false;
 			foreach ($node->childNodes as $child) {
@@ -306,7 +306,7 @@ 
 			return trim(@$dom->saveHTML());
 		};
 
-		$xml='';
+		$xml = '';
 		$dom = new DOMDocument();
 		@$dom->loadHTML($str);
 		$xpath = new DOMXpath($dom);
@@ -316,13 +316,13 @@ 
 			foreach ($matchNodes as $node) {
 				$id = $node->getAttribute('id');
 				$inner = $getInnerHTML($node);
-				if(!SmrSession::addAjaxReturns($id,$inner) && $returnXml) {
-					$xml.= '<'.$id.'>'.xmlify($inner). '</'.$id.'>';
+				if (!SmrSession::addAjaxReturns($id, $inner) && $returnXml) {
+					$xml .= '<' . $id . '>' . xmlify($inner) . '</' . $id . '>';
 				}
 			}
 		}
 
-		if(!$this->ignoreMiddle) {
+		if (!$this->ignoreMiddle) {
 			$mid = $dom->getElementById('middle_panel');
 
 			$doAjaxMiddle = true;
@@ -342,28 +342,28 @@ 
 				}
 			}
 
-			if($doAjaxMiddle) {
+			if ($doAjaxMiddle) {
 				$inner = $getInnerHTML($mid);
-				if(!$this->checkDisableAJAX($inner)) {
+				if (!$this->checkDisableAJAX($inner)) {
 					$id = $mid->getAttribute('id');
-					if(!SmrSession::addAjaxReturns($id,$inner) && $returnXml) {
-						$xml .= '<'.$id.'>'.xmlify($inner).'</'.$id.'>';
+					if (!SmrSession::addAjaxReturns($id, $inner) && $returnXml) {
+						$xml .= '<' . $id . '>' . xmlify($inner) . '</' . $id . '>';
 					}
 				}
 			}
 		}
 
 		$js = '';
-		foreach($this->ajaxJS as $varName => $JSON) {
-			if(!SmrSession::addAjaxReturns('JS:'.$varName,$JSON) && $returnXml) {
-				$js .= '<'.$varName.'>'.xmlify($JSON).'</'.$varName.'>';
+		foreach ($this->ajaxJS as $varName => $JSON) {
+			if (!SmrSession::addAjaxReturns('JS:' . $varName, $JSON) && $returnXml) {
+				$js .= '<' . $varName . '>' . xmlify($JSON) . '</' . $varName . '>';
 			}
 		}
-		if($returnXml && count($this->jsAlerts) > 0) {
-			$js = '<ALERT>'.json_encode($this->jsAlerts).'</ALERT>';
+		if ($returnXml && count($this->jsAlerts) > 0) {
+			$js = '<ALERT>' . json_encode($this->jsAlerts) . '</ALERT>';
 		}
-		if(strlen($js) > 0) {
-			$xml .= '<JS>'.$js.'</JS>';
+		if (strlen($js) > 0) {
+			$xml .= '<JS>' . $js . '</JS>';
 		}
 		return $xml;
 	}