smrealms / smr

engine/Default/preferences_processing.php

Braces +29 added lines, -40 removed lines

@@ -3,8 +3,7 @@ 
 $container = create_container('skeleton.php');
 if (SmrSession::hasGame()) {
 	$container['body'] = 'current_sector.php';
-}
-else {
+} else {
 	$container['body'] = 'game_play.php';
 }
 $action = $_REQUEST['action'];
@@ -17,8 +16,7 @@ 
 	// overwrite container
 	$container['body'] = 'validate.php';
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your email address, you will now need to revalidate with the code sent to the new email address.';
-}
-elseif ($action == 'Change Password') {
+} elseif ($action == 'Change Password') {
 	$new_password = $_REQUEST['new_password'];
 	$old_password = $_REQUEST['old_password'];
 	$retype_password = $_REQUEST['retype_password'];
@@ -41,8 +39,7 @@ 
 
 	$account->setPassword($new_password);
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your password.';
-}
-elseif ($action == 'Change Name') {
+} elseif ($action == 'Change Name') {
 	$HoF_name = trim($_REQUEST['HoF_name']);
 
 	$limited_char = 0;
@@ -67,18 +64,20 @@ 
 	}
 
 	//disallow blank names
-	if (empty($HoF_name) || $HoF_name == '') create_error('You Hall of Fame name must contain characters!');
+	if (empty($HoF_name) || $HoF_name == '') {
+		create_error('You Hall of Fame name must contain characters!');
+	}
 
 	//no duplicates
 	$db->query('SELECT * FROM account WHERE hof_name = ' . $db->escapeString($HoF_name) . ' AND account_id != ' . $db->escapeNumber($account->getAccountID()) . ' LIMIT 1');
