smrealms / smr

engine/Default/weapon_reorder.php

Braces +4 added lines, -3 removed lines

@@ -11,6 +11,7 @@
 }
 
 if (isset($var['Form'])) {
-	if (isset($_REQUEST['weapon_reorder']) && is_array($_REQUEST['weapon_reorder']))
-		$ship->setWeaponLocations($_REQUEST['weapon_reorder']);
-}
+	if (isset($_REQUEST['weapon_reorder']) && is_array($_REQUEST['weapon_reorder'])) {
+			$ship->setWeaponLocations($_REQUEST['weapon_reorder']);
+	}
+	}

engine/Default/council_embassy_processing.php

Indentation +6 added lines, -6 removed lines

@@ -39,7 +39,7 @@ 
 // Send vote announcement to members of the player's council (war votes)
 // or both races' councils (peace votes).
 $councilMembers = Council::getRaceCouncil($player->getGameID(),
-                                          $player->getRaceID());
+										  $player->getRaceID());
 if ($type == 'PEACE') {
 	$otherCouncil = Council::getRaceCouncil($player->getGameID(), $race_id);
 	$councilMembers = array_merge($councilMembers, $otherCouncil);
@@ -49,16 +49,16 @@ 
 $color = ($type == 'PEACE' ? 'dgreen' : 'red');
 $type_fancy = "<span class=\"$color\">$type</span>";
 $message = $player->getLevelName() . " " . $player->getBBLink()
-           . " has initiated a vote for $type_fancy with the "
-           . Globals::getRaceName($race_id)
-           . "! You have " . format_time(TIME_FOR_COUNCIL_VOTE)
-           . " to cast your vote.";
+		   . " has initiated a vote for $type_fancy with the "
+		   . Globals::getRaceName($race_id)
+		   . "! You have " . format_time(TIME_FOR_COUNCIL_VOTE)
+		   . " to cast your vote.";
 
 foreach ($councilMembers as $accountID) {
 	// don't send to the player who started the vote
 	if ($player->getAccountID() != $accountID) {
 		SmrPlayer::sendMessageFromRace($player->getRaceID(), $player->getGameID(),
-		                               $accountID, $message, $time);
+									   $accountID, $message, $time);
   }
 }
 

engine/Default/preferences_processing.php

Braces +62 added lines, -62 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,35 +16,38 @@ 
 	// 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'];
 
-	if (empty($new_password))
-		create_error('You must enter a non empty password!');
+	if (empty($new_password)) {
+			create_error('You must enter a non empty password!');
+	}
 
-	if (!$account->checkPassword($old_password))
-		create_error('Your current password is wrong!');
+	if (!$account->checkPassword($old_password)) {
+			create_error('Your current password is wrong!');
+	}
 
-	if ($new_password != $retype_password)
-		create_error('The passwords you entered don\'t match!');
+	if ($new_password != $retype_password) {
+			create_error('The passwords you entered don\'t match!');
+	}
 
-	if ($new_password == $account->getLogin())
-		create_error('Your chosen password is invalid!');
+	if ($new_password == $account->getLogin()) {
+			create_error('Your chosen password is invalid!');
+	}
 
 	$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;
 	for ($i = 0; $i < strlen($HoF_name); $i++) {
 		// disallow certain ascii chars
-		if (ord($HoF_name[$i]) < 32 || ord($HoF_name[$i]) > 127)
-			create_error('Your Hall Of Fame name contains invalid characters!');
+		if (ord($HoF_name[$i]) < 32 || ord($HoF_name[$i]) > 127) {
+					create_error('Your Hall Of Fame name contains invalid characters!');
+		}
 
 		// numbers 48..57
 		// Letters 65..90
@@ -57,23 +59,26 @@ 
 		}
 	}
 
-	if ($limited_char > 4)
-		create_error('You cannot use a name with more than 4 special characters.');
+	if ($limited_char > 4) {
+			create_error('You cannot use a name with more than 4 special characters.');
+	}
 
 
 	//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)) {
