smrealms / smr

htdocs/album/album_comment.php

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
 	$account = SmrAccount::getAccount(SmrSession::$account_id);
 
 	if (isset($_GET['action']) && $_GET['action'] == 'Moderate') {
-		if(!$account->hasPermission(PERMISSION_MODERATE_PHOTO_ALBUM))
+		if (!$account->hasPermission(PERMISSION_MODERATE_PHOTO_ALBUM))
 			create_error_offline('You do not have permission to do that!');
 		$container = create_container('skeleton.php', 'album_moderate.php');
 		$container['account_id'] = $album_id;
@@ -46,12 +46,12 @@ 
 	$curr_time = TIME;
 
 	$comment = word_filter($comment);
-	$account->sendMessageToBox(BOX_ALBUM_COMMENTS,$comment);
+	$account->sendMessageToBox(BOX_ALBUM_COMMENTS, $comment);
 
 	// check if we have comments for this album already
 	$db->lockTable('album_has_comments');
 
-	$db->query('SELECT MAX(comment_id) FROM album_has_comments WHERE album_id = '.$db->escapeNumber($album_id));
+	$db->query('SELECT MAX(comment_id) FROM album_has_comments WHERE album_id = ' . $db->escapeNumber($album_id));
 	if ($db->nextRecord())
 		$comment_id = $db->getField('MAX(comment_id)') + 1;
 	else
@@ -59,12 +59,12 @@ 
 
 	$db->query('INSERT INTO album_has_comments
 				(album_id, comment_id, time, post_id, msg)
-				VALUES ('.$db->escapeNumber($album_id).', '.$db->escapeNumber($comment_id).', '.$db->escapeNumber($curr_time).', '.$db->escapeNumber($account->getAccountID()).', '.$db->escapeString($comment).')');
+				VALUES ('.$db->escapeNumber($album_id) . ', ' . $db->escapeNumber($comment_id) . ', ' . $db->escapeNumber($curr_time) . ', ' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeString($comment) . ')');
 	$db->unlock();
 
 	header('Location: /album/?' . get_album_nick($album_id));
 	exit;
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }

Braces +28 added lines, -22 removed lines

@@ -10,25 +10,30 @@ 
 	require_once(LIB . 'Default/smr.inc');
 	require_once(LIB . 'Album/album_functions.php');
 
-	if (SmrSession::$account_id == 0)
-		create_error_offline('You need to logged in to post comments!');
+	if (SmrSession::$account_id == 0) {
+			create_error_offline('You need to logged in to post comments!');
+	}
 
-	if (!isset($_GET['album_id']) || empty($_GET['album_id']))
-		create_error_offline('Which picture do you want comment?');
-	else
-		$album_id = $_GET['album_id'];
+	if (!isset($_GET['album_id']) || empty($_GET['album_id'])) {
+			create_error_offline('Which picture do you want comment?');
+	} else {
+			$album_id = $_GET['album_id'];
+	}
 
-	if (!is_numeric($album_id))
-		create_error_offline('Picture ID has to be numeric!');
+	if (!is_numeric($album_id)) {
+			create_error_offline('Picture ID has to be numeric!');
+	}
 
-	if ($album_id < 1)
-		create_error_offline('Picture ID has to be positive!');
+	if ($album_id < 1) {
+			create_error_offline('Picture ID has to be positive!');
+	}
 
 	$account = SmrAccount::getAccount(SmrSession::$account_id);
 
 	if (isset($_GET['action']) && $_GET['action'] == 'Moderate') {
-		if(!$account->hasPermission(PERMISSION_MODERATE_PHOTO_ALBUM))
-			create_error_offline('You do not have permission to do that!');
+		if(!$account->hasPermission(PERMISSION_MODERATE_PHOTO_ALBUM)) {
+					create_error_offline('You do not have permission to do that!');
+		}
 		$container = create_container('skeleton.php', 'album_moderate.php');
 		$container['account_id'] = $album_id;
 
@@ -37,10 +42,11 @@ 
 
 	$db = new SmrMySqlDatabase();
 
-	if (!isset($_GET['comment']) || empty($_GET['comment']))
-		create_error_offline('Please enter a comment.');
-	else
-		$comment = $_GET['comment'];
+	if (!isset($_GET['comment']) || empty($_GET['comment'])) {
+			create_error_offline('Please enter a comment.');
+	} else {
+			$comment = $_GET['comment'];
+	}
 
 	// get current time
 	$curr_time = TIME;
@@ -52,10 +58,11 @@ 
 	$db->lockTable('album_has_comments');
 
 	$db->query('SELECT MAX(comment_id) FROM album_has_comments WHERE album_id = '.$db->escapeNumber($album_id));
-	if ($db->nextRecord())
-		$comment_id = $db->getField('MAX(comment_id)') + 1;
-	else
-		$comment_id = 1;
+	if ($db->nextRecord()) {
+			$comment_id = $db->getField('MAX(comment_id)') + 1;
+	} else {
+			$comment_id = 1;
+	}
 
 	$db->query('INSERT INTO album_has_comments
 				(album_id, comment_id, time, post_id, msg)
@@ -64,7 +71,6 @@ 
 
 	header('Location: /album/?' . get_album_nick($album_id));
 	exit;
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }

htdocs/map_galaxy.php

Spacing +16 added lines, -16 removed lines

@@ -5,7 +5,7 @@ 
 	
 	// avoid site caching
 	header('Expires: Mon, 03 Nov 1976 16:10:00 GMT');
-	header('Last-Modified: ' . gmdate('D, d M Y H:i:s') .' GMT');
+	header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 	header('Cache-Control: no-cache');
 	header('Pragma: no-cache');
 	header('Cache-Control: post-check=0, pre-check=0', FALSE);
@@ -25,9 +25,9 @@ 
 	
 	}
 	
-	if(isset($_REQUEST['sector_id'])) {
+	if (isset($_REQUEST['sector_id'])) {
 		$sectorID = $_REQUEST['sector_id'];
-		if(!is_numeric($sectorID)) {
+		if (!is_numeric($sectorID)) {
 			header('location: /error.php?msg=Sector ID was not a number.');
 			exit;
 		}
@@ -38,16 +38,16 @@ 
 			exit;
 		}
 	}
-	else if(isset($_REQUEST['galaxy_id'])) {
+	else if (isset($_REQUEST['galaxy_id'])) {
 		$galaxyID = $_REQUEST['galaxy_id'];
-		if(!is_numeric($galaxyID)) {
+		if (!is_numeric($galaxyID)) {
 			header('location: /error.php?msg=Galaxy ID was not a number.');
 			exit;
 		}
 		try {
 			$galaxy = SmrGalaxy::getGalaxy(SmrSession::getGameID(), $galaxyID);
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			header('location: /error.php?msg=Invalid galaxy ID');
 			exit;
 		}
@@ -96,24 +96,24 @@ 
 	$template->unassign('Title');
 	$template->assign('Title', 'Galaxy Map');
 
-	if($account->getCssLink()!=null)
-		$template->assign('ExtraCSSLink',$account->getCssLink());
+	if ($account->getCssLink() != null)
+		$template->assign('ExtraCSSLink', $account->getCssLink());
 	$template->assign('CSSLink', $account->getCssUrl());
 	$template->assign('CSSColourLink', $account->getCssColourUrl());
 	$template->assign('FontSize', $account->getFontSize() - 20);
-	$template->assign('ThisGalaxy',$galaxy);
-	$template->assign('ThisAccount',$account);
-	$template->assign('GameGalaxies',SmrGalaxy::getGameGalaxies($player->getGameID()));
-	$template->assign('ThisSector',$player->getSector());
-	$template->assign('MapSectors',$mapSectors);
-	$template->assign('ThisShip',$player->getShip());
-	$template->assign('ThisPlayer',$player);
+	$template->assign('ThisGalaxy', $galaxy);
+	$template->assign('ThisAccount', $account);
+	$template->assign('GameGalaxies', SmrGalaxy::getGameGalaxies($player->getGameID()));
+	$template->assign('ThisSector', $player->getSector());
+	$template->assign('MapSectors', $mapSectors);
+	$template->assign('ThisShip', $player->getShip());
+	$template->assign('ThisPlayer', $player);
 
 	// AJAX updates are not set up for the galaxy map at this time
 	$template->assign('AJAX_ENABLE_REFRESH', false);
 
 	$template->display('GalaxyMap.inc');
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }

Braces +6 added lines, -8 removed lines

@@ -37,8 +37,7 @@ 
 			header('location: /error.php?msg=Invalid sector ID');
 			exit;
 		}
-	}
-	else if(isset($_REQUEST['galaxy_id'])) {
+	} else if(isset($_REQUEST['galaxy_id'])) {
 		$galaxyID = $_REQUEST['galaxy_id'];
 		if(!is_numeric($galaxyID)) {
 			header('location: /error.php?msg=Galaxy ID was not a number.');
@@ -46,8 +45,7 @@ 
 		}
 		try {
 			$galaxy = SmrGalaxy::getGalaxy(SmrSession::getGameID(), $galaxyID);
-		}
-		catch(Exception $e) {
+		} catch(Exception $e) {
 			header('location: /error.php?msg=Invalid galaxy ID');
 			exit;
 		}
@@ -96,8 +94,9 @@ 
 	$template->unassign('Title');
 	$template->assign('Title', 'Galaxy Map');
 
-	if($account->getCssLink()!=null)
-		$template->assign('ExtraCSSLink',$account->getCssLink());
+	if($account->getCssLink()!=null) {
+			$template->assign('ExtraCSSLink',$account->getCssLink());
+	}
 	$template->assign('CSSLink', $account->getCssUrl());
 	$template->assign('CSSColourLink', $account->getCssColourUrl());
 	$template->assign('FontSize', $account->getFontSize() - 20);
@@ -113,7 +112,6 @@ 
 	$template->assign('AJAX_ENABLE_REFRESH', false);
 
 	$template->display('GalaxyMap.inc');
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }

htdocs/login_processing.php

Indentation +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
 			exit;
 		}
 		$account->addAuthMethod($_SESSION['socialLogin']->getLoginType(),
-		                        $_SESSION['socialLogin']->getUserID());
+								$_SESSION['socialLogin']->getUserID());
 		session_destroy();
 	}
 