-	if ($db->nextRecord()) create_error('Someone is already using that name!');
+	if ($db->nextRecord()) {
+		create_error('Someone is already using that name!');
+	}
 
 	// set the HoF name in account stat
 	$account->setHofName($HoF_name);
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your hall of fame name.';
-}
-
-elseif ($action == 'Change Discord ID') {
+} elseif ($action == 'Change Discord ID') {
 	$discordId = trim($_REQUEST['discord_id']);
 
 	if (empty($discordId)) {
@@ -88,14 +87,14 @@ 
 	} else {
 		// no duplicates
 		$db->query('SELECT * FROM account WHERE discord_id =' . $db->escapeString($discordId) . ' AND account_id != ' . $db->escapeNumber($account->getAccountID()) . ' LIMIT 1');
-		if ($db->nextRecord()) create_error('Someone is already using that Discord User ID!');
+		if ($db->nextRecord()) {
+			create_error('Someone is already using that Discord User ID!');
+		}
 
 		$account->setDiscordId($discordId);
 		$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your Discord User ID.';
 	}
-}
-
-elseif ($action == 'Change IRC Nick') {
+} elseif ($action == 'Change IRC Nick') {
 	$ircNick = trim($_REQUEST['irc_nick']);
 
 	for ($i = 0; $i < strlen($ircNick); $i++) {
@@ -113,7 +112,9 @@ 
 
 		// no duplicates
 		$db->query('SELECT * FROM account WHERE irc_nick = ' . $db->escapeString($ircNick) . ' AND account_id != ' . $db->escapeNumber($account->getAccountID()) . ' LIMIT 1');
-		if ($db->nextRecord()) create_error('Someone is already using that nick!');
+		if ($db->nextRecord()) {
+			create_error('Someone is already using that nick!');
+		}
 
 		// save irc nick in db and set message
 		$account->setIrcNick($ircNick);
@@ -121,8 +122,7 @@ 
 
 	}
 
-}
-elseif ($action == 'Yes') {
+} elseif ($action == 'Yes') {
 	$account_id = $var['account_id'];
 	$amount = $var['amount'];
 
@@ -134,8 +134,7 @@ 
 	// add to him
 	$his_account->increaseSmrCredits($amount);
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have sent SMR credits.';
-}
-elseif ($action == 'Change Timezone') {
+} elseif ($action == 'Change Timezone') {
 	$timez = $_REQUEST['timez'];
 	if (!is_numeric($timez)) {
 		create_error('Numbers only please');
@@ -143,25 +142,20 @@ 
 
 	$db->query('UPDATE account SET offset = ' . $db->escapeNumber($timez) . ' WHERE account_id = ' . $db->escapeNumber($account->getAccountID()));
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your time offset.';
-}
-elseif ($action == 'Change Date Formats') {
+} elseif ($action == 'Change Date Formats') {
 	$account->setShortDateFormat($_REQUEST['dateformat']);
 	$account->setShortTimeFormat($_REQUEST['timeformat']);
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your date formats.';
-}
-elseif ($action == 'Change Images') {
+} elseif ($action == 'Change Images') {
 	$account->setDisplayShipImages($_REQUEST['images']);
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your ship images preferences.';
-}
-elseif ($action == 'Change Centering') {
+} elseif ($action == 'Change Centering') {
 	$account->setCenterGalaxyMapOnPlayer($_REQUEST['centergalmap'] == 'Yes');
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your centering galaxy map preferences.';
-}
-else if ($action == 'Change Size' && is_numeric($_REQUEST['fontsize']) && $_REQUEST['fontsize'] >= 50) {
+} else if ($action == 'Change Size' && is_numeric($_REQUEST['fontsize']) && $_REQUEST['fontsize'] >= 50) {
 	$account->setFontSize($_REQUEST['fontsize']);
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your font size.';
-}
-else if ($action == 'Change CSS Options') {
+} else if ($action == 'Change CSS Options') {
 	$account->setCssLink($_REQUEST['csslink']);
 	if ($_REQUEST['template'] == 'None') {
 		$account->setDefaultCSSEnabled(false);
@@ -172,24 +166,20 @@ 
 		$account->setColourScheme($cssColourScheme);
 	}
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your CSS options.';
-}
-else if ($action == 'Change Kamikaze Setting') {
+} else if ($action == 'Change Kamikaze Setting') {
 	$player->setCombatDronesKamikazeOnMines($_REQUEST['kamikaze'] == 'Yes');
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your combat drones options.';
-}
-else if ($action == 'Change Message Setting') {
+} else if ($action == 'Change Message Setting') {
 	$player->setForceDropMessages($_REQUEST['forceDropMessages'] == 'Yes');
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your message options.';
-}
-else if ($action == 'Save Hotkeys') {
+} else if ($action == 'Save Hotkeys') {
 	foreach (AbstractSmrAccount::getDefaultHotkeys() as $hotkey => $binding) {
 		if (isset($_REQUEST[$hotkey])) {
 			$account->setHotkey($hotkey, explode(' ', $_REQUEST[$hotkey]));
 		}
 	}
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have saved your hotkeys.';
-}
-else if (strpos(trim($action), 'Alter Player') === 0) {
+} else if (strpos(trim($action), 'Alter Player') === 0) {
 	// trim input now
 	$player_name = trim($_POST['PlayerName']);
 
@@ -247,8 +237,7 @@ 
 	$news = 'Please be advised that ' . $old_name . ' has changed their name to ' . $player->getBBLink();
 	$db->query('INSERT INTO news (time, news_message, game_id, type) VALUES (' . $db->escapeNumber(TIME) . ',' . $db->escapeString($news) . ',' . $db->escapeNumber($player->getGameID()) . ', \'admin\')');
 	$container['msg'] = '<span class="green">SUCCESS: </span>You have changed your player name.';
-}
-else if ($action == 'Update Colours') {
+} else if ($action == 'Update Colours') {
 	$friendlyColour = $_REQUEST['friendly_color'];
 	$neutralColour = $_REQUEST['neutral_color'];
 	$enemyColour = $_REQUEST['enemy_color'];

engine/Default/course_plot_nearest_processing.php

Braces +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 if (isset($var['RealX'])) {
 	$realX = $var['RealX'];
-}
-else {
+} else {
 	if (!isset($_REQUEST['xtype']) || !isset($_REQUEST['X'])) {
 		create_error('You have to select what you would like to find.');
 	}

engine/Default/sector_jump_processing.php

Braces +7 added lines, -6 removed lines

@@ -4,8 +4,11 @@ 
 	create_error('You cannot move until the game has started!');
 }
 
-if (isset($_REQUEST['target'])) $target = trim($_REQUEST['target']);
-else $target = $var['target'];
+if (isset($_REQUEST['target'])) {
+	$target = trim($_REQUEST['target']);
+} else {
+	$target = $var['target'];
+}
 
 //allow hidden players (admins that don't play) to move without pinging, hitting mines, losing turns
 if (in_array($player->getAccountID(), Globals::getHiddenPlayers())) {
@@ -86,8 +89,7 @@ 
 	}
 	$player->setSectorID($misjumpSector);
 	unset($distances);
-}
-else { // we hit it. exactly
+} else { // we hit it. exactly
 	$player->setSectorID($targetSector->getSectorID());
 }
 $player->takeTurns($turnsToJump, $turnsToJump);
@@ -124,8 +126,7 @@ 
 		$container = create_container('skeleton.php', 'current_sector.php');
 		$container['msg'] = 'You have just flown past a sprinkle of mines.<br />Because of your newbie status you have been spared from the harsh reality of the forces.';
 		forward($container);
-	}
-	else {
+	} else {
 		$container = create_container('forces_attack_processing.php');
 		$container['action'] = 'bump';
 		$container['owner_id'] = $mineOwnerID;

engine/Default/planet_financial_processing.php

Braces +1 added lines, -2 removed lines

@@ -28,8 +28,7 @@
 		$player->decreaseCredits($amount);
 		$planet->increaseCredits($amount);
 		$account->log(LOG_TYPE_BANK, 'Player puts ' . $amount . ' credits on planet', $player->getSectorID());
-	}
-	elseif ($action == 'Withdraw') {
+	} elseif ($action == 'Withdraw') {
 		if ($planet->getCredits() < $amount) {
 			create_error('There are not enough credits in the planetary account!');
 		}

engine/Default/course_plot_processing.php

Braces +10 added lines, -4 removed lines

@@ -1,9 +1,15 @@
 <?php declare(strict_types=1);
 
-if (isset($var['from'])) $start = $var['from'];
-else $start = trim($_POST['from']);
-if (isset($var['to'])) $target = $var['to'];
-else $target = trim($_POST['to']);
+if (isset($var['from'])) {
+	$start = $var['from'];
+} else {
+	$start = trim($_POST['from']);
+}
+if (isset($var['to'])) {
+	$target = $var['to'];
+} else {
+	$target = trim($_POST['to']);
+}
 
 // perform some basic checks on both numbers
 if (empty($start) || empty($target)) {

engine/Default/hall_of_fame_new.php

Braces +9 added lines, -8 removed lines

@@ -1,18 +1,21 @@ 
 <?php declare(strict_types=1);
 require_once(get_file_loc('hof.functions.inc'));
 $game_id = null;
-if (isset($var['game_id'])) $game_id = $var['game_id'];
+if (isset($var['game_id'])) {
+	$game_id = $var['game_id'];
+}
 
 if (empty($game_id)) {
 	$topic = 'All Time Hall of Fame';
-}
-else {
+} else {
 	$topic = 'Hall of Fame: ' . SmrGame::getGame($game_id)->getDisplayName();
 }
 $template->assign('PageTopic', $topic);
 
 $container = create_container('skeleton.php', 'hall_of_fame_player_detail.php');
-if (isset($game_id)) $container['game_id'] = $game_id;
+if (isset($game_id)) {
+	$container['game_id'] = $game_id;
+}
 $template->assign('PersonalHofHREF', SmrSession::getNewHREF($container));
 
 $db->query('SELECT type FROM hof_visibility WHERE visibility != ' . $db->escapeString(HOF_PRIVATE) . ' ORDER BY type');
@@ -35,8 +38,7 @@ 
 if (!isset($var['view'])) {
 	$categories = getHofCategories($hofTypes, $game_id, $account->getAccountID());
 	$template->assign('Categories', $categories);
-}
-else {
+} else {
 	$gameIDSql = ' AND game_id ' . (isset($game_id) ? '= ' . $db->escapeNumber($game_id) : 'IN (SELECT game_id FROM game WHERE end_time < ' . TIME . ' AND ignore_stats = ' . $db->escapeBoolean(false) . ')');
 
 	$vis = HOF_PUBLIC;
@@ -51,8 +53,7 @@ 
 		$statements = SmrAccount::getUserScoreCaseStatement($db);
 		$query = 'SELECT account_id, ' . $statements['CASE'] . ' amount FROM (SELECT account_id, type, SUM(amount) amount FROM player_hof WHERE type IN (' . $statements['IN'] . ')' . $gameIDSql . ' GROUP BY account_id,type) x GROUP BY account_id ORDER BY amount DESC, account_id ASC LIMIT 25';
 		$db->query($query);
-	}
-	else {
+	} else {
 		$db->query('SELECT visibility FROM hof_visibility WHERE type = ' . $db->escapeArray($viewType, false, true, ':', false) . ' LIMIT 1');
 		if ($db->nextRecord()) {
 			$vis = $db->getField('visibility');

engine/Default/current_sector.php

Braces +14 added lines, -9 removed lines

@@ -35,9 +35,13 @@ 
 
 foreach ($links as $key => $linkArray) {
 	if ($linkArray['ID'] > 0 && $linkArray['ID'] != $player->getSectorID()) {
-		if ($player->getLastSectorID() == $linkArray['ID']) $class = 'lastVisited';
-		else if (isset($unvisited[$linkArray['ID']])) $class = 'unvisited';
-		else $class = 'visited';
+		if ($player->getLastSectorID() == $linkArray['ID']) {
+			$class = 'lastVisited';
+		} else if (isset($unvisited[$linkArray['ID']])) {
+			$class = 'unvisited';
+		} else {
+			$class = 'visited';
+		}
 		$links[$key]['Class'] = $class;
 	}
 }
@@ -83,11 +87,9 @@ 
 	} else {
 		$protectionMessage = '<span class="blue">PROTECTION</span>: You are under <span class="green">NEWBIE</span> protection.';
 	}
-}
-elseif ($player->hasFederalProtection()) {
+} elseif ($player->hasFederalProtection()) {
 	$protectionMessage = '<span class="blue">PROTECTION</span>: You are under <span class="blue">FEDERAL</span> protection.';
-}
-elseif ($sector->offersFederalProtection()) {
+} elseif ($sector->offersFederalProtection()) {
 	$protectionMessage = '<span class="blue">PROTECTION</span>: You are <span class="red">NOT</span> under protection.';
 }
 
@@ -117,7 +119,9 @@ 
 }
 
 //error msgs take precedence
-if (isset($var['errorMsg'])) $template->assign('ErrorMessage', $var['errorMsg']);
+if (isset($var['errorMsg'])) {
+	$template->assign('ErrorMessage', $var['errorMsg']);
+}
 
 // *******************************************
 // *
@@ -152,8 +156,9 @@ 
 				$remainingTime = $db->getInt('refresh_at') - TIME;
 				$forceRefreshMessage = '<span class="green">REFRESH</span>: All forces will be refreshed in ' . $remainingTime . ' seconds.';
 				$db->query('REPLACE INTO sector_message (game_id, account_id, message) VALUES (' . $db->escapeNumber($player->getGameID()) . ', ' . $db->escapeNumber($player->getAccountID()) . ', \'[Force Check]\')');
+			} else {
+				$forceRefreshMessage = '<span class="green">REFRESH</span>: All forces have finished refreshing.';
 			}
