smrealms / smr

htdocs/login_processing.php

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

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/reset_password_processing.php

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

Braces +1 added lines, -2 removed lines

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

htdocs/map_warps.php

Braces +1 added lines, -2 removed lines

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

htdocs/config.inc

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;
 }
 

htdocs/offline.php

Braces +1 added lines, -2 removed lines

@@ -15,7 +15,6 @@
 	// redirect to the in-game loader (bypassing the server closure).
 	SmrSession::destroy();
 	require_once(ENGINE . 'Default/login.inc');
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }

htdocs/loader.php

Braces +16 added lines, -13 removed lines

@@ -68,9 +68,9 @@ 
 		if(!USING_AJAX) {
 			require_once(get_file_loc('smr.inc'));
 			create_error('Your browser lost the SN. Try to reload the page!');
+		} else {
+					exit;
 		}
-		else
-			exit;
 	}
 	
 	// do we have such a container object in the db?
@@ -78,9 +78,9 @@ 
 		if(!USING_AJAX) {
 			require_once(get_file_loc('smr.inc'));
 			create_error('Please avoid using the back button!');
+		} else {
+					exit;
 		}
-		else
-			exit;
 	}
 	
 	// Determine where to load game scripts from (in case we need a special
@@ -88,9 +88,15 @@ 
 	// Must not call `get_file_loc` until after we have set $overrideGameID
 	// (unless we're exiting immediately with an error, as above).
 	$overrideGameID = 0;
-	if (isset($var['game_id']) && is_numeric($var['game_id'])) $overrideGameID = $var['game_id'];
-	if ($overrideGameID == 0 && isset($var['GameID']) && is_numeric($var['GameID'])) $overrideGameID = $var['GameID'];
-	if($overrideGameID == 0) $overrideGameID = SmrSession::getGameID();
+	if (isset($var['game_id']) && is_numeric($var['game_id'])) {
+		$overrideGameID = $var['game_id'];
+	}
+	if ($overrideGameID == 0 && isset($var['GameID']) && is_numeric($var['GameID'])) {
+		$overrideGameID = $var['GameID'];
+	}
+	if($overrideGameID == 0) {
+		$overrideGameID = SmrSession::getGameID();
+	}
 
 	require_once(get_file_loc('smr.inc'));
 
@@ -106,22 +112,19 @@ 
 			} else {
 				forward(create_container('skeleton.php', 'invalid_email.php'));
 			}
-		}
-		else if ($disabled['Reason'] == CLOSE_ACCOUNT_BY_REQUEST_REASON) {
+		} else if ($disabled['Reason'] == CLOSE_ACCOUNT_BY_REQUEST_REASON) {
 			if (isset($var['do_reopen_account'])) {
 				// The user has requested to reopen their account
 				$account->unbanAccount($account);
 			} else {
 				forward(create_container('skeleton.php', 'reopen_account.php'));
 			}
-		}
-		else {
+		} else {
 			forward(create_container('disabled.php'));
 		}
 	}
 	
 	do_voodoo();
-}
-catch(Throwable $e) {
+} catch(Throwable $e) {
 	handleException($e);
 }

tools/discord/commands/game.php

Braces +3 added lines, -1 removed lines

@@ -2,7 +2,9 @@
 
 $fn_game = function ($message) {
 	$link = new GameLink($message->channel, $message->author);
-	if (!$link->valid) return;
+	if (!$link->valid) {
+		return;
+	}
 
 	$game = SmrGame::getGame($link->player->getGameID(), true);
 	$msg = "I am linked to game `".$game->getDisplayName()."` in this channel.";