@@ -113,7 +113,7 @@ 
 		// save session (incase we forward)
 		SmrSession::update();
 		if (($disabled['Reason'] != CLOSE_ACCOUNT_INVALID_EMAIL_REASON) &&
-		    ($disabled['Reason'] != CLOSE_ACCOUNT_BY_REQUEST_REASON)) {
+			($disabled['Reason'] != CLOSE_ACCOUNT_BY_REQUEST_REASON)) {
 			forward(create_container('disabled.php'));
 		}
 	}

Spacing +16 added lines, -16 removed lines

@@ -14,9 +14,9 @@ 
 	// ********************************
 
 	if (SmrSession::$account_id == 0) {
-		if(isset($_REQUEST['loginType'])) {
+		if (isset($_REQUEST['loginType'])) {
 			$socialLogin = new SocialLogin($_REQUEST['loginType']);
-			if(!$socialLogin->isValid()) {
+			if (!$socialLogin->isValid()) {
 				$msg = 'Error validating login.';
 				header('Location: /login.php?msg=' . rawurlencode(htmlspecialchars($msg, ENT_QUOTES)));
 				exit;
@@ -31,7 +31,7 @@ 
 					session_start();
 				}
 				$_SESSION['socialLogin'] = $socialLogin;
-				$template->assign('SocialLogin',$socialLogin);
+				$template->assign('SocialLogin', $socialLogin);
 				// Pre-populate the login field if an account with this email exists.
 				// (Also disable creating a new account because they would just get
 				// an "Email already registered" error anyway.)
@@ -80,7 +80,7 @@ 
 	$account = SmrAccount::getAccount(SmrSession::$account_id);
 
 	// If linking a social login to an existing account
-	if(isset($_REQUEST['social'])) {
+	if (isset($_REQUEST['social'])) {
 		session_start();
 		if (!isset($_SESSION['socialLogin'])) {
 			$msg = 'Tried a social login link without having a social session.';
@@ -109,7 +109,7 @@ 
 	// ********************************
 
 	// get reason for disabled user
-	if(($disabled = $account->isDisabled())!==false) {
+	if (($disabled = $account->isDisabled()) !== false) {
 		// save session (incase we forward)
 		SmrSession::update();
 		if (($disabled['Reason'] != CLOSE_ACCOUNT_INVALID_EMAIL_REASON) &&
@@ -147,7 +147,7 @@ 
 	//now we set a cookie that we can use for mult checking
 	if (!isset($_COOKIE['Session_Info'])) {
 		//we get their info from db if they have any
-		$db->query('SELECT * FROM multi_checking_cookie WHERE account_id = '.$account->getAccountID());
+		$db->query('SELECT * FROM multi_checking_cookie WHERE account_id = ' . $account->getAccountID());
 		if ($db->nextRecord()) {
 			//convert to array
 			$old = explode('-', $db->getField('array'));
@@ -161,8 +161,8 @@ 
 		//check that each value is legit and add it to db string
 		$new = MULTI_CHECKING_COOKIE_VERSION;
 		foreach ($old as $accID)
-			if (is_numeric($accID)) $new .= '-'.$accID;
-		$db->query('REPLACE INTO multi_checking_cookie (account_id, array, `use`) VALUES ('.$db->escapeNumber($account->getAccountID()).', '.$db->escapeString($new).', '.$db->escapeString($use).')');
+			if (is_numeric($accID)) $new .= '-' . $accID;
+		$db->query('REPLACE INTO multi_checking_cookie (account_id, array, `use`) VALUES (' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeString($new) . ', ' . $db->escapeString($use) . ')');
 		//now we update their cookie with the newest info
 		setcookie('Session_Info', $new, TIME + 157680000);
 
@@ -178,7 +178,7 @@ 
 		//add this acc to the cookie if it isn't there
 		if (!in_array($account->getAccountID(), $cookie)) $cookie[] = $account->getAccountID();
 
-		$db->query('SELECT * FROM multi_checking_cookie WHERE account_id = '.$account->getAccountID());
+		$db->query('SELECT * FROM multi_checking_cookie WHERE account_id = ' . $account->getAccountID());
 		if ($db->nextRecord()) {
 			//convert to array
 			$old = explode('-', $db->getField('array'));
@@ -187,35 +187,35 @@ 
 		$old[0] = MULTI_CHECKING_COOKIE_VERSION;
 		//merge arrays...but keys are all different so we go through each value
 		foreach ($cookie as $value)
-			if (!in_array($value,$old)) $old[] = $value;
+			if (!in_array($value, $old)) $old[] = $value;
 
 		if (sizeof($old) <= 2) $use = 'FALSE';
 		else $use = 'TRUE';
 		//check that each value is legit and add it to db string
 		$new = MULTI_CHECKING_COOKIE_VERSION;
 		foreach ($old as $accID)
-			if (is_numeric($accID)) $new .= '-'.$accID;
-		$db->query('REPLACE INTO multi_checking_cookie (account_id, array, `use`) VALUES ('.$db->escapeNumber($account->getAccountID()).', '.$db->escapeString($new).', '.$db->escapeString($use).')');
+			if (is_numeric($accID)) $new .= '-' . $accID;
+		$db->query('REPLACE INTO multi_checking_cookie (account_id, array, `use`) VALUES (' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeString($new) . ', ' . $db->escapeString($use) . ')');
 		//update newest cookie
 		setcookie('Session_Info', $new, TIME + 157680000);
 
 	}
 
 	//get rid of expired messages
-	$db2->query('UPDATE message SET receiver_delete = \'TRUE\', sender_delete = \'TRUE\', expire_time = 0 WHERE expire_time < '.$db->escapeNumber(TIME).' AND expire_time != 0');
+	$db2->query('UPDATE message SET receiver_delete = \'TRUE\', sender_delete = \'TRUE\', expire_time = 0 WHERE expire_time < ' . $db->escapeNumber(TIME) . ' AND expire_time != 0');
 	// Mark message as read if it was sent to self as a mass mail.
 	$db2->query('UPDATE message SET msg_read = \'TRUE\' WHERE account_id = ' . $db->escapeNumber($account->getAccountID()) . ' AND account_id = sender_id AND message_type_id IN (' . $db->escapeArray(array(MSG_ALLIANCE, MSG_GLOBAL, MSG_POLITICAL)) . ');');
 	//check to see if we need to remove player_has_unread
 	$db2 = new SmrMySqlDatabase();
-	$db2->query('DELETE FROM player_has_unread_messages WHERE account_id = '.$db->escapeNumber($account->getAccountID()));
+	$db2->query('DELETE FROM player_has_unread_messages WHERE account_id = ' . $db->escapeNumber($account->getAccountID()));
 	$db2->query('
 		INSERT INTO player_has_unread_messages (game_id, account_id, message_type_id)
 		SELECT game_id, account_id, message_type_id FROM message WHERE account_id = ' . $db->escapeNumber($account->getAccountID()) . ' AND msg_read = ' . $db->escapeBoolean(false) . ' AND receiver_delete = ' . $db->escapeBoolean(false)
 	);
 
-	header('Location: '.$href);
+	header('Location: ' . $href);
 	exit;
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }

Braces +44 added lines, -25 removed lines

@@ -42,8 +42,7 @@ 
 				$template->display('socialRegister.inc');
 				exit;
 			}
-		}
-		else {
+		} else {
 			$login = (isset($_REQUEST['login']) ? $_REQUEST['login'] : (isset($var['login']) ? $var['login'] : ''));
 			$password = (isset($_REQUEST['password']) ? $_REQUEST['password'] : (isset($var['password']) ? $var['password'] : ''));
 
@@ -57,8 +56,7 @@ 
 			$account = SmrAccount::getAccountByName($login);
 			if (is_object($account) && $account->checkPassword($password)) {
 				SmrSession::$account_id = $account->getAccountID();
-			}
-			else {
+			} else {
 				$msg = 'Password is incorrect!';
 				header('Location: /login.php?msg=' . rawurlencode(htmlspecialchars($msg, ENT_QUOTES)));
 				exit;
@@ -152,49 +150,71 @@ 
 			//convert to array
 			$old = explode('-', $db->getField('array'));
 			//get rid of old version cookie since it isn't optimal.
-			if ($old[0] != MULTI_CHECKING_COOKIE_VERSION) $old = array();
-		} else $old = array();
+			if ($old[0] != MULTI_CHECKING_COOKIE_VERSION) {
+				$old = array();
+			}
+		} else {
+			$old = array();
+		}
 		$old[0] = MULTI_CHECKING_COOKIE_VERSION;
-		if (!in_array($account->getAccountID(), $old)) $old[] = $account->getAccountID();
-		if (sizeof($old) <= 2) $use = 'FALSE';
-		else $use = 'TRUE';
+		if (!in_array($account->getAccountID(), $old)) {
+			$old[] = $account->getAccountID();
+		}
+		if (sizeof($old) <= 2) {
+			$use = 'FALSE';
+		} else {
+			$use = 'TRUE';
+		}
 		//check that each value is legit and add it to db string
 		$new = MULTI_CHECKING_COOKIE_VERSION;
-		foreach ($old as $accID)
-			if (is_numeric($accID)) $new .= '-'.$accID;
+		foreach ($old as $accID) {
+					if (is_numeric($accID)) $new .= '-'.$accID;
+		}
 		$db->query('REPLACE INTO multi_checking_cookie (account_id, array, `use`) VALUES ('.$db->escapeNumber($account->getAccountID()).', '.$db->escapeString($new).', '.$db->escapeString($use).')');
 		//now we update their cookie with the newest info
 		setcookie('Session_Info', $new, TIME + 157680000);
 
-	}
-	else {
+	} else {
 
 		//we have a cookie so we see if we add to it etc
 		//break cookie into array
 		$cookie = explode('-', $_COOKIE['Session_Info']);
 		//check for current version
-		if ($cookie[0] != MULTI_CHECKING_COOKIE_VERSION) $cookie = array();
+		if ($cookie[0] != MULTI_CHECKING_COOKIE_VERSION) {
+			$cookie = array();
+		}
 		$cookie[0] = MULTI_CHECKING_COOKIE_VERSION;
 		//add this acc to the cookie if it isn't there
-		if (!in_array($account->getAccountID(), $cookie)) $cookie[] = $account->getAccountID();
+		if (!in_array($account->getAccountID(), $cookie)) {
+			$cookie[] = $account->getAccountID();
+		}
 
 		$db->query('SELECT * FROM multi_checking_cookie WHERE account_id = '.$account->getAccountID());
 		if ($db->nextRecord()) {
 			//convert to array
 			$old = explode('-', $db->getField('array'));
-			if ($old[0] != MULTI_CHECKING_COOKIE_VERSION) $old = array();
-		} else $old = array();
+			if ($old[0] != MULTI_CHECKING_COOKIE_VERSION) {
+				$old = array();
+			}
+		} else {
+			$old = array();
+		}
 		$old[0] = MULTI_CHECKING_COOKIE_VERSION;
 		//merge arrays...but keys are all different so we go through each value
-		foreach ($cookie as $value)
-			if (!in_array($value,$old)) $old[] = $value;
+		foreach ($cookie as $value) {
+					if (!in_array($value,$old)) $old[] = $value;
+		}
 
-		if (sizeof($old) <= 2) $use = 'FALSE';
-		else $use = 'TRUE';
+		if (sizeof($old) <= 2) {
+			$use = 'FALSE';
+		} else {
+			$use = 'TRUE';
+		}
 		//check that each value is legit and add it to db string
 		$new = MULTI_CHECKING_COOKIE_VERSION;
-		foreach ($old as $accID)
-			if (is_numeric($accID)) $new .= '-'.$accID;
+		foreach ($old as $accID) {
+					if (is_numeric($accID)) $new .= '-'.$accID;
+		}
 		$db->query('REPLACE INTO multi_checking_cookie (account_id, array, `use`) VALUES ('.$db->escapeNumber($account->getAccountID()).', '.$db->escapeString($new).', '.$db->escapeString($use).')');
 		//update newest cookie
 		setcookie('Session_Info', $new, TIME + 157680000);
@@ -215,7 +235,6 @@ 
 
 	header('Location: '.$href);
 	exit;
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }

htdocs/ship_list.php

Spacing +25 added lines, -25 removed lines

@@ -103,14 +103,14 @@ 
 	$hardwarea = @$_REQUEST['hardwarea'];
 	
 	$class		= buildSelector($db, 'class', 'ship_class_name', 'ship_class');
-	$race		= buildSelector($db, 'race', 'race_name', 'race', 'race_id');
+	$race = buildSelector($db, 'race', 'race_name', 'race', 'race_id');
 	$speed		= buildSelector($db, 'speed', 'speed', 'ship_type');
-	$hardpoint	= buildSelector($db, 'hp', 'hardpoint', 'ship_type');
+	$hardpoint = buildSelector($db, 'hp', 'hardpoint', 'ship_type');
 	$restrict	= buildRestriction();
-	$scanner	= buildToggle('scannerPick');
-	$cloak		= buildToggle('cloakPick');
+	$scanner = buildToggle('scannerPick');
+	$cloak = buildToggle('cloakPick');
 	$illusion	= buildToggle('illusionPick');
-	$jump		= buildToggle('jumpPick');
+	$jump = buildToggle('jumpPick');
 	$scramble	= buildToggle('scramblePick');
 	
 	echo ('<body>');
@@ -124,10 +124,10 @@ 
 		$seq = 'ASC';
 	}	
 	
-	$allowedOrders = array('ship_name','race_name','cost','speed','hardpoint','buyer_restriction','lvl_needed','ship_class_name');
+	$allowedOrders = array('ship_name', 'race_name', 'cost', 'speed', 'hardpoint', 'buyer_restriction', 'lvl_needed', 'ship_class_name');
 
-	if (!empty($order) && in_array($order,$allowedOrders)) {
-		$order_by = $order .' '. $seq;
+	if (!empty($order) && in_array($order, $allowedOrders)) {
+		$order_by = $order . ' ' . $seq;
 	}
 	else {
 		$order_by = 'ship_type.ship_type_id';
@@ -137,10 +137,10 @@ 
 	$order_by .= ', ship_name ASC, ship_type_support_hardware.hardware_type_id ASC';
 
 
-	if(!empty($hardwarea) && is_numeric($hardwarea) && $hardwarea >=1 && $hardwarea <= 11) {
+	if (!empty($hardwarea) && is_numeric($hardwarea) && $hardwarea >= 1 && $hardwarea <= 11) {
 		$db->query('SELECT ship_type_id
 					FROM ship_type_support_hardware
-					WHERE hardware_type_id = '.$db->escapeNumber($hardwarea).'
+					WHERE hardware_type_id = '.$db->escapeNumber($hardwarea) . '
 					ORDER BY max_amount '.$seq);
 		$db2 = new SmrMySqlDatabase();
 		while ($db->nextRecord()) {
@@ -151,7 +151,7 @@ 
 						JOIN race USING(race_id)
 						WHERE ship_type_id=' . $db->escapeNumber($db->getInt('ship_type_id')) . '
 						ORDER BY hardware_type_id ASC');
-			if($db2->nextRecord()) {
+			if ($db2->nextRecord()) {
 				$shipArray[] = buildShipStats($db2);
 			}
 		}
@@ -203,37 +203,37 @@ 
 				<?php echo $scramble ?></th>
 		</tr><?php
 	$search = array("'", " ", ",", "<", ">", "\"");
-	foreach($shipArray as $stat) {
+	foreach ($shipArray as $stat) {
 		echo ('<tr>');
 		foreach ($stat as $value) {
 			$class = '';
-			if(is_array($value)) {
+			if (is_array($value)) {
 				$class = 'class="' . $value[0] . '"';
 				$value = $value[1];
 			}
-			echo ('<td align="center" '.$class.'>'.$value.'</td>');
+			echo ('<td align="center" ' . $class . '>' . $value . '</td>');
 		}
 		echo ('</tr>');
 	} ?>
 	</table></div></div><?php
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }
 
 function buildSelector($db, $id, $name, $table, $typeField = false) {
-	$selector = '<br><select id="'.$id.'Pick" name="'.$name.'" onchange="'.$id.'Pickf()"><option value="All">All</option>';
+	$selector = '<br><select id="' . $id . 'Pick" name="' . $name . '" onchange="' . $id . 'Pickf()"><option value="All">All</option>';
 	$db->query('
-		SELECT DISTINCT '.$name. ($typeField!==false?',' . $typeField: '') . '
-		FROM '.$table.'
+		SELECT DISTINCT '.$name . ($typeField !== false ? ',' . $typeField : '') . '
+		FROM '.$table . '
 		ORDER BY '.$name);
 	$class = '';
 	while ($db->nextRecord()) {
-		if($typeField !== false) {
+		if ($typeField !== false) {
 			$class = 'class="' . $id . $db->getInt($typeField) . '"';
 		}
-		$selector .= '<option '.$class.' value="'.$db->getField($name).'">'
-			.$db->getField($name).'</option>';
+		$selector .= '<option ' . $class . ' value="' . $db->getField($name) . '">'
+			.$db->getField($name) . '</option>';
 	}
 	$selector .= '</select>';
 	return $selector;
@@ -251,7 +251,7 @@ 
 }
 
 function buildToggle($id) {
-	$toggle = '<br><select id="'.$id.'" name="'.$id.'" onchange="'.$id.'f()">'
+	$toggle = '<br><select id="' . $id . '" name="' . $id . '" onchange="' . $id . 'f()">'
 	.'<option value="All">All</option>'
 	.'<option value="Yes">Yes</option>'
 	.'<option value="">No</option></select>';
@@ -263,10 +263,10 @@ 
 function buildShipStats($db) {
 	//we want to put them all in an array so we dont have to have 15 td rows
 	$stat = array();
-	$stat[] = str_replace(' ','&nbsp;',$db->getField('ship_name'));
+	$stat[] = str_replace(' ', '&nbsp;', $db->getField('ship_name'));
 	//$stat[] = str_replace(' ','&nbsp;',$db->getField('race_name'));
 	$stat[] = array('race' . $db->getInt('race_id'), $db->getField('race_name'));
-	$stat[] = str_replace(' ','&nbsp;',$db->getField('ship_class_name'));
+	$stat[] = str_replace(' ', '&nbsp;', $db->getField('ship_class_name'));
 	$stat[] = number_format($db->getInt('cost'));
 	$stat[] = $db->getInt('speed');
 	$stat[] = $db->getInt('hardpoint');
@@ -283,7 +283,7 @@ 
 	//get our hardware
 	while ($hardware_id <= 11)
 	{
-		if($db->nextRecord()) 
+		if ($db->nextRecord()) 
 		{
 			if ($hardware_id < 7)
 				$stat[] = number_format($db->getInt('max_amount'));

Braces +19 added lines, -22 removed lines

@@ -116,11 +116,9 @@ 
 	echo ('<body>');
 	if (empty($seq)) {
 		$seq = 'ASC';
-	}
-	elseif ($seq == 'ASC') {
+	} elseif ($seq == 'ASC') {
 		$seq = 'DESC';
-	}
-	else {
+	} else {
 		$seq = 'ASC';
 	}	
 	
@@ -128,8 +126,7 @@ 
 
 	if (!empty($order) && in_array($order,$allowedOrders)) {
 		$order_by = $order .' '. $seq;
-	}
-	else {
+	} else {
 		$order_by = 'ship_type.ship_type_id';
 	}
 
@@ -155,8 +152,7 @@ 
 				$shipArray[] = buildShipStats($db2);
 			}
 		}
-	}
-	else {
+	} else {
 		$db->query('SELECT *
 					FROM ship_type
 					JOIN ship_type_support_hardware USING(ship_type_id)
@@ -216,8 +212,7 @@ 
 		echo ('</tr>');
 	} ?>
 	</table></div></div><?php
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }
 
@@ -270,12 +265,13 @@ 
 	$stat[] = number_format($db->getInt('cost'));
 	$stat[] = $db->getInt('speed');
 	$stat[] = $db->getInt('hardpoint');
-	if ($db->getField('buyer_restriction') == BUYER_RESTRICTION_GOOD)
-		$restriction = '<font color="green">Good</font>';
-	elseif ($db->getField('buyer_restriction') == BUYER_RESTRICTION_EVIL)
-		$restriction = '<font color="red">Evil</font>';
-	else
-		$restriction = '';
+	if ($db->getField('buyer_restriction') == BUYER_RESTRICTION_GOOD) {
+			$restriction = '<font color="green">Good</font>';
+	} elseif ($db->getField('buyer_restriction') == BUYER_RESTRICTION_EVIL) {
+			$restriction = '<font color="red">Evil</font>';
+	} else {
+			$restriction = '';
+	}
 	$stat[] = $restriction;
 //	$stat[] = $db->getInt('lvl_needed');
 	$stat[] = number_format($db->getInt('max_amount'));
@@ -285,12 +281,13 @@ 
 	{
 		if($db->nextRecord()) 
 		{
-			if ($hardware_id < 7)
-				$stat[] = number_format($db->getInt('max_amount'));
-			elseif ($db->getInt('max_amount') == 1)
-				$stat[] = 'Yes';
-			else
-				$stat[] = '';
+			if ($hardware_id < 7) {
+							$stat[] = number_format($db->getInt('max_amount'));
+			} elseif ($db->getInt('max_amount') == 1) {
+							$stat[] = 'Yes';
+			} else {
+							$stat[] = '';
+			}
 		}
 		$hardware_id++;
 	}

htdocs/config.php

Spacing +13 added lines, -13 removed lines

@@ -5,14 +5,14 @@ 
 define('TIME', intval(MICRO_TIME));
 
 // Repository paths
-const ROOT =  __DIR__ . '/../';
-const LIB = ROOT.'lib/';
-const ENGINE = ROOT.'engine/';
-const WWW = ROOT.'htdocs/';
-const UPLOAD = WWW.'upload/';
-const ADMIN = ROOT.'admin/';
-const TOOLS = ROOT.'tools/';
-const CONFIG = ROOT.'config/';
+const ROOT = __DIR__ . '/../';
+const LIB = ROOT . 'lib/';
+const ENGINE = ROOT . 'engine/';
+const WWW = ROOT . 'htdocs/';
+const UPLOAD = WWW . 'upload/';
+const ADMIN = ROOT . 'admin/';
+const TOOLS = ROOT . 'tools/';
+const CONFIG = ROOT . 'config/';
 const TEMPLATES_DIR = ROOT . 'templates/';
 
 // Define server-specific constants
@@ -20,7 +20,7 @@ 
 
 if (ENABLE_DEBUG) {
 	// Warn about everything when in debug mode
-	error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE);
+	error_reporting(E_ERROR|E_WARNING|E_PARSE|E_NOTICE);
 }
 
 const ACCOUNT_ID_PORT = 65535;
@@ -58,9 +58,9 @@ 
  */
 const DEFAULT_DATE_DATE_SHORT = 'j/n/Y';
 const DEFAULT_DATE_TIME_SHORT = 'g:i:s A';
-const DEFAULT_DATE_FULL_SHORT = DEFAULT_DATE_DATE_SHORT.' '.DEFAULT_DATE_TIME_SHORT;
-const DEFAULT_DATE_FULL_SHORT_SPLIT = DEFAULT_DATE_DATE_SHORT.'\<b\r /\>'.DEFAULT_DATE_TIME_SHORT;
-const DEFAULT_DATE_FULL_LONG = 'l jS F '.DEFAULT_DATE_TIME_SHORT;
+const DEFAULT_DATE_FULL_SHORT = DEFAULT_DATE_DATE_SHORT . ' ' . DEFAULT_DATE_TIME_SHORT;
+const DEFAULT_DATE_FULL_SHORT_SPLIT = DEFAULT_DATE_DATE_SHORT . '\<b\r /\>' . DEFAULT_DATE_TIME_SHORT;
+const DEFAULT_DATE_FULL_LONG = 'l jS F ' . DEFAULT_DATE_TIME_SHORT;
 
 /*
  * Buyer restrictions for ships and weapons
@@ -416,4 +416,4 @@ 
 const LOCK_DURATION = 10; // The max time for a lock to last before timing out.
 const LOCK_BUFFER = 3; // The minimum time that must be remaining on the lock duration for the lock to be valid.
 
-define('USING_AJAX',isset($_REQUEST['ajax'])&&$_REQUEST['ajax']==1);
+define('USING_AJAX', isset($_REQUEST['ajax']) && $_REQUEST['ajax'] == 1);

htdocs/reset_password_processing.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	// creates a new user account object
 	$account = SmrAccount::getAccountByName($login);
 	$passwordReset = $_REQUEST['password_reset'];
-	if ($account==null || empty($passwordReset) || $account->getPasswordReset() != $passwordReset) {
+	if ($account == null || empty($passwordReset) || $account->getPasswordReset() != $passwordReset) {
 		// unknown user
 		header('Location: /error.php?msg=' . rawurlencode('User does not exist or reset password code is incorrect.'));
 		exit;
@@ -38,6 +38,6 @@ 
 	
 	header('Location: /login.php');
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }

Braces +1 added lines, -2 removed lines

@@ -37,7 +37,6 @@
 	
 	
 	header('Location: /login.php');
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }

htdocs/login_social_processing.php

Spacing +1 added lines, -1 removed lines

@@ -27,6 +27,6 @@
 	}
 
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }

Braces +1 added lines, -2 removed lines

@@ -26,7 +26,6 @@
 		exit;
 	}
 
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }

htdocs/map_warps.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
 
 	// The d3 graph links are the warp connections between galaxies
 	$db = new SmrMySqlDatabase();
-	$db->query('SELECT sector_id, warp FROM sector WHERE warp !=0 AND game_id = '.$db->escapeNumber($gameID));
+	$db->query('SELECT sector_id, warp FROM sector WHERE warp !=0 AND game_id = ' . $db->escapeNumber($gameID));
 	while ($db->nextRecord()) {
 		$warp1 = SmrSector::getSector($gameID, $db->getInt('sector_id'));
 		$warp2 = SmrSector::getSector($gameID, $db->getInt('warp'));
@@ -47,7 +47,7 @@ 
 	]);
 
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }
 ?>

Braces +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
 		'links' => $links,
 	]);
 
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }
 ?>

htdocs/config.inc

Spacing +26 added lines, -26 removed lines

@@ -1,44 +1,44 @@ 
 <?php
 function logException(Throwable $e) {
-	global $account,$var,$player,$db;
+	global $account, $var, $player, $db;
 	$errorType = 'Unexpected Game Error!';
-	$message='';
-	$currMySQLError='';
+	$message = '';
+	$currMySQLError = '';
 
-	if(is_object($account)) {
-		$message .= 'Login: '.$account->getLogin().EOL.EOL.'-----------'.EOL.EOL.
-			'Account ID: '.$account->getAccountID().EOL.EOL.'-----------'.EOL.EOL.
-			'E-Mail: '.$account->getEmail().EOL.EOL.'-----------'.EOL.EOL;
+	if (is_object($account)) {
+		$message .= 'Login: ' . $account->getLogin() . EOL . EOL . '-----------' . EOL . EOL .
+			'Account ID: ' . $account->getAccountID() . EOL . EOL . '-----------' . EOL . EOL .
+			'E-Mail: ' . $account->getEmail() . EOL . EOL . '-----------' . EOL . EOL;
 	}
-	$message .= 'Error Message: '. $e .EOL.EOL.'-----------'.EOL.EOL;
+	$message .= 'Error Message: ' . $e . EOL . EOL . '-----------' . EOL . EOL;
 
 	// Only check database if it was already loaded (do not try to autoload)
 	if (class_exists('MySqlDatabase', false) && ($db instanceof MySqlDatabase)) {
-		if($currMySQLError = $db->getError()) {
+		if ($currMySQLError = $db->getError()) {
 			$errorType = 'Database Error';
-			$message .= 'MySQL Error MSG: '.$db->getError().EOL.EOL.'-----------'.EOL.EOL;
+			$message .= 'MySQL Error MSG: ' . $db->getError() . EOL . EOL . '-----------' . EOL . EOL;
 		}
 	}
 
 	$message .=
-		'$var: '.var_export($var,true).EOL.EOL.'-----------'.EOL.EOL.
-		'USING_AJAX: '.(defined('USING_AJAX')?var_export(USING_AJAX,true):'undefined');
+		'$var: ' . var_export($var, true) . EOL . EOL . '-----------' . EOL . EOL .
+		'USING_AJAX: ' . (defined('USING_AJAX') ?var_export(USING_AJAX, true) : 'undefined');
 
 	try {
-		if(function_exists('release_lock'))
+		if (function_exists('release_lock'))
 			release_lock(); //Try to release lock so they can carry on normally
 	}
-	catch(Throwable $ee) {
-		$message .= EOL.EOL.'-----------'.EOL.EOL.
-					'Releasing Lock Failed' .EOL.
-					'Message: ' . $ee .EOL.EOL;
-		if($currMySQLError!=$db->getError()) {
-			$message .= 'MySQL Error MSG: '.$db->getError().EOL.EOL;
+	catch (Throwable $ee) {
+		$message .= EOL . EOL . '-----------' . EOL . EOL .
+					'Releasing Lock Failed' . EOL .
+					'Message: ' . $ee . EOL . EOL;
+		if ($currMySQLError != $db->getError()) {
+			$message .= 'MySQL Error MSG: ' . $db->getError() . EOL . EOL;
 		}
 	}
 
 	if (defined('NPC_SCRIPT')) {
-		$message = 'Script: '.SCRIPT_ID.EOL.EOL.'-----------'.EOL.EOL.$message;
+		$message = 'Script: ' . SCRIPT_ID . EOL . EOL . '-----------' . EOL . EOL . $message;
 		var_dump($message);
 		return;
 	}
@@ -46,16 +46,16 @@ 
 	// Unconditionally send error message to the log
 	error_log($message);
 
-	if(ENABLE_DEBUG) {
+	if (ENABLE_DEBUG) {
 		// Display error message on the page and then exit
 		echo nl2br($message);
 		exit;
 	}
 
 	// Send error message to the in-game auto bugs mailbox
-	if (is_object($player) && method_exists($player,'sendMessageToBox')) {
+	if (is_object($player) && method_exists($player, 'sendMessageToBox')) {
 		$player->sendMessageToBox(BOX_BUGS_AUTO, $message);
-	} elseif (is_object($account) && method_exists($account,'sendMessageToBox')) {
+	} elseif (is_object($account) && method_exists($account, 'sendMessageToBox')) {
 		// Will be logged without a game_id
 		$account->sendMessageToBox(BOX_BUGS_AUTO, $message);
 	} else {
@@ -90,8 +90,8 @@ 
 
 	// If this is an ajax update, we don't really have a way to redirect
 	// to an error page at this time, so we just quit.
-	if(!defined('USING_AJAX')||!USING_AJAX)
-		header('location: /error.php?msg='.urlencode($errorType));
+	if (!defined('USING_AJAX') || !USING_AJAX)
+		header('location: /error.php?msg=' . urlencode($errorType));
 	exit;
 }
 
@@ -114,7 +114,7 @@ 
 
 // Initialize the template
 $template = new Template();
-$GLOBALS['template'] =& $template;
+$GLOBALS['template'] = & $template;
 
 // Change the browser title based on the server config
 $prefix = '';

Braces +8 added lines, -6 removed lines

@@ -25,10 +25,11 @@ 
 		'USING_AJAX: '.(defined('USING_AJAX')?var_export(USING_AJAX,true):'undefined');
 
 	try {
-		if(function_exists('release_lock'))
-			release_lock(); //Try to release lock so they can carry on normally
-	}
-	catch(Throwable $ee) {
+		if(function_exists('release_lock')) {
+					release_lock();
+		}
+		//Try to release lock so they can carry on normally
+	} catch(Throwable $ee) {
 		$message .= EOL.EOL.'-----------'.EOL.EOL.
 					'Releasing Lock Failed' .EOL.
 					'Message: ' . $ee .EOL.EOL;
@@ -90,8 +91,9 @@ 
 
 	// If this is an ajax update, we don't really have a way to redirect
 	// to an error page at this time, so we just quit.
-	if(!defined('USING_AJAX')||!USING_AJAX)
-		header('location: /error.php?msg='.urlencode($errorType));
+	if(!defined('USING_AJAX')||!USING_AJAX) {
+			header('location: /error.php?msg='.urlencode($errorType));
+	}
 	exit;
 }