-			else $forceRefreshMessage = '<span class="green">REFRESH</span>: All forces have finished refreshing.';
 			$template->assign('ForceRefreshMessage', $forceRefreshMessage);
 		}
 	}

engine/Default/feature_request_vote_processing.php

Braces +1 added lines, -2 removed lines

@@ -15,8 +15,7 @@
 	}
 
 	forward(create_container('skeleton.php', 'feature_request.php'));
-}
-else if ($_REQUEST['action'] == 'Set Status') {
+} else if ($_REQUEST['action'] == 'Set Status') {
 	if (empty($_REQUEST['status'])) {
 		create_error('You have to select a status to set');
 	}

engine/Default/bank_anon_detail_processing.php

Braces +3 added lines, -6 removed lines

@@ -21,8 +21,7 @@ 
 	$db->query('SELECT transaction_id FROM anon_bank_transactions WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND anon_id = ' . $db->escapeNumber($account_num) . ' ORDER BY transaction_id DESC LIMIT 1');
 	if ($db->nextRecord()) {
 		$trans_id = $db->getInt('transaction_id') + 1;
-	}
-	else {
+	} else {
 		$trans_id = 1;
 	}
 	$db->query('INSERT INTO anon_bank_transactions (account_id, game_id, anon_id, transaction_id, transaction, amount, time) ' .
@@ -32,8 +31,7 @@ 
 
 	// log action
 	$account->log(LOG_TYPE_BANK, 'Deposits ' . $amount . ' credits in anonymous account #' . $account_num, $player->getSectorID());
-}
-else {
+} else {
 	$db->query('SELECT * FROM anon_bank WHERE anon_id = ' . $db->escapeNumber($account_num) . ' AND game_id = ' . $db->escapeNumber($player->getGameID()));
 	$db->nextRecord();
 	if ($db->getInt('amount') < $amount) {
@@ -42,8 +40,7 @@ 
 	$db->query('SELECT transaction_id FROM anon_bank_transactions WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' AND anon_id = ' . $db->escapeNumber($account_num) . ' ORDER BY transaction_id DESC LIMIT 1');
 	if ($db->nextRecord()) {
 		$trans_id = $db->getInt('transaction_id') + 1;
-	}
-	else {
+	} else {
 		$trans_id = 1;
 	}
 	$db->query('INSERT INTO anon_bank_transactions (account_id, game_id, anon_id, transaction_id, transaction, amount, time)