smrealms / smr

engine/Default/planet_stockpile_processing.php

Braces +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
 	$account->log(LOG_TYPE_PLANETS, 'Player takes ' . $amount . ' ' . Globals::getGoodName($var['good_id']) . ' from planet.', $player->getSectorID());
 
 // transfer to planet
-}
-elseif ($action == 'Planet') {
+} elseif ($action == 'Planet') {
 	// do we want transfer more than we have?
 	if ($amount > $ship->getCargo($var['good_id'])) {
 		create_error('You can\'t store more than you carry!');

engine/Default/forces_drop_processing.php

Braces +4 added lines, -8 removed lines

@@ -129,8 +129,7 @@ 
 	if ($change_combat_drones > 0) {
 		$ship->decreaseCDs($change_combat_drones, true);
 		$forces->addCDs($change_combat_drones);
-	}
-	else {
+	} else {
 		$ship->increaseCDs(-$change_combat_drones, true);
 		$forces->takeCDs(-$change_combat_drones);
 	}
@@ -140,8 +139,7 @@ 
 	if ($change_scout_drones > 0) {
 		$ship->decreaseSDs($change_scout_drones);
 		$forces->addSDs($change_scout_drones);
-	}
-	else {
+	} else {
 		$ship->increaseSDs(-$change_scout_drones);
 		$forces->takeSDs(-$change_scout_drones);
 	}
@@ -155,8 +153,7 @@ 
 			$ship->decloak();
 			$player->giveTurns(1);
 		}
-	}
-	else {
+	} else {
 		$ship->increaseMines(-$change_mines);
 		$forces->takeMines(-$change_mines);
 	}
@@ -191,8 +188,7 @@ 
 			$scout_drones_message = 'added ';
 		}
 		$scout_drones_message .= $change_scout_drones . ' scout drone';
-	}
-	elseif ($change_scout_drones < 0) {
+	} elseif ($change_scout_drones < 0) {
 		$scout_drones_message = '';
 		if ((isset($combat_drones_message) && $change_combat_drones > 0) || (!isset($combat_drones_message) && $change_mines >= 0)) {
 			$scout_drones_message = 'removed ';

engine/Default/shop_goods.php

Braces +3 added lines, -6 removed lines

@@ -24,8 +24,7 @@ 
 //The player is sent here after trading and sees this if his offer is accepted.
 if (!empty($var['trade_msg'])) {
 	$template->assign('TradeMsg', $var['trade_msg']);
-}
-elseif ($player->getLastPort() != $player->getSectorID()) {
+} elseif ($player->getLastPort() != $player->getSectorID()) {
 	// test if we are searched, but only if we hadn't a previous trade here
 
 	$base_chance = 15;
@@ -72,8 +71,7 @@ 
 						$player->setBank(5000);
 					}
 				}
-			}
-			else {
+			} else {
 				$player->decreaseCredits($fine);
 			}
 
@@ -85,8 +83,7 @@ 
 			$ship->setCargo(GOODS_NARCOTICS, 0);
 			$account->log(LOG_TYPE_TRADING, 'Player gets caught with illegals', $player->getSectorID());
 
