smrealms / smr

lib/Default/smr.inc

Spacing +195 added lines, -195 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
 function htmliseMessage($message) {
-	$message = htmlentities($message,ENT_COMPAT,'utf-8');
-	$message = str_replace('&lt;br /&gt;','<br />',$message);
+	$message = htmlentities($message, ENT_COMPAT, 'utf-8');
+	$message = str_replace('&lt;br /&gt;', '<br />', $message);
 	return $message;
 }
 
 function parseBoolean($check) {
 	// Only negative strings are not implicitly converted to the correct bool
-	if(is_string($check) && (strcasecmp($check,'NO') == 0 || strcasecmp($check,'FALSE')==0))
+	if (is_string($check) && (strcasecmp($check, 'NO') == 0 || strcasecmp($check, 'FALSE') == 0))
 		return false;
 	return (bool)$check;
 }
@@ -16,7 +16,7 @@ 
 function smrBBCode($bbParser, $action, $tagName, $default, $tagParams, $tagContent) {
 	global $overrideGameID, $disableBBLinks, $player, $account, $var;
 	try {
-		switch($tagName) {
+		switch ($tagName) {
 			case 'combatlog':
 				$logID = (is_numeric($default)) ? $default : $tagParams['id'];
 				if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
@@ -28,14 +28,14 @@ 
 			break;
 			case 'player':
 				$playerID = $default;
-				if(!is_numeric($playerID))
+				if (!is_numeric($playerID))
 					$playerID = $tagParams['id'];
 				$bbPlayer = SmrPlayer::getPlayerByPlayerID($playerID, $overrideGameID);
 				if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 					return true;
 				}
 				$showAlliance = isset($tagParams['showalliance']) ? parseBoolean($tagParams['showalliance']) : false;
-				if($disableBBLinks===false && $overrideGameID==SmrSession::getGameID()) {
+				if ($disableBBLinks === false && $overrideGameID == SmrSession::getGameID()) {
 					return $bbPlayer->getLinkedDisplayName($showAlliance);
 				}
 				return $bbPlayer->getDisplayName($showAlliance);
@@ -43,14 +43,14 @@ 
 			case 'alliance':
 				$db = new SmrMySqlDatabase();
 				$allianceID = $default;
-				if(!is_numeric($allianceID))
+				if (!is_numeric($allianceID))
 					$allianceID = $tagParams['id'];
 				$alliance = SmrAlliance::getAlliance($allianceID, $overrideGameID);
 				if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 					return true;
 				}
 
-				if($disableBBLinks===false && $overrideGameID==SmrSession::getGameID()) {
+				if ($disableBBLinks === false && $overrideGameID == SmrSession::getGameID()) {
 					$container = create_container('skeleton.php');
 					$container['alliance_id'] = $alliance->getAllianceID();
 					if (is_object($player) && $alliance->getAllianceID() == $player->getAllianceID())
@@ -64,12 +64,12 @@ 
 			case 'race':
 				$raceNameID = $default;
 				foreach (Globals::getRaces() as $raceID => $raceInfo) {
-					if((is_numeric($raceNameID) && $raceNameID == $raceID)
+					if ((is_numeric($raceNameID) && $raceNameID == $raceID)
 						|| $raceNameID == $raceInfo['Race Name']) {
 						if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 							return true;
 						}
-						$linked = $disableBBLinks===false && $overrideGameID==SmrSession::getGameID();
+						$linked = $disableBBLinks === false && $overrideGameID == SmrSession::getGameID();
 						return AbstractSmrPlayer::getColouredRaceNameOrDefault($raceID, $player, $linked);
 					}
 				}
@@ -80,14 +80,14 @@ 
 					return true;
 				}
 				if ($timeString != '' && ($time = strtotime($timeString)) !== false) {
-					if(is_object($account))
+					if (is_object($account))
 						$time += $account->getOffset() * 3600;
 					return date(DATE_FULL_SHORT, $time);
 				}
 			break;
 			case 'chess':
 				$chessGameID = $default;
-				$chessGame =& ChessGame::getChessGame($chessGameID);
+				$chessGame = & ChessGame::getChessGame($chessGameID);
 				if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 					return true;
 				}
@@ -105,10 +105,10 @@ 
 
 				// The use of $var here is for a corner case where an admin can check reported messages whilst being in-game.
 				// Ugly but working, probably want a better mechanism to check if more BBCode tags get added
-				if(is_numeric($sectorID)
+				if (is_numeric($sectorID)
 					&& SmrSession::hasGame()
 					&& SmrSector::sectorExists($overrideGameID, $sectorID)
-					&& $disableBBLinks===false && $overrideGameID==SmrSession::getGameID()) {
+					&& $disableBBLinks === false && $overrideGameID == SmrSession::getGameID()) {
 					return '<a href="' . Globals::getPlotCourseHREF($player->getSectorID(), $sectorID) . '">' . $sectorTag . '</a>';
 				}
 
@@ -142,9 +142,9 @@ 
 	return str_replace(',', '', html_entity_decode($text));
 }
 
-function bbifyMessage($message, $noLinks=false) {
+function bbifyMessage($message, $noLinks = false) {
 	static $bbParser;
-	if(!isset($bbParser)) {
+	if (!isset($bbParser)) {
 		$bbParser = new \Nbbc\BBCode();
 		$bbParser->SetEnableSmileys(false);
 		$bbParser->RemoveRule('wiki');
@@ -160,23 +160,23 @@ 
 				'end_tag' => \Nbbc\BBCode::BBCODE_PROHIBIT,
 				'content' => \Nbbc\BBCode::BBCODE_PROHIBIT,
 			);
-		$bbParser->AddRule('combatlog',$smrRule);
-		$bbParser->AddRule('player',$smrRule);
-		$bbParser->AddRule('alliance',$smrRule);
-		$bbParser->AddRule('race',$smrRule);
-		$bbParser->AddRule('servertimetouser',$smrRule);
-		$bbParser->AddRule('chess',$smrRule);
-		$bbParser->AddRule('sector',$smrRule);
-		$bbParser->addRule('join_alliance',$smrRule);
+		$bbParser->AddRule('combatlog', $smrRule);
+		$bbParser->AddRule('player', $smrRule);
+		$bbParser->AddRule('alliance', $smrRule);
+		$bbParser->AddRule('race', $smrRule);
+		$bbParser->AddRule('servertimetouser', $smrRule);
+		$bbParser->AddRule('chess', $smrRule);
+		$bbParser->AddRule('sector', $smrRule);
+		$bbParser->addRule('join_alliance', $smrRule);
 	}
 	global $disableBBLinks;
-	if($noLinks===true)
+	if ($noLinks === true)
 		$disableBBLinks = true;
 	else
 		$disableBBLinks = false;
-	if(strpos($message, '[')!==false) { //We have BBCode so let's do a full parse.
+	if (strpos($message, '[') !== false) { //We have BBCode so let's do a full parse.
 		$message = $bbParser->parse($message);
-		$message = str_replace('&lt;br /&gt;','<br />',$message);
+		$message = str_replace('&lt;br /&gt;', '<br />', $message);
 	}
 	else { //Otherwise just convert newlines
 		$message = nl2br($message, true);
@@ -188,7 +188,7 @@ 
 	global $template;
 	$return = '<span class="noWrap">' . implode('</span> | <span class="noWrap">', $menu) . '</span>';
 	$template->unassign('MenuItems');
-	$template->assign('MenuBar',$return);
+	$template->assign('MenuBar', $return);
 }
 
 function create_table() {
@@ -200,29 +200,29 @@ 
 }
 
 function create_form_name($container, $name) {
-	return create_form_parameter($container, 'name="'.$name.'"');
+	return create_form_parameter($container, 'name="' . $name . '"');
 }
 
 function create_form_parameter($container, $param) {
-	return '<form '.$param.' method="POST" action="'.SmrSession::getNewHREF($container).'">';
+	return '<form ' . $param . ' method="POST" action="' . SmrSession::getNewHREF($container) . '">';
 }
 
-function create_button($container,$text) {
-	return '<div class="buttonA"><a class="buttonA" href="' . SmrSession::getNewHREF($container). '">' . $text . '</a></div>';
+function create_button($container, $text) {
+	return '<div class="buttonA"><a class="buttonA" href="' . SmrSession::getNewHREF($container) . '">' . $text . '</a></div>';
 }
 
-function create_form($container,$actions) {
+function create_form($container, $actions) {
 	static $form_id = 0;
 	$form = array();
 	$form['form'] = '<form class="standard" id="FORM' . $form_id . '" method="POST" action="' . SmrSession::getNewHREF($container) . '">';
 
-	if(!is_array($actions)) {
-		$form['submit'] =  '<input class="submit" type="submit" name="action" value="' . htmlspecialchars($actions) . '">';
+	if (!is_array($actions)) {
+		$form['submit'] = '<input class="submit" type="submit" name="action" value="' . htmlspecialchars($actions) . '">';
 	}
 	else {
 		$form['submit'] = array();
-		foreach($actions as $action) {
-			$form['submit'][$action[0]] =  '<input class="submit" type="submit" name="action" value="' . htmlspecialchars($action[1]) . '">';
+		foreach ($actions as $action) {
+			$form['submit'][$action[0]] = '<input class="submit" type="submit" name="action" value="' . htmlspecialchars($action[1]) . '">';
 		}
 	}
 
@@ -232,11 +232,11 @@ 
 }
 
 function create_submit($value) {
-	return ('<input type="submit" name="action" value="'.htmlspecialchars($value).'" id="InputFields" />');
+	return ('<input type="submit" name="action" value="' . htmlspecialchars($value) . '" id="InputFields" />');
 }
 
 function create_error($message) {
-	$container = create_container('skeleton.php','error.php');
+	$container = create_container('skeleton.php', 'error.php');
 	$container['message'] = $message;
 	if (USING_AJAX) {
 		// To avoid the page just not refreshing when an error is encountered
@@ -253,18 +253,18 @@ 
 }
 
 function resetContainer($new_container) {
-	global $sn,$container,$var;
+	global $sn, $container, $var;
 
 	// this sn identifies our container later
 
-	SmrSession::resetLink($new_container,$sn);
+	SmrSession::resetLink($new_container, $sn);
 
 	$var = $new_container;
 	$container = $new_container;
 }
 
 function forward($new_container) {
-	if(defined('OVERRIDE_FORWARD')&&OVERRIDE_FORWARD===true)
+	if (defined('OVERRIDE_FORWARD') && OVERRIDE_FORWARD === true)
 		return overrideForward($new_container);
 	resetContainer($new_container);
 	do_voodoo();
@@ -281,7 +281,7 @@ 
 	global $var, $container;
 
 	// transfer this value to next container
-	if(isset($var[$what]))
+	if (isset($var[$what]))
 		$container[$what] = $var[$what];
 
 }
@@ -290,42 +290,42 @@ 
 	$container = $extra;
 	$container['url'] = $file;
 	$container['body'] = $body;
-	if($remainingPageLoads) {
+	if ($remainingPageLoads) {
 		$container['RemainingPageLoads'] = $remainingPageLoads;
 	}
 	return $container;
 }
 
-function create_link($container, $text, $class=null) {
-	return '<a'.($class==null?'':' class="'.$class.'"').' href="' . (is_array($container)?SmrSession::getNewHREF($container):$container) . '">' . $text . '</a>';
+function create_link($container, $text, $class = null) {
+	return '<a' . ($class == null ? '' : ' class="' . $class . '"') . ' href="' . (is_array($container) ?SmrSession::getNewHREF($container) : $container) . '">' . $text . '</a>';
 }
 
 function create_submit_link($container, $text) {
 	return '<a href="' . SmrSession::getNewHREF($container) . '" class="submitStyle">' . $text . '</a>';
 }
 
-function get_colored_text_range($value, $maxValue, $text = null, $minValue = 0, $type='Game', $return_type = 'Normal') {
-	if($text == null) {
+function get_colored_text_range($value, $maxValue, $text = null, $minValue = 0, $type = 'Game', $return_type = 'Normal') {
+	if ($text == null) {
 		$text = number_format($value);
 	}
-	if($maxValue-$minValue==0) {
+	if ($maxValue - $minValue == 0) {
 		return $text;
 	}
 	else {
-		$normalisedValue = round(510*max(0,min($maxValue,$value)-$minValue)/($maxValue-$minValue))-255;
+		$normalisedValue = round(510 * max(0, min($maxValue, $value) - $minValue) / ($maxValue - $minValue)) - 255;
 	}
 	if ($type == 'Game') {
-		if($normalisedValue < 0) {
-			$r_component='ff';
-			$g_component = dechex(255+$normalisedValue);
-			if(strlen($g_component) == 1) {
+		if ($normalisedValue < 0) {
+			$r_component = 'ff';
+			$g_component = dechex(255 + $normalisedValue);
+			if (strlen($g_component) == 1) {
 				$g_component = '0' . $g_component;
 			}
 		}
-		else if($normalisedValue > 0) {
-			$g_component='ff';
-			$r_component = dechex(255-$normalisedValue);
-			if(strlen($r_component) == 1) {
+		else if ($normalisedValue > 0) {
+			$g_component = 'ff';
+			$r_component = dechex(255 - $normalisedValue);
+			if (strlen($r_component) == 1) {
 				$r_component = '0' . $r_component;
 			}
 		}
@@ -347,25 +347,25 @@ 
 	}
 }
 
-function get_colored_text($value, $text = null, $type='Game', $return_type = 'Normal') {
+function get_colored_text($value, $text = null, $type = 'Game', $return_type = 'Normal') {
 	return get_colored_text_range($value, 300, $text, -300, $type, $return_type);
 }
 
 function word_filter($string) {
 	static $words;
 
-	if(!is_array($words)) {
+	if (!is_array($words)) {
 		$db = new SmrMySqlDatabase();
 		$db->query('SELECT word_value, word_replacement FROM word_filter');
 		$words = array();
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$row = $db->getRow();
-			$words[] = array('word_value' => '/'.str_replace('/','\/',$row['word_value']).'/i','word_replacement'=> $row['word_replacement']);
+			$words[] = array('word_value' => '/' . str_replace('/', '\/', $row['word_value']) . '/i', 'word_replacement'=> $row['word_replacement']);
 		}
 	}
 
 	foreach ($words as $word) {
-		$string = preg_replace($word['word_value'],$word['word_replacement'],$string);
+		$string = preg_replace($word['word_value'], $word['word_replacement'], $string);
 	}
 
 	return $string;
@@ -373,10 +373,10 @@ 
 
 // choose correct pluralization based on amount
 function pluralise($word, $count = 0) {
-	if($count == 1) {
+	if ($count == 1) {
 		return $word;
 	}
-	if(strtolower($word) == 'is') {
+	if (strtolower($word) == 'is') {
 		return 'are';
 	}
 	return $word . 's';
@@ -397,10 +397,10 @@ 
 // This function is a hack around the old style http forward mechanism
 function do_voodoo() {
 	global $lock, $var, $template, $account;
-	if(!defined('AJAX_CONTAINER')) {
+	if (!defined('AJAX_CONTAINER')) {
 		define('AJAX_CONTAINER', isset($var['AJAX']) && $var['AJAX'] === true);
 	}
-	if(!AJAX_CONTAINER && USING_AJAX && SmrSession::hasChangedSN()) {
+	if (!AJAX_CONTAINER && USING_AJAX && SmrSession::hasChangedSN()) {
 		exit;
 	}
 //	ob_clean();
@@ -409,22 +409,22 @@ 
 		$$key = &$GLOBALS[$key];
 	}
 	// create account object
-	$account =& SmrAccount::getAccount(SmrSession::$account_id);
-	$GLOBALS['account'] =& $account;
+	$account = & SmrAccount::getAccount(SmrSession::$account_id);
+	$GLOBALS['account'] = & $account;
 
-	if(!defined('DATE_DATE_SHORT')) define('DATE_DATE_SHORT',$account->getShortDateFormat());
-	if(!defined('DATE_TIME_SHORT')) define('DATE_TIME_SHORT',$account->getShortTimeFormat());
-	if(!defined('DATE_FULL_SHORT')) define('DATE_FULL_SHORT',DATE_DATE_SHORT.' '.DATE_TIME_SHORT);
-	if(!defined('DATE_FULL_SHORT_SPLIT')) define('DATE_FULL_SHORT_SPLIT',DATE_DATE_SHORT.'\<b\r /\>'.DATE_TIME_SHORT);
+	if (!defined('DATE_DATE_SHORT')) define('DATE_DATE_SHORT', $account->getShortDateFormat());
+	if (!defined('DATE_TIME_SHORT')) define('DATE_TIME_SHORT', $account->getShortTimeFormat());
+	if (!defined('DATE_FULL_SHORT')) define('DATE_FULL_SHORT', DATE_DATE_SHORT . ' ' . DATE_TIME_SHORT);
+	if (!defined('DATE_FULL_SHORT_SPLIT')) define('DATE_FULL_SHORT_SPLIT', DATE_DATE_SHORT . '\<b\r /\>' . DATE_TIME_SHORT);
 
 
 	$db = new SmrMySqlDatabase();
-	$GLOBALS['db'] =& $db;
+	$GLOBALS['db'] = & $db;
 
-	if($var['url'] == 'game_play_preprocessing.php') { // Would rather not have these here but if we go through the initialisation based on game id when leaving a classic game it breaks.
+	if ($var['url'] == 'game_play_preprocessing.php') { // Would rather not have these here but if we go through the initialisation based on game id when leaving a classic game it breaks.
 		SmrSession::clearLinks();
 		if (SmrSession::hasGame()) {
-			$account->log(LOG_TYPE_GAME_ENTERING, 'Player left game '.SmrSession::getGameID());
+			$account->log(LOG_TYPE_GAME_ENTERING, 'Player left game ' . SmrSession::getGameID());
 		}
 
 		// reset game id
@@ -445,11 +445,11 @@ 
 		$sector_id = $db->getInt('sector_id');
 
 		global $locksFailed;
-		if(!USING_AJAX //AJAX should never do anything that requires a lock.
+		if (!USING_AJAX //AJAX should never do anything that requires a lock.
 //			&& !isset($var['url']) && ($var['body'] == 'current_sector.php' || $var['body'] == 'map_local.php') //Neither should CS or LM and they gets loaded a lot so should reduce lag issues with big groups.
 			) {
-			if(!$lock && !isset($locksFailed[$sector_id])) {
-				if(!acquire_lock($sector_id)) {
+			if (!$lock && !isset($locksFailed[$sector_id])) {
+				if (!acquire_lock($sector_id)) {
 					create_error('Failed to acquire sector lock');
 				}
 				//Refetch var info in case it changed between grabbing lock.
@@ -464,18 +464,18 @@ 
 		}
 
 		// Now that they've acquire a lock we can move on
-		$player =& SmrPlayer::getPlayer(SmrSession::$account_id, SmrSession::getGameID());
-		$GLOBALS['player'] =& $player;
+		$player = & SmrPlayer::getPlayer(SmrSession::$account_id, SmrSession::getGameID());
+		$GLOBALS['player'] = & $player;
 
-		if($player->isDead() && $var['url'] != 'death_processing.php' && !isset($var['override_death'])) {
+		if ($player->isDead() && $var['url'] != 'death_processing.php' && !isset($var['override_death'])) {
 			forward(create_container('death_processing.php'));
 		}
 
-		$ship	=& $player->getShip();
-		$GLOBALS['ship'] =& $ship;
+		$ship = & $player->getShip();
+		$GLOBALS['ship'] = & $ship;
 
-		$sector	=& $player->getSector();
-		$GLOBALS['sector'] =& $sector;
+		$sector = & $player->getSector();
+		$GLOBALS['sector'] = & $sector;
 
 		// update turns on that player
 		$player->updateTurns();
@@ -486,34 +486,34 @@ 
 			forward(create_container('newbie_warning_processing.php'));
 	}
 
-	if($var['url'] != 'skeleton.php') {
+	if ($var['url'] != 'skeleton.php') {
 		require(get_file_loc($var['url']));
 	}
-	if($var['body']) {
+	if ($var['body']) {
 		$PHP_OUTPUT = '';
-		if ($var['body']=='error.php') { // infinite includes for error pages
+		if ($var['body'] == 'error.php') { // infinite includes for error pages
 			require(get_file_loc($var['body']));
 		}
 		else {
 			require_once(get_file_loc($var['body']));
 		}
 
-		if($PHP_OUTPUT!='')
-			$template->assign('PHP_OUTPUT',$PHP_OUTPUT);
+		if ($PHP_OUTPUT != '')
+			$template->assign('PHP_OUTPUT', $PHP_OUTPUT);
 	}
 
 	if (SmrSession::hasGame()) {
 		$template->assign('UnderAttack', $ship->removeUnderAttack());
 	}
 
-	if($lock) { //Only save if we have the lock.
+	if ($lock) { //Only save if we have the lock.
 		SmrSector::saveSectors();
 		SmrShip::saveShips();
 		SmrPlayer::savePlayers();
 		SmrForce::saveForces();
 		SmrPort::savePorts();
 		SmrPlanet::savePlanets();
-		if(class_exists('WeightedRandom', false)) {
+		if (class_exists('WeightedRandom', false)) {
 			WeightedRandom::saveWeightedRandoms();
 		}
 		//Update session here to make sure current page $var is up to date before releasing lock.
@@ -523,17 +523,17 @@ 
 
 	//Nothing below this point should require the lock.
 
-	$template->assign('TemplateBody',$var['body']);
+	$template->assign('TemplateBody', $var['body']);
 	if (SmrSession::hasGame()) {
-		$template->assign('ThisSector',$sector);
-		$template->assign('ThisPlayer',$player);
-		$template->assign('ThisShip',$ship);
+		$template->assign('ThisSector', $sector);
+		$template->assign('ThisPlayer', $player);
+		$template->assign('ThisShip', $ship);
 	}
-	$template->assign('ThisAccount',$account);
-	if($account->getCssLink()!=null) {
-		$template->assign('ExtraCSSLink',$account->getCssLink());
+	$template->assign('ThisAccount', $account);
+	if ($account->getCssLink() != null) {
+		$template->assign('ExtraCSSLink', $account->getCssLink());
 	}
-	doSkeletonAssigns($template,$player,$ship,$sector,$db,$account);
+	doSkeletonAssigns($template, $player, $ship, $sector, $db, $account);
 
 	// Set ajax refresh time
 	$ajaxRefresh = $var['AllowAjax'] ?? true; // hack for bar_gambling_processing.php
@@ -563,26 +563,26 @@ 
 function acquire_lock($sector) {
 	global $db, $lock, $locksFailed;
 
-	if($lock)
+	if ($lock)
 		return true;
 
 	// Insert ourselves into the queue.
 	$db->query('INSERT INTO locks_queue (game_id,account_id,sector_id,timestamp) VALUES(' . $db->escapeNumber(SmrSession::getGameID()) . ',' . $db->escapeNumber(SmrSession::$account_id) . ',' . $db->escapeNumber($sector) . ',' . $db->escapeNumber(TIME) . ')');
 	$lock = $db->getInsertID();
 
-	for($i=0;$i<250;++$i) {
-		if(time() - TIME >= LOCK_DURATION - LOCK_BUFFER) {
+	for ($i = 0; $i < 250; ++$i) {
+		if (time() - TIME >= LOCK_DURATION - LOCK_BUFFER) {
 			break;
 		}
 		// If there is someone else before us in the queue we sleep for a while
 		$db->query('SELECT COUNT(*) FROM locks_queue WHERE lock_id<' . $db->escapeNumber($lock) . ' AND sector_id=' . $db->escapeNumber($sector) . ' AND game_id=' . $db->escapeNumber(SmrSession::getGameID()) . ' AND timestamp > ' . $db->escapeNumber(TIME - LOCK_DURATION));
 		$locksInQueue = -1;
-		if($db->nextRecord() && ($locksInQueue = $db->getInt('COUNT(*)')) > 0) {
+		if ($db->nextRecord() && ($locksInQueue = $db->getInt('COUNT(*)')) > 0) {
 			//usleep(100000 + mt_rand(0,50000));
 
 			// We can only have one lock in the queue, anything more means someone is screwing around
 			$db->query('SELECT COUNT(*) FROM locks_queue WHERE account_id=' . $db->escapeNumber(SmrSession::$account_id) . ' AND sector_id=' . $db->escapeNumber($sector) . ' AND timestamp > ' . $db->escapeNumber(TIME - LOCK_DURATION));
-			if($db->nextRecord() && $db->getInt('COUNT(*)') > 1) {
+			if ($db->nextRecord() && $db->getInt('COUNT(*)') > 1) {
 				release_lock();
 				$locksFailed[$sector] = true;
 				create_error('Multiple actions cannot be performed at the same time!');
@@ -603,7 +603,7 @@ 
 
 function release_lock() {
 	global $db, $lock;
-	if($lock) {
+	if ($lock) {
 		$db->query('DELETE from locks_queue WHERE lock_id=' . $db->escapeNumber($lock) . ' OR timestamp<' . $db->escapeNumber(TIME - LOCK_DURATION));
 	}
 
@@ -612,15 +612,15 @@ 
 
 function doTickerAssigns($template, $player, $db) {
 	//any ticker news?
-	if($player->hasTickers()) {
+	if ($player->hasTickers()) {
 		$ticker = array();
 		$max = TIME - 60;
-		if($player->hasTicker('NEWS')) {
+		if ($player->hasTicker('NEWS')) {
 			$text = '';
 			//get recent news (5 mins)
 
-			$db->query('SELECT time,news_message FROM news WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND time >= '.$max.' ORDER BY time DESC LIMIT 4');
-			while($db->nextRecord()) {
+			$db->query('SELECT time,news_message FROM news WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND time >= ' . $max . ' ORDER BY time DESC LIMIT 4');
+			while ($db->nextRecord()) {
 				$ticker[] = array('Time' => date(DATE_FULL_SHORT, $db->getField('time')),
 								'Message'=>$db->getField('news_message'));
 			}
@@ -631,15 +631,15 @@ 
 						AND game_id=' . $db->escapeNumber($player->getGameID()) . '
 						AND message_type_id=' . $db->escapeNumber(MSG_SCOUT) . '
 						AND send_time>=' . $db->escapeNumber($max) . '
-						AND sender_id NOT IN (SELECT account_id FROM player_has_ticker WHERE type='.$db->escapeString('BLOCK').' AND expires > ' . $db->escapeNumber(TIME) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()) . ') AND receiver_delete = \'FALSE\'
+						AND sender_id NOT IN (SELECT account_id FROM player_has_ticker WHERE type='.$db->escapeString('BLOCK') . ' AND expires > ' . $db->escapeNumber(TIME) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()) . ') AND receiver_delete = \'FALSE\'
 						ORDER BY send_time DESC
 						LIMIT 4');
-			while($db->nextRecord()) {
+			while ($db->nextRecord()) {
 				$ticker[] = array('Time' => date(DATE_FULL_SHORT, $db->getField('send_time')),
 								'Message'=>$db->getField('message_text'));
 			}
 		}
-		$template->assign('Ticker',$ticker);
+		$template->assign('Ticker', $ticker);
 	}
 }
 
@@ -648,7 +648,7 @@ 
 	$template->assign('CSSColourLink', $account->getCssColourUrl());
 
 	$template->assign('FontSize', $account->getFontSize() - 20);
-	$template->assign('timeDisplay',date(DATE_FULL_SHORT_SPLIT,TIME));
+	$template->assign('timeDisplay', date(DATE_FULL_SHORT_SPLIT, TIME));
 
 	$container = create_container('skeleton.php');
 
@@ -657,172 +657,172 @@ 
 		$template->assign('GameName', Globals::getGameName(SmrSession::getGameID()));
 		$template->assign('GameID', SmrSession::getGameID());
 
-		$template->assign('PlotCourseLink',Globals::getPlotCourseHREF());
+		$template->assign('PlotCourseLink', Globals::getPlotCourseHREF());
 
-		$template->assign('TraderLink',Globals::getTraderStatusHREF());
+		$template->assign('TraderLink', Globals::getTraderStatusHREF());
 
-		$template->assign('PoliticsLink',Globals::getPoliticsHREF());
+		$template->assign('PoliticsLink', Globals::getPoliticsHREF());
 
 		$container['body'] = 'combat_log_list.php';
-		$template->assign('CombatLogsLink',SmrSession::getNewHREF($container));
+		$template->assign('CombatLogsLink', SmrSession::getNewHREF($container));
 
-		$template->assign('PlanetLink',Globals::getPlanetListHREF($player->getAllianceID()));
+		$template->assign('PlanetLink', Globals::getPlanetListHREF($player->getAllianceID()));
 
 		$container['body'] = 'forces_list.php';
-		$template->assign('ForcesLink',SmrSession::getNewHREF($container));
+		$template->assign('ForcesLink', SmrSession::getNewHREF($container));
 
 		$container['body'] = 'message_view.php';
-		$template->assign('MessagesLink',SmrSession::getNewHREF($container));
+		$template->assign('MessagesLink', SmrSession::getNewHREF($container));
 
 		$container['body'] = 'news_read_current.php';
-		$template->assign('ReadNewsLink',SmrSession::getNewHREF($container));
+		$template->assign('ReadNewsLink', SmrSession::getNewHREF($container));
 
 		$container['body'] = 'galactic_post_current.php';
-		$template->assign('GalacticPostLink',SmrSession::getNewHREF($container));
+		$template->assign('GalacticPostLink', SmrSession::getNewHREF($container));
 
 		$container['body'] = 'trader_search.php';
-		$template->assign('SearchForTraderLink',SmrSession::getNewHREF($container));
+		$template->assign('SearchForTraderLink', SmrSession::getNewHREF($container));
 
 		$container['body'] = 'rankings_player_experience.php';
-		$template->assign('RankingsLink',SmrSession::getNewHREF($container));
+		$template->assign('RankingsLink', SmrSession::getNewHREF($container));
 
 		$container['body'] = 'hall_of_fame_new.php';
 		$container['game_id'] = $player->getGameID();
-		$template->assign('CurrentHallOfFameLink',SmrSession::getNewHREF($container));
+		$template->assign('CurrentHallOfFameLink', SmrSession::getNewHREF($container));
 	}
 
 	if (SmrSession::$account_id > 0) {
 		$container = create_container('skeleton.php', 'hall_of_fame_new.php');
-		$template->assign('HallOfFameLink',SmrSession::getNewHREF($container));
+		$template->assign('HallOfFameLink', SmrSession::getNewHREF($container));
 
-		$template->assign('AccountID',SmrSession::$account_id);
-		$template->assign('PlayGameLink',SmrSession::getNewHREF(create_container('game_play_preprocessing.php')));
+		$template->assign('AccountID', SmrSession::$account_id);
+		$template->assign('PlayGameLink', SmrSession::getNewHREF(create_container('game_play_preprocessing.php')));
 
-		$template->assign('LogoutLink',SmrSession::getNewHREF(create_container('logoff.php')));
+		$template->assign('LogoutLink', SmrSession::getNewHREF(create_container('logoff.php')));
 	}
 
 	$container = create_container('skeleton.php', 'preferences.php');
-	$template->assign('PreferencesLink',SmrSession::getNewHREF($container));
+	$template->assign('PreferencesLink', SmrSession::getNewHREF($container));
 
 	$container['body'] = 'admin_tools.php';
-	$template->assign('AdminToolsLink',SmrSession::getNewHREF($container));
+	$template->assign('AdminToolsLink', SmrSession::getNewHREF($container));
 
 	$container['body'] = 'album_edit.php';
-	$template->assign('EditPhotoLink',SmrSession::getNewHREF($container));
+	$template->assign('EditPhotoLink', SmrSession::getNewHREF($container));
 
 	$container['body'] = 'bug_report.php';
-	$template->assign('ReportABugLink',SmrSession::getNewHREF($container));
+	$template->assign('ReportABugLink', SmrSession::getNewHREF($container));
 
 	$container['body'] = 'contact.php';
-	$template->assign('ContactFormLink',SmrSession::getNewHREF($container));
+	$template->assign('ContactFormLink', SmrSession::getNewHREF($container));
 
 	if (SmrSession::hasGame()) {
 		$container['body'] = 'chat_rules.php';
-		$template->assign('IRCLink',SmrSession::getNewHREF($container));
+		$template->assign('IRCLink', SmrSession::getNewHREF($container));
 	}
 
 	$container['body'] = 'donation.php';
-	$template->assign('DonateLink',SmrSession::getNewHREF($container));
+	$template->assign('DonateLink', SmrSession::getNewHREF($container));
 
 
 
 	if (SmrSession::hasGame()) {
 		$db->query('SELECT message_type_id,COUNT(*) FROM player_has_unread_messages WHERE account_id=' . $db->escapeNumber($player->getAccountID()) . ' AND game_id=' . $db->escapeNumber($player->getGameID()) . ' GROUP BY message_type_id');
 
-		if($db->getNumRows()) {
+		if ($db->getNumRows()) {
 			$messages = array();
-			while($db->nextRecord()) {
+			while ($db->nextRecord()) {
 				$messages[$db->getInt('message_type_id')] = $db->getInt('COUNT(*)');
 			}
 
-			$container = create_container('skeleton.php','message_view.php');
+			$container = create_container('skeleton.php', 'message_view.php');
 
-			if(isset($messages[MSG_GLOBAL])) {
+			if (isset($messages[MSG_GLOBAL])) {
 				$container['folder_id'] = MSG_GLOBAL;
-				$template->assign('MessageGlobalLink',SmrSession::getNewHREF($container));
-				$template->assign('MessageGlobalNum',$messages[MSG_GLOBAL]);
+				$template->assign('MessageGlobalLink', SmrSession::getNewHREF($container));
+				$template->assign('MessageGlobalNum', $messages[MSG_GLOBAL]);
 			}
 
-			if(isset($messages[MSG_PLAYER])) {
+			if (isset($messages[MSG_PLAYER])) {
 				$container['folder_id'] = MSG_PLAYER;
-				$template->assign('MessagePersonalLink',SmrSession::getNewHREF($container));
-				$template->assign('MessagePersonalNum',$messages[MSG_PLAYER]);
+				$template->assign('MessagePersonalLink', SmrSession::getNewHREF($container));
+				$template->assign('MessagePersonalNum', $messages[MSG_PLAYER]);
 			}
 
-			if(isset($messages[MSG_SCOUT])) {
+			if (isset($messages[MSG_SCOUT])) {
 				$container['folder_id'] = MSG_SCOUT;
-				$template->assign('MessageScoutLink',SmrSession::getNewHREF($container));
-				$template->assign('MessageScoutNum',$messages[MSG_SCOUT]);
+				$template->assign('MessageScoutLink', SmrSession::getNewHREF($container));
+				$template->assign('MessageScoutNum', $messages[MSG_SCOUT]);
 			}
 
-			if(isset($messages[MSG_POLITICAL])) {
+			if (isset($messages[MSG_POLITICAL])) {
 				$container['folder_id'] = MSG_POLITICAL;
-				$template->assign('MessagePoliticalLink',SmrSession::getNewHREF($container));
-				$template->assign('MessagePoliticalNum',$messages[MSG_POLITICAL]);
+				$template->assign('MessagePoliticalLink', SmrSession::getNewHREF($container));
+				$template->assign('MessagePoliticalNum', $messages[MSG_POLITICAL]);
 			}
 
-			if(isset($messages[MSG_ALLIANCE])) {
+			if (isset($messages[MSG_ALLIANCE])) {
 				$container['folder_id'] = MSG_ALLIANCE;
-				$template->assign('MessageAllianceLink',SmrSession::getNewHREF($container));
-				$template->assign('MessageAllianceNum',$messages[MSG_ALLIANCE]);
+				$template->assign('MessageAllianceLink', SmrSession::getNewHREF($container));
+				$template->assign('MessageAllianceNum', $messages[MSG_ALLIANCE]);
 			}
 
-			if(isset($messages[MSG_ADMIN])) {
+			if (isset($messages[MSG_ADMIN])) {
 				$container['folder_id'] = MSG_ADMIN;
-				$template->assign('MessageAdminLink',SmrSession::getNewHREF($container));
-				$template->assign('MessageAdminNum',$messages[MSG_ADMIN]);
+				$template->assign('MessageAdminLink', SmrSession::getNewHREF($container));
+				$template->assign('MessageAdminNum', $messages[MSG_ADMIN]);
 			}
 
-			if(isset($messages[MSG_CASINO])) {
+			if (isset($messages[MSG_CASINO])) {
 				$container['folder_id'] = MSG_CASINO;
-				$template->assign('MessageCasinoLink',SmrSession::getNewHREF($container));
-				$template->assign('MessageCasinoNum',$messages[MSG_CASINO]);
+				$template->assign('MessageCasinoLink', SmrSession::getNewHREF($container));
+				$template->assign('MessageCasinoNum', $messages[MSG_CASINO]);
 			}
 
-			if(isset($messages[MSG_PLANET])) {
+			if (isset($messages[MSG_PLANET])) {
 				$container = create_container('planet_msg_processing.php');
-				$template->assign('MessagePlanetLink',SmrSession::getNewHREF($container));
-				$template->assign('MessagePlanetNum',$messages[MSG_PLANET]);
+				$template->assign('MessagePlanetLink', SmrSession::getNewHREF($container));
+				$template->assign('MessagePlanetNum', $messages[MSG_PLANET]);
 			}
 		}
 
 		$container = create_container('skeleton.php', 'trader_search_result.php');
-		$container['player_id']	= $player->getPlayerID();
-		$template->assign('PlayerNameLink',SmrSession::getNewHREF($container));
+		$container['player_id'] = $player->getPlayerID();
+		$template->assign('PlayerNameLink', SmrSession::getNewHREF($container));
 
-		if (is_array(Globals::getHiddenPlayers())&&in_array($player->getAccountID(), Globals::getHiddenPlayers())) $template->assign('PlayerInvisible',true);
+		if (is_array(Globals::getHiddenPlayers()) && in_array($player->getAccountID(), Globals::getHiddenPlayers())) $template->assign('PlayerInvisible', true);
 
 		// ******* Hardware *******
 		$container = create_container('skeleton.php', 'configure_hardware.php');
 
-		$template->assign('HardwareLink',SmrSession::getNewHREF($container));
+		$template->assign('HardwareLink', SmrSession::getNewHREF($container));
 
 		// ******* Forces *******
-		$template->assign('ForceDropLink',SmrSession::getNewHREF(create_container('skeleton.php', 'forces_drop.php')));
+		$template->assign('ForceDropLink', SmrSession::getNewHREF(create_container('skeleton.php', 'forces_drop.php')));
 
 		if ($ship->hasMines()) {
 			$container = create_container('forces_drop_processing.php');
 			$container['owner_id'] = $player->getAccountID();
 			$container['drop_mines'] = 1;
-			$template->assign('DropMineLink',SmrSession::getNewHREF($container));
+			$template->assign('DropMineLink', SmrSession::getNewHREF($container));
 		}
 		if ($ship->hasCDs()) {
 			$container = create_container('forces_drop_processing.php');
 			$container['owner_id'] = $player->getAccountID();
 			$container['drop_combat_drones'] = 1;
-			$template->assign('DropCDLink',SmrSession::getNewHREF($container));
+			$template->assign('DropCDLink', SmrSession::getNewHREF($container));
 		}
 
 		if ($ship->hasSDs()) {
 			$container = create_container('forces_drop_processing.php');
 			$container['owner_id'] = $player->getAccountID();
 			$container['drop_scout_drones'] = 1;
-			$template->assign('DropSDLink',SmrSession::getNewHREF($container));
+			$template->assign('DropSDLink', SmrSession::getNewHREF($container));
 		}
 
-		$template->assign('CargoJettisonLink',SmrSession::getNewHREF(create_container('skeleton.php', 'cargo_dump.php')));
+		$template->assign('CargoJettisonLink', SmrSession::getNewHREF(create_container('skeleton.php', 'cargo_dump.php')));
 
-		$template->assign('WeaponReorderLink',SmrSession::getNewHREF(create_container('skeleton.php', 'weapon_reorder.php')));
+		$template->assign('WeaponReorderLink', SmrSession::getNewHREF(create_container('skeleton.php', 'weapon_reorder.php')));
 
 	}
 
@@ -852,34 +852,34 @@ 
 		$version = create_link($container, 'v' . $db->getField('major_version') . '.' . $db->getField('minor_version') . '.' . $db->getField('patch_level'));
 	}
 
-	$template->assign('Version',$version);
-	$template->assign('CurrentYear',date('Y',TIME));
+	$template->assign('Version', $version);
+	$template->assign('CurrentYear', date('Y', TIME));
 }
 
-function format_time($seconds, $short=false) {
-	$minutes=0;
-	$hours=0;
-	$days=0;
-	$weeks=0;
+function format_time($seconds, $short = false) {
+	$minutes = 0;
+	$hours = 0;
+	$days = 0;
+	$weeks = 0;
 	$string = '';
 	if ($seconds == 0) {
 		$string = '0 seconds';
 		if ($short) $string = '0s';
 	}
 	if ($seconds >= 60) {
-		$minutes = floor($seconds/60);
+		$minutes = floor($seconds / 60);
 		$seconds = $seconds % 60;
 	}
 	if ($minutes >= 60) {
-		$hours = floor($minutes/60);
+		$hours = floor($minutes / 60);
 		$minutes = $minutes % 60;
 	}
 	if ($hours >= 24) {
-		$days = floor($hours/24);
+		$days = floor($hours / 24);
 		$hours = $hours % 24;
 	}
 	if ($days >= 7) {
-		$weeks = floor($days/7);
+		$weeks = floor($days / 7);
 		$days = $days % 7;
 	}
 	if ($weeks > 0) {
@@ -941,19 +941,19 @@ 
 	return $string;
 }
 
-function number_colour_format($number,$justSign = false) {
+function number_colour_format($number, $justSign = false) {
 	$formatted = '<span';
-	if($number > 0)
+	if ($number > 0)
 		$formatted .= ' class="green">+';
-	else if($number < 0)
+	else if ($number < 0)
 		$formatted .= ' class="red">-';
 	else
 		$formatted .= '>';
-	if($justSign===false) {
+	if ($justSign === false) {
 		$decimalPlaces = 0;
-		if(($pos = strpos($number,'.'))!==false)
-			$decimalPlaces = strlen(substr($number,$pos+1));
-		$formatted .= number_format(abs($number),$decimalPlaces);
+		if (($pos = strpos($number, '.')) !== false)
+			$decimalPlaces = strlen(substr($number, $pos + 1));
+		$formatted .= number_format(abs($number), $decimalPlaces);
 	}
 	$formatted .= '</span>';
 	return $formatted;
@@ -974,7 +974,7 @@ 
 	// Normalize the weights so that their sum is much larger than 1.
 	$maxWeight = max($choices);
 	foreach ($choices as $key => &$weight) {
-		$weight = round($weight * 1000/$maxWeight);
+		$weight = round($weight * 1000 / $maxWeight);
 	} unset($weight);
 
 	// Generate a random number that is lower than the sum of the weights.
@@ -998,5 +998,5 @@ 
 	if ($length % 2 != 0) {
 		throw new Exception('Length must be a multiple of 2!');
 	}
-	return bin2hex(random_bytes($length/2));
+	return bin2hex(random_bytes($length / 2));
 }

Braces +137 added lines, -86 removed lines

@@ -8,8 +8,9 @@ 
 
 function parseBoolean($check) {
 	// Only negative strings are not implicitly converted to the correct bool
-	if(is_string($check) && (strcasecmp($check,'NO') == 0 || strcasecmp($check,'FALSE')==0))
-		return false;
+	if(is_string($check) && (strcasecmp($check,'NO') == 0 || strcasecmp($check,'FALSE')==0)) {
+			return false;
+	}
 	return (bool)$check;
 }
 
@@ -28,8 +29,9 @@ 
 			break;
 			case 'player':
 				$playerID = $default;
-				if(!is_numeric($playerID))
-					$playerID = $tagParams['id'];
+				if(!is_numeric($playerID)) {
+									$playerID = $tagParams['id'];
+				}
 				$bbPlayer = SmrPlayer::getPlayerByPlayerID($playerID, $overrideGameID);
 				if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 					return true;
@@ -43,8 +45,9 @@ 
 			case 'alliance':
 				$db = new SmrMySqlDatabase();
 				$allianceID = $default;
-				if(!is_numeric($allianceID))
-					$allianceID = $tagParams['id'];
+				if(!is_numeric($allianceID)) {
+									$allianceID = $tagParams['id'];
+				}
 				$alliance = SmrAlliance::getAlliance($allianceID, $overrideGameID);
 				if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 					return true;
@@ -53,10 +56,11 @@ 
 				if($disableBBLinks===false && $overrideGameID==SmrSession::getGameID()) {
 					$container = create_container('skeleton.php');
 					$container['alliance_id'] = $alliance->getAllianceID();
-					if (is_object($player) && $alliance->getAllianceID() == $player->getAllianceID())
-						$container['body'] = 'alliance_mod.php';
-					else
-						$container['body'] = 'alliance_roster.php';
+					if (is_object($player) && $alliance->getAllianceID() == $player->getAllianceID()) {
+											$container['body'] = 'alliance_mod.php';
+					} else {
+											$container['body'] = 'alliance_roster.php';
+					}
 					return create_link($container, $alliance->getAllianceName());
 				}
 				return $alliance->getAllianceName();
@@ -80,8 +84,9 @@ 
 					return true;
 				}
 				if ($timeString != '' && ($time = strtotime($timeString)) !== false) {
-					if(is_object($account))
-						$time += $account->getOffset() * 3600;
+					if(is_object($account)) {
+											$time += $account->getOffset() * 3600;
+					}
 					return date(DATE_FULL_SHORT, $time);
 				}
 			break;
@@ -124,8 +129,7 @@ 
 				return '<div class="buttonA"><a class="buttonA" href="' . SmrSession::getNewHREF($container) . '">Join ' . $alliance->getAllianceName() . '</a></div>';
 			break;
 		}
-	}
-	catch (Exception $e) {
+	} catch (Exception $e) {
 	}
 	if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 		return false;
@@ -170,15 +174,15 @@ 
 		$bbParser->addRule('join_alliance',$smrRule);
 	}
 	global $disableBBLinks;
-	if($noLinks===true)
-		$disableBBLinks = true;
-	else
-		$disableBBLinks = false;
+	if($noLinks===true) {
+			$disableBBLinks = true;
+	} else {
+			$disableBBLinks = false;
+	}
 	if(strpos($message, '[')!==false) { //We have BBCode so let's do a full parse.
 		$message = $bbParser->parse($message);
 		$message = str_replace('&lt;br /&gt;','<br />',$message);
-	}
-	else { //Otherwise just convert newlines
+	} else { //Otherwise just convert newlines
 		$message = nl2br($message, true);
 	}
 	return $message;
@@ -218,8 +222,7 @@ 
 
 	if(!is_array($actions)) {
 		$form['submit'] =  '<input class="submit" type="submit" name="action" value="' . htmlspecialchars($actions) . '">';
-	}
-	else {
+	} else {
 		$form['submit'] = array();
 		foreach($actions as $action) {
 			$form['submit'][$action[0]] =  '<input class="submit" type="submit" name="action" value="' . htmlspecialchars($action[1]) . '">';
@@ -264,8 +267,9 @@ 
 }
 
 function forward($new_container) {
-	if(defined('OVERRIDE_FORWARD')&&OVERRIDE_FORWARD===true)
-		return overrideForward($new_container);
+	if(defined('OVERRIDE_FORWARD')&&OVERRIDE_FORWARD===true) {
+			return overrideForward($new_container);
+	}
 	resetContainer($new_container);
 	do_voodoo();
 }
@@ -281,8 +285,9 @@ 
 	global $var, $container;
 
 	// transfer this value to next container
-	if(isset($var[$what]))
-		$container[$what] = $var[$what];
+	if(isset($var[$what])) {
+			$container[$what] = $var[$what];
+	}
 
 }
 
@@ -310,8 +315,7 @@ 
 	}
 	if($maxValue-$minValue==0) {
 		return $text;
-	}
-	else {
+	} else {
 		$normalisedValue = round(510*max(0,min($maxValue,$value)-$minValue)/($maxValue-$minValue))-255;
 	}
 	if ($type == 'Game') {
@@ -321,28 +325,33 @@ 
 			if(strlen($g_component) == 1) {
 				$g_component = '0' . $g_component;
 			}
-		}
-		else if($normalisedValue > 0) {
+		} else if($normalisedValue > 0) {
 			$g_component='ff';
 			$r_component = dechex(255-$normalisedValue);
 			if(strlen($r_component) == 1) {
 				$r_component = '0' . $r_component;
 			}
-		}
-		else {
+		} else {
 			$r_component = 'ff';
 			$g_component = 'ff';
 		}
 		$colour = $r_component . $g_component . '00';
-		if ($return_type == 'Colour') return $colour;
+		if ($return_type == 'Colour') {
+			return $colour;
+		}
 		return '<span style="color:#' . $colour . '">' . $text . '</span>';
-	}
-	elseif ($type == 'IRC') {
+	} elseif ($type == 'IRC') {
 		//IRC color codes
-		if ($normalisedValue == 255) $colour = '[k03]';
-		elseif ($normalisedValue == -255) $colour = '[k04]';
-		else $colour = '[k08]';
-		if ($return_type == 'Colour') return $colour;
+		if ($normalisedValue == 255) {
+			$colour = '[k03]';
+		} elseif ($normalisedValue == -255) {
+			$colour = '[k04]';
+		} else {
+			$colour = '[k08]';
+		}
+		if ($return_type == 'Colour') {
+			return $colour;
+		}
 		return $colour . $text;
 	}
 }
@@ -412,10 +421,18 @@ 
 	$account =& SmrAccount::getAccount(SmrSession::$account_id);
 	$GLOBALS['account'] =& $account;
 
-	if(!defined('DATE_DATE_SHORT')) define('DATE_DATE_SHORT',$account->getShortDateFormat());
-	if(!defined('DATE_TIME_SHORT')) define('DATE_TIME_SHORT',$account->getShortTimeFormat());
-	if(!defined('DATE_FULL_SHORT')) define('DATE_FULL_SHORT',DATE_DATE_SHORT.' '.DATE_TIME_SHORT);
-	if(!defined('DATE_FULL_SHORT_SPLIT')) define('DATE_FULL_SHORT_SPLIT',DATE_DATE_SHORT.'\<b\r /\>'.DATE_TIME_SHORT);
+	if(!defined('DATE_DATE_SHORT')) {
+		define('DATE_DATE_SHORT',$account->getShortDateFormat());
+	}
+	if(!defined('DATE_TIME_SHORT')) {
+		define('DATE_TIME_SHORT',$account->getShortTimeFormat());
+	}
+	if(!defined('DATE_FULL_SHORT')) {
+		define('DATE_FULL_SHORT',DATE_DATE_SHORT.' '.DATE_TIME_SHORT);
+	}
+	if(!defined('DATE_FULL_SHORT_SPLIT')) {
+		define('DATE_FULL_SHORT_SPLIT',DATE_DATE_SHORT.'\<b\r /\>'.DATE_TIME_SHORT);
+	}
 
 
 	$db = new SmrMySqlDatabase();
@@ -482,8 +499,9 @@ 
 
 		if (!$player->isDead() && $player->getNewbieTurns() <= NEWBIE_TURNS_WARNING_LIMIT &&
 			$player->getNewbieWarning() &&
-			$var['url'] != 'newbie_warning_processing.php')
-			forward(create_container('newbie_warning_processing.php'));
+			$var['url'] != 'newbie_warning_processing.php') {
+					forward(create_container('newbie_warning_processing.php'));
+		}
 	}
 
 	if($var['url'] != 'skeleton.php') {
@@ -493,13 +511,13 @@ 
 		$PHP_OUTPUT = '';
 		if ($var['body']=='error.php') { // infinite includes for error pages
 			require(get_file_loc($var['body']));
-		}
-		else {
+		} else {
 			require_once(get_file_loc($var['body']));
 		}
 
-		if($PHP_OUTPUT!='')
-			$template->assign('PHP_OUTPUT',$PHP_OUTPUT);
+		if($PHP_OUTPUT!='') {
+					$template->assign('PHP_OUTPUT',$PHP_OUTPUT);
+		}
 	}
 
 	if (SmrSession::hasGame()) {
@@ -563,8 +581,9 @@ 
 function acquire_lock($sector) {
 	global $db, $lock, $locksFailed;
 
-	if($lock)
-		return true;
+	if($lock) {
+			return true;
+	}
 
 	// Insert ourselves into the queue.
 	$db->query('INSERT INTO locks_queue (game_id,account_id,sector_id,timestamp) VALUES(' . $db->escapeNumber(SmrSession::getGameID()) . ',' . $db->escapeNumber(SmrSession::$account_id) . ',' . $db->escapeNumber($sector) . ',' . $db->escapeNumber(TIME) . ')');
@@ -590,8 +609,7 @@ 
 
 			usleep(25000 * $locksInQueue);
 			continue;
-		}
-		else {
+		} else {
 			return true;
 		}
 	}
@@ -790,7 +808,9 @@ 
 		$container['player_id']	= $player->getPlayerID();
 		$template->assign('PlayerNameLink',SmrSession::getNewHREF($container));
 
-		if (is_array(Globals::getHiddenPlayers())&&in_array($player->getAccountID(), Globals::getHiddenPlayers())) $template->assign('PlayerInvisible',true);
+		if (is_array(Globals::getHiddenPlayers())&&in_array($player->getAccountID(), Globals::getHiddenPlayers())) {
+			$template->assign('PlayerInvisible',true);
+		}
 
 		// ******* Hardware *******
 		$container = create_container('skeleton.php', 'configure_hardware.php');
@@ -864,7 +884,9 @@ 
 	$string = '';
 	if ($seconds == 0) {
 		$string = '0 seconds';
-		if ($short) $string = '0s';
+		if ($short) {
+			$string = '0s';
+		}
 	}
 	if ($seconds >= 60) {
 		$minutes = floor($seconds/60);
@@ -884,58 +906,85 @@ 
 	}
 	if ($weeks > 0) {
 		$string .= $weeks;
-		if ($short) $string .= 'w';
-		else {
+		if ($short) {
+			$string .= 'w';
+		} else {
 			$string .= ' week';
-			if ($weeks > 1) $string .= 's';
+			if ($weeks > 1) {
+				$string .= 's';
+			}
 		}
 	}
 	if ($days > 0) {
 		$before = $weeks;
 		$after = $hours + $minutes + $seconds;
-		if ($before > 0 && $after > 0) $string .= ', ';
-		elseif ($before > 0 && $after == 0) $string .= ' and ';
+		if ($before > 0 && $after > 0) {
+			$string .= ', ';
+		} elseif ($before > 0 && $after == 0) {
+			$string .= ' and ';
+		}
 		$string .= $days;
-		if ($short) $string .= 'd';
-		else {
+		if ($short) {
+			$string .= 'd';
+		} else {
 			$string .= ' day';
-			if ($days > 1) $string .= 's';
+			if ($days > 1) {
+				$string .= 's';
+			}
 		}
 	}
 	if ($hours > 0) {
 		$before = $weeks + $days;
 		$after = $minutes + $seconds;
-		if ($before > 0 && $after > 0) $string .= ', ';
-		elseif ($before > 0 && $after == 0) $string .= ' and ';
+		if ($before > 0 && $after > 0) {
+			$string .= ', ';
+		} elseif ($before > 0 && $after == 0) {
+			$string .= ' and ';
+		}
 		$string .= $hours;
-		if ($short) $string .= 'h';
-		else {
+		if ($short) {
+			$string .= 'h';
+		} else {
 			$string .= ' hour';
-			if ($hours > 1) $string .= 's';
+			if ($hours > 1) {
+				$string .= 's';
+			}
 		}
 	}
 	if ($minutes > 0) {
 		$before = $weeks + $days + $hours;
 		$after = $seconds;
-		if ($before > 0 && $after > 0) $string .= ', ';
-		elseif ($before > 0 && $after == 0) $string .= ' and ';
+		if ($before > 0 && $after > 0) {
+			$string .= ', ';
+		} elseif ($before > 0 && $after == 0) {
+			$string .= ' and ';
+		}
 		$string .= $minutes;
-		if ($short) $string .= 'm';
-		else {
+		if ($short) {
+			$string .= 'm';
+		} else {
 			$string .= ' minute';
-			if ($minutes > 1) $string .= 's';
+			if ($minutes > 1) {
+				$string .= 's';
+			}
 		}
 	}
 	if ($seconds > 0) {
 		$before = $weeks + $days + $hours + $minutes;
 		$after = 0;
-		if ($before > 0 && $after > 0) $string .= ', ';
-		elseif ($before > 0 && $after == 0) $string .= ' and ';
+		if ($before > 0 && $after > 0) {
+			$string .= ', ';
+		} elseif ($before > 0 && $after == 0) {
+			$string .= ' and ';
+		}
 		$string .= $seconds;
-		if ($short) $string .= 's';
-		else {
+		if ($short) {
+			$string .= 's';
+		} else {
 			$string .= ' second';
-			if ($seconds > 1) $string .= 's';
+			if ($seconds > 1) {
+				$string .= 's';
+			}
 		}
 	}
 	return $string;
@@ -943,16 +992,18 @@ 
 
 function number_colour_format($number,$justSign = false) {
 	$formatted = '<span';
-	if($number > 0)
-		$formatted .= ' class="green">+';
-	else if($number < 0)
-		$formatted .= ' class="red">-';
-	else
-		$formatted .= '>';
+	if($number > 0) {
+			$formatted .= ' class="green">+';
+	} else if($number < 0) {
+			$formatted .= ' class="red">-';
+	} else {
+			$formatted .= '>';
+	}
 	if($justSign===false) {
 		$decimalPlaces = 0;
-		if(($pos = strpos($number,'.'))!==false)
-			$decimalPlaces = strlen(substr($number,$pos+1));
+		if(($pos = strpos($number,'.'))!==false) {
+					$decimalPlaces = strlen(substr($number,$pos+1));
+		}
 		$formatted .= number_format(abs($number),$decimalPlaces);
 	}
 	$formatted .= '</span>';

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 $last_accessed;
 
 	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));
@@ -283,8 +283,8 @@ 
 	}
 
 	private 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');
 	}
 
@@ -299,7 +299,7 @@ 
 	 * Retrieve the session var for the page given by $sn.
 	 * If $sn is not specified, use the current page (i.e. self::$SN).
 	 */
-	public static function retrieveVar($sn=null) {
+	public static function retrieveVar($sn = null) {
 		if (is_null($sn)) {
 			$sn = self::$SN;
 		}
@@ -308,7 +308,7 @@ 
 		}
 		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']);
@@ -324,7 +324,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])) {
@@ -340,31 +340,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]);
 		}
@@ -380,15 +380,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 {
@@ -401,14 +401,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;
@@ -423,21 +423,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) .

Braces +25 added lines, -29 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if(!defined('USING_AJAX'))
+if(!defined('USING_AJAX')) {
 	define('USING_AJAX',false);
+}
 class SmrSession {
 	const ALWAYS_AVAILABLE = 999999;
 	const TIME_BEFORE_EXPIRY = 3600;
@@ -149,8 +150,7 @@ 
 		// now try the cookie
 		if (isset($_COOKIE['session_id'])) {
 			self::$session_id = $_COOKIE['session_id'];
-		}
-		else {
+		} else {
 			// create a new session id
 			do {
 				self::$session_id = md5 (uniqid (mt_rand()) );
@@ -199,18 +199,15 @@ 
 				self::$account_id	= 0;
 				self::$game_id		= 0;
 				self::$var			= array();
-			}
-			else {
+			} else {
 				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]);
-					}
-					else if ($value['RemainingPageLoads'] < 0) {
+					} else if ($value['RemainingPageLoads'] < 0) {
 						//This link is no longer valid
 						unset(self::$var[$key]);
-					}
-					else {
+					} else {
 						--$value['RemainingPageLoads'];
 						if(isset($value['CommonID'])) {
 							self::$commonIDs[$value['CommonID']] = $key;
@@ -218,8 +215,7 @@ 
 					}
 				} unset($value);
 			}
-		}
-		else {
+		} else {
 			self::$generate = true;
 			self::$account_id	= 0;
 			self::$game_id		= 0;
@@ -240,8 +236,7 @@ 
 			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');
-		}
-		else {
+		} 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));
 			self::$db->query('INSERT INTO active_session (session_id, account_id, game_id, last_accessed, session_var) VALUES(' . self::$db->escapeString(self::$session_id) . ',' . self::$db->escapeNumber(self::$account_id) . ',' . self::$db->escapeNumber(self::$game_id) . ',' . self::$db->escapeNumber(TIME) . ',' . self::$db->escapeBinary($compressed) . ')');
 			self::$generate = false;
@@ -283,9 +278,10 @@ 
 	}
 
 	private 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');
+		}
 	}
 
 	public static function destroy() {
@@ -357,8 +353,9 @@ 
 		}
 
 		self::$var[$sn] = $container;
-		if(!$lock && !USING_AJAX)
-			self::update();
+		if(!$lock && !USING_AJAX) {
+					self::update();
+		}
 		return $sn;
 	}
 
@@ -367,8 +364,7 @@ 
 		if($value===null) {
 			unset($var[$key]);
 			unset(self::$var[self::$SN][$key]);
-		}
-		else {
+		} else {
 			$var[$key] = $value;
 			self::$var[self::$SN][$key] = $value;
 		}
@@ -390,8 +386,7 @@ 
 
 		if($sn === false) {
 			$sn = self::generateSN($container);
-		}
-		else {
+		} else {
 			// If we've been provided an SN to use then copy over the existing 'PreviousRequestTime'
 			$container['PreviousRequestTime'] = self::$var[$sn]['PreviousRequestTime'];
 		}
@@ -404,8 +399,7 @@ 
 		if(isset(self::$commonIDs[$container['CommonID']])) {
 			$sn = self::$commonIDs[$container['CommonID']];
 			$container['PreviousRequestTime'] = isset(self::$var[$sn]) ? self::$var[$sn]['PreviousRequestTime'] : MICRO_TIME;
-		}
-		else {
+		} else {
 			do {
 				$sn = substr(md5(mt_rand()),0,8);
 			} while(isset(self::$var[$sn]));
@@ -425,10 +419,11 @@ 
 
 	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;
+		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) {
@@ -437,8 +432,9 @@ 
 	}
 
 	public static function saveAjaxReturns() {
-		if(empty(self::$ajaxReturns))
-			return;
+		if(empty(self::$ajaxReturns)) {
+					return;
+		}
 		$compressed = gzcompress(serialize(self::$ajaxReturns));
 		self::$db->query('UPDATE active_session SET ajax_returns=' . self::$db->escapeBinary($compressed) .
 				' WHERE session_id=' . self::$db->escapeString(self::$session_id) . ' LIMIT 1');