@@ -83,20 +88,21 @@ 
 	} 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++) {
 		// disallow certain ascii chars (and whitespace!)
-		if (ord($ircNick[$i]) < 33 || ord($ircNick[$i]) > 127)
-			create_error('Your IRC Nick contains invalid characters!');
+		if (ord($ircNick[$i]) < 33 || ord($ircNick[$i]) > 127) {
+					create_error('Your IRC Nick contains invalid characters!');
+		}
 	}
 
 	// here you can delete your registered irc nick
@@ -107,7 +113,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);
@@ -115,8 +123,7 @@ 
 
 	}
 
-}
-elseif ($action == 'Yes') {
+} elseif ($action == 'Yes') {
 	$account_id = $var['account_id'];
 	$amount = $var['amount'];
 
@@ -128,33 +135,28 @@ 
 	// 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');
+	if (!is_numeric($timez)) {
+			create_error('Numbers only please');
+	}
 
 	$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);
@@ -165,24 +167,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']);
 
@@ -193,8 +191,9 @@ 
 	$limited_char = 0;
 	for ($i = 0; $i < strlen($player_name); $i++) {
 		// disallow certain ascii chars
-		if (ord($player_name[$i]) < 32 || ord($player_name[$i]) > 127)
-			create_error('The player name contains invalid characters!');
+		if (ord($player_name[$i]) < 32 || ord($player_name[$i]) > 127) {
+					create_error('The player name contains invalid characters!');
+		}
 
 		// numbers 48..57
 		// Letters 65..90
@@ -206,11 +205,13 @@ 
 		}
 	}
 
-	if ($limited_char > 4)
-		create_error('You cannot use a name with more than 4 special characters.');
+	if ($limited_char > 4) {
+			create_error('You cannot use a name with more than 4 special characters.');
+	}
 
-	if (empty($player_name))
-		create_error('You must enter a player name!');
+	if (empty($player_name)) {
+			create_error('You must enter a player name!');
+	}
 
 	// Escape html elements so the name displays correctly
 	$player_name = htmlentities($player_name);
@@ -237,8 +238,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/planet_attack_processing.php

Spacing +3 added lines, -3 removed lines

@@ -49,12 +49,12 @@
 }
 
 foreach ($attackers as $attacker) {
-	$playerResults =& $attacker->shootPlanet($planet, false);
-	$results['Attackers']['Traders'][$attacker->getAccountID()] =& $playerResults;
+	$playerResults = & $attacker->shootPlanet($planet, false);
+	$results['Attackers']['Traders'][$attacker->getAccountID()] = & $playerResults;
 	$results['Attackers']['TotalDamage'] += $playerResults['TotalDamage'];
 }
 $results['Attackers']['Downgrades'] = $planet->checkForDowngrade($results['Attackers']['TotalDamage']);
-$results['Planet'] =& $planet->shootPlayers($attackers);
+$results['Planet'] = & $planet->shootPlayers($attackers);
 
 $account->log(LOG_TYPE_PLANET_BUSTING, 'Player attacks planet, the planet does ' . $results['Planet']['TotalDamage'] . ', their team does ' . $results['Attackers']['TotalDamage'] . ' and downgrades: ' . var_export($results['Attackers']['Downgrades'], true), $planet->getSectorID());
 

Braces +20 added lines, -11 removed lines

@@ -1,23 +1,31 @@ 
 <?php declare(strict_types=1);
 
-if ($player->hasNewbieTurns())
+if ($player->hasNewbieTurns()) {
 	create_error('You are under newbie protection!');
-if ($player->hasFederalProtection())
+}
+if ($player->hasFederalProtection()) {
 	create_error('You are under federal protection!');
-if ($player->isLandedOnPlanet())
+}
+if ($player->isLandedOnPlanet()) {
 	create_error('You cannot attack planets whilst on a planet!');
-if ($player->getTurns() < 3)
+}
+if ($player->getTurns() < 3) {
 	create_error('You do not have enough turns to attack this planet!');
-if (!$ship->hasWeapons() && !$ship->hasCDs())
+}
+if (!$ship->hasWeapons() && !$ship->hasCDs()) {
 	create_error('What are you going to do? Insult it to death?');
-if (!$player->canFight())
+}
+if (!$player->canFight()) {
 	create_error('You are not allowed to fight!');
+}
 
 $planet = $player->getSectorPlanet();
