smrealms / smr

engine/Default/planet_financial_processing.php

Braces +15 added lines, -11 removed lines

@@ -1,33 +1,37 @@
 <?php declare(strict_types=1);
-if (!$player->isLandedOnPlanet())
+if (!$player->isLandedOnPlanet()) {
 	create_error('You are not on a planet!');
+}
 $planet = $player->getSectorPlanet();
 $action = $_REQUEST['action'];
 
 // Player has requested a planetary fund transaction
 if ($action == 'Deposit' || $action == 'Withdraw') {
 	$amount = $_REQUEST['amount'];
-	if (!is_numeric($amount))
-		create_error('Numbers only please!');
+	if (!is_numeric($amount)) {
+			create_error('Numbers only please!');
+	}
 
 	// only whole numbers allowed
 	$amount = floor($amount);
 
 	// no negative amounts are allowed
-	if ($amount <= 0)
-		create_error('You must actually enter an amount > 0!');
+	if ($amount <= 0) {
+			create_error('You must actually enter an amount > 0!');
+	}
 
 	if ($action == 'Deposit') {
-		if ($player->getCredits() < $amount)
-			create_error('You don\'t own that much money!');
+		if ($player->getCredits() < $amount) {
+					create_error('You don\'t own that much money!');
+		}
 
 		$player->decreaseCredits($amount);
 		$planet->increaseCredits($amount);
 		$account->log(LOG_TYPE_BANK, 'Player puts ' . $amount . ' credits on planet', $player->getSectorID());
-	}
-	elseif ($action == 'Withdraw') {
-		if ($planet->getCredits() < $amount)
-			create_error('There are not enough credits in the planetary account!');
+	} elseif ($action == 'Withdraw') {
+		if ($planet->getCredits() < $amount) {
+					create_error('There are not enough credits in the planetary account!');
+		}
 
 		$player->increaseCredits($amount);
 		$planet->decreaseCredits($amount);

engine/Default/planet_ownership_processing.php

Braces +7 added lines, -7 removed lines

@@ -1,14 +1,16 @@ 
 <?php declare(strict_types=1);
-if (!$player->isLandedOnPlanet())
+if (!$player->isLandedOnPlanet()) {
 	create_error('You are not on a planet!');
+}
 // get a planet from the sector where the player is in
 $planet = $player->getSectorPlanet();
 $action = $_REQUEST['action'];
 $password = isset($_REQUEST['password']) ? $_REQUEST['password'] : '';
 
 if ($action == 'Take Ownership') {
-	if ($planet->hasOwner() && $planet->getPassword() != $password)
-		create_error('You are not allowed to take ownership!');
+	if ($planet->hasOwner() && $planet->getPassword() != $password) {
+			create_error('You are not allowed to take ownership!');
+	}
 
 	// delete all previous ownerships
 	$db->query('UPDATE planet SET owner_id = 0, password = NULL
@@ -20,8 +22,7 @@ 
 	$planet->removePassword();
 	$planet->update();
 	$account->log(LOG_TYPE_PLANETS, 'Player takes ownership of planet.', $player->getSectorID());
-}
-else if ($action == 'Rename') {
+} else if ($action == 'Rename') {
 	$name = trim($_REQUEST['name']);
 	if (empty($name)) {
 		create_error('You cannot leave your planet nameless!');
@@ -31,8 +32,7 @@ 
 	$planet->update();
 	$account->log(LOG_TYPE_PLANETS, 'Player renames planet to ' . $name . '.', $player->getSectorID());
 
-}
-else if ($action == 'Set Password') {
+} else if ($action == 'Set Password') {
 	// set password
 	$planet->setPassword($password);
 	$planet->update();

engine/Default/trader_attack_processing.php

Braces +26 added lines, -19 removed lines

@@ -1,30 +1,36 @@ 
 <?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 whilst on a planet!');
-if ($player->getTurns() < 3)
+}
+if ($player->getTurns() < 3) {
 	create_error('You have insufficient turns to perform that action.');
-if (!$player->canFight())
+}
+if (!$player->canFight()) {
 	create_error('You are not allowed to fight!');
+}
 
 $targetPlayer = SmrPlayer::getPlayer($var['target'], $player->getGameID());
 
-	if ($player->traderNAPAlliance($targetPlayer))
-		create_error('Your alliance does not allow you to attack this trader.');
-	else if ($targetPlayer->isDead())
-		create_error('Target is already dead.');
-	else if ($targetPlayer->getSectorID() != $player->getSectorID())
-		create_error('Target is no longer in this sector.');
-	else if ($targetPlayer->hasNewbieTurns())
-		create_error('Target is under newbie protection.');
-	else if ($targetPlayer->isLandedOnPlanet())
-		create_error('Target is protected by planetary shields.');
-	else if ($targetPlayer->hasFederalProtection())
-		create_error('Target is under federal protection.');
+	if ($player->traderNAPAlliance($targetPlayer)) {
+			create_error('Your alliance does not allow you to attack this trader.');
+	} else if ($targetPlayer->isDead()) {
+			create_error('Target is already dead.');
+	} else if ($targetPlayer->getSectorID() != $player->getSectorID()) {
+			create_error('Target is no longer in this sector.');
+	} else if ($targetPlayer->hasNewbieTurns()) {
+			create_error('Target is under newbie protection.');
+	} else if ($targetPlayer->isLandedOnPlanet()) {
+			create_error('Target is protected by planetary shields.');
+	} else if ($targetPlayer->hasFederalProtection()) {
+			create_error('Target is under federal protection.');
+	}
 
 $fightingPlayers = $sector->getFightingTraders($player, $targetPlayer);
 
@@ -76,10 +82,11 @@ 
 $container = create_container('skeleton.php', 'trader_attack.php');
 
 // If their target is dead there is no continue attack button
-if (!$targetPlayer->isDead())
+if (!$targetPlayer->isDead()) {
 	$container['target'] = $var['target'];
-else
+} else {
 	$container['target'] = 0;
+}
 
 // If they died on the shot they get to see the results
 if ($player->isDead()) {

engine/Default/planet_attack_processing.php

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();

lib/Default/shop_goods.inc

Braces +46 added lines, -35 removed lines

@@ -1,17 +1,21 @@ 
 <?php declare(strict_types=1);
 
 function checkPortTradeable($port, $player) {
-	if ($port->getSectorID() != $player->getSectorID())
-		return 'That port is not in this sector!';
+	if ($port->getSectorID() != $player->getSectorID()) {
+			return 'That port is not in this sector!';
+	}
 	
-	if (!$port->exists())
-		return 'There is no port in this sector!';
+	if (!$port->exists()) {
+			return 'There is no port in this sector!';
+	}
 	
-	if ($player->getRelation($port->getRaceID()) <= RELATIONS_WAR)
-		return 'We will not trade with our enemies!';
+	if ($player->getRelation($port->getRaceID()) <= RELATIONS_WAR) {
+			return 'We will not trade with our enemies!';
+	}
 	
-	if ($port->getReinforceTime() > TIME)
-		return 'We are still repairing damage caused during the last raid.';
+	if ($port->getReinforceTime() > TIME) {
+			return 'We are still repairing damage caused during the last raid.';
+	}
 	
 	return true;
 }
@@ -50,39 +54,43 @@ 
 		if (abs($port_off_rel) > abs($trader_off_rel)) {
 			// get a random number between
 			// (port_off) and (100 +/- $trader_off_rel)
-			if (100 + $trader_off_rel < $port_off)
-				$offer_modifier = mt_rand(100 + $trader_off_rel, $port_off);
-			else
-				$offer_modifier = mt_rand($port_off, 100 + $trader_off_rel);
+			if (100 + $trader_off_rel < $port_off) {
+							$offer_modifier = mt_rand(100 + $trader_off_rel, $port_off);
+			} else {
+							$offer_modifier = mt_rand($port_off, 100 + $trader_off_rel);
+			}
 
 			$container['offered_price'] = round($container['ideal_price'] * $offer_modifier / 100);
 		}
+	} else {
+			$container['overall_number_of_bargains'] = mt_rand(2, 5);
+	}
 	}
-	else
-		$container['overall_number_of_bargains'] = mt_rand(2, 5);
-}
 
 function get_amount() {
 	global $var;
 
 	// retrieve amount
-	if (isset($var['amount']))
-		$amount = $var['amount'];
-	else if (isset($_REQUEST['amount']))
-		$amount = $_REQUEST['amount'];
-	else
-		$amount = 0;
+	if (isset($var['amount'])) {
+			$amount = $var['amount'];
+	} else if (isset($_REQUEST['amount'])) {
+			$amount = $_REQUEST['amount'];
+	} else {
+			$amount = 0;
+	}
 
 	// only numbers
-	if (!is_numeric($amount))
-		create_error('You must actually enter a number!');
+	if (!is_numeric($amount)) {
+			create_error('You must actually enter a number!');
+	}
 
 	// we take as it is but round it
 	$amount = floor($amount);
 
 	// no negative amounts are allowed
-	if ($amount <= 0)
-		create_error('You must actually enter an amount > 0!');
+	if ($amount <= 0) {
+			create_error('You must actually enter an amount > 0!');
+	}
 
 	return $amount;
 }
@@ -91,23 +99,26 @@ 
 	global $var;
 
 	// we get it from form
-	if (isset($_REQUEST['bargain_price']))
-		$price = $_REQUEST['bargain_price'];
-	else if (isset($var['bargain_price']))
-		$price = $var['bargain_price'];
-	else
-		$price = 0;
+	if (isset($_REQUEST['bargain_price'])) {
+			$price = $_REQUEST['bargain_price'];
+	} else if (isset($var['bargain_price'])) {
+			$price = $var['bargain_price'];
+	} else {
+			$price = 0;
+	}
 
 	// only numbers
-	if (!is_numeric($price))
-		create_error('You must actually enter a number!');
+	if (!is_numeric($price)) {
+			create_error('You must actually enter a number!');
+	}
 
 	// we take as it is but round it
 	$price = floor($price);
 
 	// no negative amounts are allowed
-	if ($price < 0)
-		create_error('No negative prices are allowed!');
+	if ($price < 0) {
+			create_error('No negative prices are allowed!');
+	}
 
 	return $price;
 }

lib/Default/SmrSession.class.php

Braces +9 added lines, -18 removed lines

@@ -156,8 +156,7 @@ 
 		// now try the cookie
 		if (isset($_COOKIE['session_id']) && strlen($_COOKIE['session_id']) === 32) {
 			self::$session_id = $_COOKIE['session_id'];
-		}
-		else {
+		} else {
 			// create a new session id
 			do {
 				self::$session_id = md5(uniqid(strval(rand())));
@@ -211,18 +210,15 @@ 
 				self::$account_id = 0;
 				self::$game_id = 0;
 				self::$var = array();
-			}
-			else {
+			} else {
 				foreach (self::$var as $key => &$value) {
 					if ($value['Expires'] > 0 && $value['Expires'] <= TIME) { // Use 0 for infinity
 						//This link is no longer valid
 						unset(self::$var[$key]);
-					}
-					else if ($value['RemainingPageLoads'] < 0) {
+					} else if ($value['RemainingPageLoads'] < 0) {
 						//This link is no longer valid
 						unset(self::$var[$key]);
-					}
-					else {
+					} else {
 						--$value['RemainingPageLoads'];
 						if (isset($value['CommonID'])) {
 							self::$commonIDs[$value['CommonID']] = $key;
@@ -230,8 +226,7 @@ 
 					}
 				} unset($value);
 			}
-		}
-		else {
+		} else {
 			self::$generate = true;
 			self::$account_id = 0;
 			self::$game_id = 0;
@@ -252,8 +247,7 @@ 
 			self::$db->query('UPDATE active_session SET account_id=' . self::$db->escapeNumber(self::$account_id) . ',game_id=' . self::$db->escapeNumber(self::$game_id) . (!USING_AJAX ? ',last_accessed=' . self::$db->escapeNumber(TIME) : '') . ',session_var=' . self::$db->escapeBinary($compressed) .
 					',last_sn=' . self::$db->escapeString(self::$SN) .
 					' WHERE session_id=' . self::$db->escapeString(self::$session_id) . (USING_AJAX ? ' AND last_sn=' . self::$db->escapeString(self::$lastSN) : '') . ' LIMIT 1');
-		}
-		else {
+		} else {
 			self::$db->query('DELETE FROM active_session WHERE account_id = ' . self::$db->escapeNumber(self::$account_id) . ' AND game_id = ' . self::$db->escapeNumber(self::$game_id));
 			self::$db->query('INSERT INTO active_session (session_id, account_id, game_id, last_accessed, session_var) VALUES(' . self::$db->escapeString(self::$session_id) . ',' . self::$db->escapeNumber(self::$account_id) . ',' . self::$db->escapeNumber(self::$game_id) . ',' . self::$db->escapeNumber(TIME) . ',' . self::$db->escapeBinary($compressed) . ')');
 			self::$generate = false;
@@ -400,8 +394,7 @@ 
 		if ($value === null) {
 			unset($var[$key]);
 			unset(self::$var[self::$SN][$key]);
-		}
-		else {
+		} else {
 			$var[$key] = $value;
 			self::$var[self::$SN][$key] = $value;
 		}
@@ -423,8 +416,7 @@ 
 
 		if ($sn === false) {
 			$sn = self::generateSN($container);
-		}
-		else {
+		} else {
 			// If we've been provided an SN to use then copy over the existing 'PreviousRequestTime'
 			$container['PreviousRequestTime'] = self::$var[$sn]['PreviousRequestTime'];
 		}
@@ -437,8 +429,7 @@ 
 		if (isset(self::$commonIDs[$container['CommonID']])) {
 			$sn = self::$commonIDs[$container['CommonID']];
 			$container['PreviousRequestTime'] = isset(self::$var[$sn]) ? self::$var[$sn]['PreviousRequestTime'] : MICRO_TIME;
-		}
-		else {
+		} else {
 			do {
 				$sn = substr(md5(strval(rand())), 0, 8);
 			} while (isset(self::$var[$sn]));

admin/Default/album_approve.php

Braces +12 added lines, -8 removed lines

@@ -1,8 +1,9 @@ 
 <?php declare(strict_types=1);
 
 function get_album_nick($album_id) {
-	if ($album_id == 0)
-		return 'System';
+	if ($album_id == 0) {
+			return 'System';
+	}
 
 	return SmrAccount::getAccount($album_id)->getHofDisplayName();
 }
@@ -59,12 +60,15 @@ 
 	$nick = get_album_nick($album_id);
 	$template->assign('Nick', $nick);
 
-	if (!empty($day) && !empty($month) && !empty($year))
-		$birthdate = $month . ' / ' . $day . ' / ' . $year;
-	if (empty($birthdate) && !empty($year))
-		$birthdate = 'Year ' . $year;
-	if (empty($birthdate))
-		$birthdate = 'N/A';
+	if (!empty($day) && !empty($month) && !empty($year)) {
+			$birthdate = $month . ' / ' . $day . ' / ' . $year;
+	}
+	if (empty($birthdate) && !empty($year)) {
+			$birthdate = 'Year ' . $year;
+	}
+	if (empty($birthdate)) {
+			$birthdate = 'N/A';
+	}
 	$template->assign('Birthdate', $birthdate);
 
 	// get the time that passed since the entry was last changed

admin/Default/box_delete_processing.php

Braces +10 added lines, -8 removed lines

@@ -1,15 +1,17 @@
 <?php declare(strict_types=1);
 $action = $_REQUEST['action'];
 if ($action == 'Marked Messages') {
-	if (!isset($_REQUEST['message_id']))
-		create_error('You must choose the messages you want to delete.');
+	if (!isset($_REQUEST['message_id'])) {
+			create_error('You must choose the messages you want to delete.');
+	}
 
-	foreach ($_REQUEST['message_id'] as $id)
-		$db->query('DELETE FROM message_boxes WHERE message_id = ' . $db->escapeNumber($id));
-}
-else if ($action == 'All Messages') {
-	if (!isset($var['box_type_id']))
-		create_error('No box selected.');
+	foreach ($_REQUEST['message_id'] as $id) {
+			$db->query('DELETE FROM message_boxes WHERE message_id = ' . $db->escapeNumber($id));
+	}
+	} else if ($action == 'All Messages') {
+	if (!isset($var['box_type_id'])) {
+			create_error('No box selected.');
+	}
 	$db->query('DELETE FROM message_boxes WHERE box_type_id = ' . $db->escapeNumber($var['box_type_id']));
 }
 forward(create_container('skeleton.php', 'box_view.php'));

engine/Default/bank_anon_detail_processing.php

Braces +6 added lines, -8 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,17 +31,16 @@ 
 
 	// 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)
-		create_error('You don\'t have that much money on your account!');
+	if ($db->getInt('amount') < $amount) {
+			create_error('You don\'t have that much money on your account!');
+	}
 	$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)