-		}
-		else {
+		} else {
 			$template->assign('IllegalsFound', false);
 			$player->increaseHOF(1, array('Trade', 'Search', 'Times Found Innocent'), HOF_PUBLIC);
 			$player->increaseAlignment(1);

engine/Default/shop_hardware_processing.php

Braces +11 added lines, -7 removed lines

@@ -32,11 +32,16 @@ 
 	$ship->increaseHardware($hardware_id, $amount);
 
 	//HoF
-	if ($hardware_id == HARDWARE_COMBAT) $player->increaseHOF($amount, array('Forces', 'Bought', 'Combat Drones'), HOF_ALLIANCE);
-	if ($hardware_id == HARDWARE_SCOUT) $player->increaseHOF($amount, array('Forces', 'Bought', 'Scout Drones'), HOF_ALLIANCE);
-	if ($hardware_id == HARDWARE_MINE) $player->increaseHOF($amount, array('Forces', 'Bought', 'Mines'), HOF_ALLIANCE);
-}
-else if ($action == 'Sell') {
+	if ($hardware_id == HARDWARE_COMBAT) {
+		$player->increaseHOF($amount, array('Forces', 'Bought', 'Combat Drones'), HOF_ALLIANCE);
+	}
+	if ($hardware_id == HARDWARE_SCOUT) {
+		$player->increaseHOF($amount, array('Forces', 'Bought', 'Scout Drones'), HOF_ALLIANCE);
+	}
+	if ($hardware_id == HARDWARE_MINE) {
+		$player->increaseHOF($amount, array('Forces', 'Bought', 'Mines'), HOF_ALLIANCE);
+	}
+	} else if ($action == 'Sell') {
 	// We only allow selling combat drones
 	if ($hardware_id != HARDWARE_COMBAT) {
 		throw new Exception('This item cannot be sold!');
@@ -49,8 +54,7 @@ 
 
 	$player->increaseCredits(IRound($cost * CDS_REFUND_PERCENT) * $amount);
 	$ship->decreaseCDs($amount, true); // 2nd arg avoids under attack warning
-}
-else {
+} else {
 	throw new Exception('Action must be either Buy or Sell.');
 }
 

engine/Default/shop_goods_processing.php

Braces +9 added lines, -8 removed lines

@@ -58,10 +58,14 @@ 
 // get relations for us (global + personal)
 $relations = $player->getRelation($port->getRaceID());
 
-if (!isset($var['ideal_price'])) SmrSession::updateVar('ideal_price', $port->getIdealPrice($good_id, $transaction, $amount, $relations));
+if (!isset($var['ideal_price'])) {
+	SmrSession::updateVar('ideal_price', $port->getIdealPrice($good_id, $transaction, $amount, $relations));
+}
 $ideal_price = $var['ideal_price'];
 
-if (!isset($var['offered_price'])) SmrSession::updateVar('offered_price', $port->getOfferPrice($ideal_price, $relations, $transaction));
+if (!isset($var['offered_price'])) {
+	SmrSession::updateVar('offered_price', $port->getOfferPrice($ideal_price, $relations, $transaction));
+}
 $offered_price = $var['offered_price'];
 
 // nothing should happen here but just to avoid / by 0
@@ -120,8 +124,7 @@ 
 		$player->increaseHOF($bargain_price, array('Trade', 'Money', 'Buying'), HOF_PUBLIC);
 		$port->buyGoods($portGood, $amount, $ideal_price, $bargain_price, $gained_exp);
 		$player->increaseRelationsByTrade($amount, $port->getRaceID());
-	}
-	elseif ($transaction == 'Sell') {
+	} elseif ($transaction == 'Sell') {
 		$msg_transaction = 'sold';
 		$ship->decreaseCargo($good_id, $amount);
 		$player->increaseCredits($bargain_price);
@@ -131,8 +134,7 @@ 
 		$player->increaseHOF($bargain_price, array('Trade', 'Money', 'Selling'), HOF_PUBLIC);
 		$port->sellGoods($portGood, $amount, $ideal_price, $bargain_price, $gained_exp);
 		$player->increaseRelationsByTrade($amount, $port->getRaceID());
-	}
-	elseif ($transaction == 'Steal') {
+	} elseif ($transaction == 'Steal') {
 		$msg_transaction = 'stolen';
 		$ship->increaseCargo($good_id, $amount);
 		$player->increaseHOF($amount, array('Trade', 'Goods', 'Stolen'), HOF_ALLIANCE);
@@ -168,8 +170,7 @@ 
 		$container['body'] = 'shop_goods.php';
 	}
 
-}
-else {
+} else {
 	// does the trader try to outsmart us?
 	$container = create_container('skeleton.php', 'shop_goods_trade.php');
 	transfer('ideal_price');

engine/Default/message_send_processing.php

Braces +2 added lines, -4 removed lines

@@ -28,11 +28,9 @@
 		$player->sendMessage($db->getInt('account_id'), MSG_ALLIANCE, $message, false);
 	}
 	$player->sendMessage($player->getAccountID(), MSG_ALLIANCE, $message, true, false);
-}
-else if (!empty($var['receiver'])) {
+} else if (!empty($var['receiver'])) {
 	$player->sendMessage($var['receiver'], MSG_PLAYER, $message);
-}
-else {
+} else {
 	$player->sendGlobalMessage($message);
 }
 

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;