-if (!$planet->exists())
+if (!$planet->exists()) {
 	create_error('This planet does not exist.');
-if (!$planet->isClaimed())
+}
+if (!$planet->isClaimed()) {
 	create_error('This planet is not claimed.');
+}
 
 $planetOwner = $planet->getOwner();
 
@@ -88,9 +96,10 @@ 
 
 // Update sector messages for attackers
 foreach ($attackers as $attacker) {
-	if (!$player->equals($attacker))
-		$db->query('REPLACE INTO sector_message VALUES(' . $attacker->getAccountID() . ',' . $attacker->getGameID() . ',' . $db->escapeString('[ATTACK_RESULTS]' . $logId) . ')');
-}
+	if (!$player->equals($attacker)) {
+			$db->query('REPLACE INTO sector_message VALUES(' . $attacker->getAccountID() . ',' . $attacker->getGameID() . ',' . $db->escapeString('[ATTACK_RESULTS]' . $logId) . ')');
+	}
+	}
 
 $container = create_container('skeleton.php', 'planet_attack.php');
 $container['sector_id'] = $planet->getSectorID();

engine/Default/port_attack_processing.php

Spacing +3 added lines, -3 removed lines

@@ -45,12 +45,12 @@
 }
 
 foreach ($attackers as $attacker) {
-	$playerResults =& $attacker->shootPort($port);
-	$results['Attackers']['Traders'][$attacker->getAccountID()] =& $playerResults;
+	$playerResults = & $attacker->shootPort($port);
+	$results['Attackers']['Traders'][$attacker->getAccountID()] = & $playerResults;
 	$results['Attackers']['TotalDamage'] += $playerResults['TotalDamage'];
 }
 $results['Attackers']['Downgrades'] = $port->checkForDowngrade($results['Attackers']['TotalDamage']);
-$results['Port'] =& $port->shootPlayers($attackers);
+$results['Port'] = & $port->shootPlayers($attackers);
 
 $account->log(LOG_TYPE_PORT_RAIDING, 'Player attacks port, the port does ' . $results['Port']['TotalDamage'] . ', their team does ' . $results['Attackers']['TotalDamage'] . ' and downgrades ' . $results['Attackers']['Downgrades'] . ' levels.', $port->getSectorID());
 

htdocs/manual.php

Braces +4 added lines, -4 removed lines

@@ -5,8 +5,9 @@ 
 	require_once(ENGINE . 'Default/help.inc');
 
 	$topic_id = $_SERVER['QUERY_STRING'];
-	if (empty($topic_id) || !is_numeric($topic_id))
-		$topic_id = 1;
+	if (empty($topic_id) || !is_numeric($topic_id)) {
+			$topic_id = 1;
+	}
 	?>
 <!DOCTYPE html>
 
@@ -48,8 +49,7 @@ 
 
 	</body>
 	</html><?php
-}
-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);
 }

htdocs/manual_toc.php

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
 
 	</body>
 </html><?php
-}
-catch (Throwable $e) {
+} catch (Throwable $e) {
 	handleException($e);
 }
 ?>

htdocs/login_create_processing.php

Indentation +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
 	$account->increaseSmrRewardCredits(2 * CREDITS_PER_DOLLAR); // Give $2 worth of "reward" credits for joining.
 	if ($socialLogin) {
 		$account->addAuthMethod($_SESSION['socialLogin']->getLoginType(),
-		                        $_SESSION['socialLogin']->getUserID());
+								$_SESSION['socialLogin']->getUserID());
 		if ($validatedBySocial) {
 			$account->setValidated(true);
 		}
@@ -185,7 +185,7 @@ 
 
 		// remember when we sent validation code
 		$db->query('INSERT INTO notification (notification_type, account_id, time) ' .
-		           'VALUES(\'validation_code\', ' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeNumber(TIME) . ')');
+				   'VALUES(\'validation_code\', ' . $db->escapeNumber($account->getAccountID()) . ', ' . $db->escapeNumber(TIME) . ')');
 	}
 
 	$container = create_container('login_processing.php');