smrealms / smr

htdocs/login.php

Braces +1 added lines, -2 removed lines

@@ -50,7 +50,6 @@
 	$template->assign('Body', 'login/login.php');
 	$template->display('login/skeleton.php');
 
-}
-catch (Throwable $e) {
+} catch (Throwable $e) {
 	handleException($e);
 }

engine/Default/chat_sharing.php

Indentation +4 added lines, -4 removed lines

@@ -19,8 +19,8 @@ 
 	$shareFrom[$fromAccountId] = array(
 		'Player ID'   => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(),
 		'Player Name' => $otherPlayer == null ?
-		                 '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() :
-		                 $otherPlayer->getPlayerName(),
+						 '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() :
+						 $otherPlayer->getPlayerName(),
 		'All Games'   => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>',
 		'Game ID'     => $gameId,
 	);
@@ -40,8 +40,8 @@ 
 	$shareTo[$toAccountId] = array(
 		'Player ID'   => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(),
 		'Player Name' => $otherPlayer == null ?
-		                 '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() :
-		                 $otherPlayer->getPlayerName(),
+						 '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() :
+						 $otherPlayer->getPlayerName(),
 		'All Games'   => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>',
 		'Game ID'     => $gameId,
 	);

Spacing +2 added lines, -4 removed lines

@@ -19,8 +19,7 @@ 
 	$shareFrom[$fromAccountId] = array(
 		'Player ID'   => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(),
 		'Player Name' => $otherPlayer == null ?
-		                 '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() :
-		                 $otherPlayer->getPlayerName(),
+		                 '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() : $otherPlayer->getPlayerName(),
 		'All Games'   => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>',
 		'Game ID'     => $gameId,
 	);
@@ -40,8 +39,7 @@ 
 	$shareTo[$toAccountId] = array(
 		'Player ID'   => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(),
 		'Player Name' => $otherPlayer == null ?
-		                 '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() :
-		                 $otherPlayer->getPlayerName(),
+		                 '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() : $otherPlayer->getPlayerName(),
 		'All Games'   => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>',
 		'Game ID'     => $gameId,
 	);

lib/Default/AbstractSmrShip.class.php

Indentation +4 added lines, -4 removed lines

@@ -857,14 +857,14 @@
 
 	public function isFederal() {
 		return $this->getShipTypeID() == SHIP_TYPE_FEDERAL_DISCOVERY ||
-		       $this->getShipTypeID() == SHIP_TYPE_FEDERAL_WARRANT ||
-		       $this->getShipTypeID() == SHIP_TYPE_FEDERAL_ULTIMATUM;
+			   $this->getShipTypeID() == SHIP_TYPE_FEDERAL_WARRANT ||
+			   $this->getShipTypeID() == SHIP_TYPE_FEDERAL_ULTIMATUM;
 	}
 
 	public function isUnderground() {
 		return $this->getShipTypeID() == SHIP_TYPE_THIEF ||
-		       $this->getShipTypeID() == SHIP_TYPE_ASSASSIN ||
-		       $this->getShipTypeID() == SHIP_TYPE_DEATH_CRUISER;
+			   $this->getShipTypeID() == SHIP_TYPE_ASSASSIN ||
+			   $this->getShipTypeID() == SHIP_TYPE_DEATH_CRUISER;
 	}
 
 	public function &shootPlayer(AbstractSmrPlayer $targetPlayer) {

Spacing +9 added lines, -9 removed lines

@@ -295,7 +295,7 @@ 
 	public function setWeaponLocations(array $orderArray) {
 		$weapons = $this->weapons;
 		foreach ($orderArray as $newOrder => $oldOrder) {
-			$this->weapons[$newOrder] =& $weapons[$oldOrder];
+			$this->weapons[$newOrder] = & $weapons[$oldOrder];
 		}
 		$this->hasChangedWeapons = true;
 	}
@@ -880,13 +880,13 @@ 
 		}
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
+			$results['Weapons'][$orderID] = & $weapon->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
 			if ($results['Weapons'][$orderID]['Hit'])
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Drones'] =& $thisCDs->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
+			$results['Drones'] = & $thisCDs->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
 		$thisPlayer->increaseExperience(IRound($results['TotalDamage'] * self::EXP_PER_DAMAGE_PLAYER));
@@ -904,7 +904,7 @@ 
 		}
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootForces($thisPlayer, $forces);
+			$results['Weapons'][$orderID] = & $weapon->shootForces($thisPlayer, $forces);
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['NumMines'], array('Combat', 'Forces', 'Mines', 'Killed'), HOF_PUBLIC);
@@ -918,7 +918,7 @@ 
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Drones'] =& $thisCDs->shootForces($thisPlayer, $forces);
+			$results['Drones'] = & $thisCDs->shootForces($thisPlayer, $forces);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['NumMines'], array('Combat', 'Forces', 'Mines', 'Killed'), HOF_PUBLIC);
 			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['Mines'], array('Combat', 'Forces', 'Mines', 'Damage Done'), HOF_PUBLIC);
@@ -943,13 +943,13 @@ 
 		}
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPort($thisPlayer, $port);
+			$results['Weapons'][$orderID] = & $weapon->shootPort($thisPlayer, $port);
 			if ($results['Weapons'][$orderID]['Hit'])
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Drones'] =& $thisCDs->shootPort($thisPlayer, $port);
+			$results['Drones'] = & $thisCDs->shootPort($thisPlayer, $port);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
 		$thisPlayer->increaseExperience(IRound($results['TotalDamage'] * self::EXP_PER_DAMAGE_PORT));
@@ -980,13 +980,13 @@ 
 		}
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPlanet($thisPlayer, $planet, $delayed);
+			$results['Weapons'][$orderID] = & $weapon->shootPlanet($thisPlayer, $planet, $delayed);
 			if ($results['Weapons'][$orderID]['Hit'])
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Drones'] =& $thisCDs->shootPlanet($thisPlayer, $planet, $delayed);
+			$results['Drones'] = & $thisCDs->shootPlanet($thisPlayer, $planet, $delayed);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
 		$thisPlayer->increaseExperience(IRound($results['TotalDamage'] * self::EXP_PER_DAMAGE_PLANET));

Braces +84 added lines, -62 removed lines

@@ -34,10 +34,11 @@ 
 			// determine ship
 			$db = new SmrMySqlDatabase();
 			$db->query('SELECT * FROM ship_type WHERE ship_type_id = ' . $db->escapeNumber($shipTypeID) . ' LIMIT 1'); //TODO add game type id
-			if ($db->nextRecord())
-				self::$CACHE_BASE_SHIPS[$gameTypeID][$shipTypeID] = self::buildBaseShip($db);
-			else
-				self::$CACHE_BASE_SHIPS[$gameTypeID][$shipTypeID] = false;
+			if ($db->nextRecord()) {
+							self::$CACHE_BASE_SHIPS[$gameTypeID][$shipTypeID] = self::buildBaseShip($db);
+			} else {
+							self::$CACHE_BASE_SHIPS[$gameTypeID][$shipTypeID] = false;
+			}
 		}
 		return self::$CACHE_BASE_SHIPS[$gameTypeID][$shipTypeID];
 	}
@@ -168,10 +169,11 @@ 
 
 	public function checkForExcessHardware() {
 		//check hardware to see if anything needs to be removed
-		if (is_array($hardware = $this->getHardware()))
-			foreach ($hardware as $hardwareTypeID => $amount) {
+		if (is_array($hardware = $this->getHardware())) {
+					foreach ($hardware as $hardwareTypeID => $amount) {
 				if ($amount > ($max = $this->getMaxHardware($hardwareTypeID))) {
 					$this->setHardware($hardwareTypeID, $max, true);
+		}
 				}
 			}
 	}
@@ -188,9 +190,10 @@ 
 
 	public function getPowerUsed() {
 		$power = 0;
-		if ($this->getNumWeapons() > 0)
-			foreach ($this->weapons as $weapon)
+		if ($this->getNumWeapons() > 0) {
+					foreach ($this->weapons as $weapon)
 				$power += $weapon->getPowerLevel();
+		}
 		return $power;
 	}
 
@@ -211,17 +214,19 @@ 
 	}
 
 	public function getDisplayAttackRating(AbstractSmrPlayer $player) {
-		if ($this->hasActiveIllusion())
-			return $this->getIllusionAttack();
-		else
-			return $this->getAttackRating();
+		if ($this->hasActiveIllusion()) {
+					return $this->getIllusionAttack();
+		} else {
+					return $this->getAttackRating();
+		}
 	}
 
 	public function getDisplayDefenseRating() {
-		if ($this->hasActiveIllusion())
-			return $this->getIllusionDefense();
-		else
-			return $this->getDefenseRating();
+		if ($this->hasActiveIllusion()) {
+					return $this->getIllusionDefense();
+		} else {
+					return $this->getDefenseRating();
+		}
 	}
 
 	public function getAttackRating() : int {
@@ -267,8 +272,7 @@ 
 		if ($replacement < 0) {
 			// Shift everything up by one and put the selected weapon at the bottom
 			array_push($this->weapons, array_shift($this->weapons));
-		}
-		else {
+		} else {
 			// Swap the selected weapon with the one above it
 			$temp = $this->weapons[$replacement];
 			$this->weapons[$replacement] = $this->weapons[$orderID];
@@ -282,8 +286,7 @@ 
 		if ($replacement >= count($this->weapons)) {
 			// Shift everything down by one and put the selected weapon at the top
 			array_unshift($this->weapons, array_pop($this->weapons));
-		}
-		else {
+		} else {
 			// Swap the selected weapon with the one below it
 			$temp = $this->weapons[$replacement];
 			$this->weapons[$replacement] = $this->weapons[$orderID];
@@ -342,8 +345,7 @@ 
 			$this->setArmour(150, true);
 			$this->setCargoHolds(40);
 			$this->setShipTypeID(SHIP_TYPE_NEWBIE_MERCHANT_VESSEL);
-		}
-		else {
+		} else {
 			$this->setShields(50, true);
 			$this->setArmour(50, true);
 			$this->setCargoHolds(5);
@@ -363,8 +365,9 @@ 
 
 
 	public function hasActiveIllusion() {
-		if (!$this->hasIllusion())
-			return false;
+		if (!$this->hasIllusion()) {
+					return false;
+		}
 		return $this->getIllusionShip() !== false;
 
 	}
@@ -498,14 +501,16 @@ 
 	}
 
 	public function getHardware($hardwareTypeID = false) {
-		if ($hardwareTypeID === false)
-			return $this->hardware;
+		if ($hardwareTypeID === false) {
+					return $this->hardware;
+		}
 		return isset($this->hardware[$hardwareTypeID]) ? $this->hardware[$hardwareTypeID] : 0;
 	}
 
 	public function setHardware($hardwareTypeID, $amount) {
-		if ($this->getHardware($hardwareTypeID) == $amount)
-			return;
+		if ($this->getHardware($hardwareTypeID) == $amount) {
+					return;
+		}
 		$this->hardware[$hardwareTypeID] = $amount;
 		$this->hasChangedHardware[$hardwareTypeID] = true;
 	}
@@ -515,14 +520,16 @@ 
 	}
 
 	public function getOldHardware($hardwareTypeID = false) {
-		if ($hardwareTypeID === false)
-			return $this->oldHardware;
+		if ($hardwareTypeID === false) {
+					return $this->oldHardware;
+		}
 		return isset($this->oldHardware[$hardwareTypeID]) ? $this->oldHardware[$hardwareTypeID] : 0;
 	}
 
 	public function setOldHardware($hardwareTypeID, $amount) {
-		if ($this->getOldHardware($hardwareTypeID) == $amount)
-			return;
+		if ($this->getOldHardware($hardwareTypeID) == $amount) {
+					return;
+		}
 		$this->oldHardware[$hardwareTypeID] = $amount;
 		$this->hasChangedHardware[$hardwareTypeID] = true;
 	}
@@ -532,8 +539,9 @@ 
 	}
 
 	public function getMaxHardware($hardwareTypeID = false) {
-		if ($hardwareTypeID === false)
-			return $this->baseShip['MaxHardware'];
+		if ($hardwareTypeID === false) {
+					return $this->baseShip['MaxHardware'];
+		}
 		return $this->baseShip['MaxHardware'][$hardwareTypeID];
 	}
 
@@ -542,8 +550,9 @@ 
 	}
 
 	public function setShields($amount, $updateOldAmount = false) {
-		if ($updateOldAmount && !$this->hasLostShields())
-			$this->setOldHardware(HARDWARE_SHIELDS, $amount);
+		if ($updateOldAmount && !$this->hasLostShields()) {
+					$this->setOldHardware(HARDWARE_SHIELDS, $amount);
+		}
 		$this->setHardware(HARDWARE_SHIELDS, $amount);
 	}
 
@@ -584,8 +593,9 @@ 
 	}
 
 	public function setArmour($amount, $updateOldAmount = false) {
-		if ($updateOldAmount && !$this->hasLostArmour())
-			$this->setOldHardware(HARDWARE_ARMOUR, $amount);
+		if ($updateOldAmount && !$this->hasLostArmour()) {
+					$this->setOldHardware(HARDWARE_ARMOUR, $amount);
+		}
 		$this->setHardware(HARDWARE_ARMOUR, $amount);
 	}
 
@@ -654,8 +664,9 @@ 
 	}
 
 	public function setCDs($amount, $updateOldAmount = false) {
-		if ($updateOldAmount && !$this->hasLostCDs())
-			$this->setOldHardware(HARDWARE_COMBAT, $amount);
+		if ($updateOldAmount && !$this->hasLostCDs()) {
+					$this->setOldHardware(HARDWARE_COMBAT, $amount);
+		}
 		$this->setHardware(HARDWARE_COMBAT, $amount);
 	}
 
@@ -737,8 +748,9 @@ 
 
 	public function getCargo($goodID = false) {
 		if ($goodID !== false) {
-			if (isset($this->cargo[$goodID]))
-				return $this->cargo[$goodID];
+			if (isset($this->cargo[$goodID])) {
+							return $this->cargo[$goodID];
+			}
 			$cargo = 0;
 			return $cargo;
 		}
@@ -746,16 +758,19 @@ 
 	}
 
 	public function hasCargo($goodID = false) {
-		if ($goodID !== false)
-			return $this->getCargo($goodID) > 0;
-		if (is_array($cargo = $this->getCargo()))
-			return array_sum($cargo) > 0;
+		if ($goodID !== false) {
+					return $this->getCargo($goodID) > 0;
+		}
+		if (is_array($cargo = $this->getCargo())) {
+					return array_sum($cargo) > 0;
+		}
 		return false;
 	}
 
 	public function setCargo($goodID, $amount) {
-		if ($this->getCargo($goodID) == $amount)
-			return;
+		if ($this->getCargo($goodID) == $amount) {
+					return;
+		}
 		$this->cargo[$goodID] = $amount;
 		$this->hasChangedCargo = true;
 		// Sort cargo by goodID to make sure it shows up in the correct order
@@ -764,14 +779,16 @@ 
 	}
 
 	public function decreaseCargo($goodID, $amount) {
-		if ($amount < 0)
-			throw new Exception('Trying to decrease negative cargo.');
+		if ($amount < 0) {
+					throw new Exception('Trying to decrease negative cargo.');
+		}
 		$this->setCargo($goodID, $this->getCargo($goodID) - $amount);
 	}
 
 	public function increaseCargo($goodID, $amount) {
-		if ($amount < 0)
-			throw new Exception('Trying to increase negative cargo.');
+		if ($amount < 0) {
+					throw new Exception('Trying to increase negative cargo.');
+		}
 		$this->setCargo($goodID, $this->getCargo($goodID) + $amount);
 	}
 
@@ -801,8 +818,9 @@ 
 		$this->setOldShields($this->getShields());
 		$this->setOldCDs($this->getCDs());
 		$this->setOldArmour($this->getArmour());
-		if (isset($var['UnderAttack']))
-			return $var['UnderAttack'];
+		if (isset($var['UnderAttack'])) {
+					return $var['UnderAttack'];
+		}
 		if ($underAttack && !USING_AJAX) {
 			SmrSession::updateVar('UnderAttack', $underAttack); //Remember we are under attack for AJAX
 		}
@@ -881,8 +899,9 @@ 
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
 			$results['Weapons'][$orderID] =& $weapon->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
-			if ($results['Weapons'][$orderID]['Hit'])
-				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
+			if ($results['Weapons'][$orderID]['Hit']) {
+							$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
+			}
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
@@ -944,8 +963,9 @@ 
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
 			$results['Weapons'][$orderID] =& $weapon->shootPort($thisPlayer, $port);
-			if ($results['Weapons'][$orderID]['Hit'])
-				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
+			if ($results['Weapons'][$orderID]['Hit']) {
+							$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
+			}
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
@@ -981,8 +1001,9 @@ 
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
 			$results['Weapons'][$orderID] =& $weapon->shootPlanet($thisPlayer, $planet, $delayed);
-			if ($results['Weapons'][$orderID]['Hit'])
-				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
+			if ($results['Weapons'][$orderID]['Hit']) {
+							$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
+			}
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
@@ -1007,8 +1028,9 @@ 
 				$cdDamage = $this->doCDDamage(min($damage['MaxDamage'], $damage['Armour']));
 				$damage['Armour'] -= $cdDamage;
 				$damage['MaxDamage'] -= $cdDamage;
-				if (!$this->hasCDs() && ($cdDamage == 0 || $damage['Rollover']))
-					$armourDamage = $this->doArmourDamage(min($damage['MaxDamage'], $damage['Armour']));
+				if (!$this->hasCDs() && ($cdDamage == 0 || $damage['Rollover'])) {
+									$armourDamage = $this->doArmourDamage(min($damage['MaxDamage'], $damage['Armour']));
+				}
 			}
 		}
 		$return = array(

engine/Default/course_plot_processing.php

Braces +26 added lines, -14 removed lines

@@ -1,36 +1,48 @@
 <?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))
+if (empty($start) || empty($target)) {
 	create_error('Where do you want to go today?');
+}
 
 
-if (!is_numeric($start) || !is_numeric($target))
+if (!is_numeric($start) || !is_numeric($target)) {
 	create_error('Please enter only numbers!');
+}
 
 $start = abs(str_replace('.', '', $start));
 $target = abs(str_replace('.', '', $target));
 
-if ($start == $target)
+if ($start == $target) {
 	create_error('Hmmmm...if ' . $start . '=' . $target . ' then that means...YOU\'RE ALREADY THERE! *cough*you\'re real smart*cough*');
+}
 
 $startExists = false;
 $targetExists = false;
 $galaxies = SmrGalaxy::getGameGalaxies($player->getGameID());
 foreach ($galaxies as $galaxy) {
-	if ($galaxy->contains($start))
-		$startExists = true;
-	if ($galaxy->contains($target))
-		$targetExists = true;
-}
-
-if ($startExists === false || $targetExists === false)
+	if ($galaxy->contains($start)) {
+			$startExists = true;
+	}
+	if ($galaxy->contains($target)) {
+			$targetExists = true;
+	}
+	}
+
+if ($startExists === false || $targetExists === false) {
 	create_error('The sectors have to exist!');
+}
 
 $account->log(LOG_TYPE_MOVEMENT, 'Player plots to ' . $target . '.', $player->getSectorID());
 

engine/Default/planet_defense_processing.php

Braces +50 added lines, -38 removed lines

@@ -1,17 +1,21 @@ 
 <?php declare(strict_types=1);
-if (!$player->isLandedOnPlanet())
+if (!$player->isLandedOnPlanet()) {
 	create_error('You are not on a planet!');
+}
 $amount = trim($_REQUEST['amount']);
-if (!is_numeric($amount))
+if (!is_numeric($amount)) {
 	create_error('Numbers only please');
+}
 	
 // only whole numbers allowed
 $amount = round($amount);
 
-if ($amount <= 0)
+if ($amount <= 0) {
 	create_error('You must actually enter an amount > 0!');
-if ($player->getNewbieTurns() > 0)
+}
+if ($player->getNewbieTurns() > 0) {
 	create_error('You can\'t drop defenses under newbie protection!');
+}
 // get a planet from the sector where the player is in
 $planet = $player->getSectorPlanet();
 
@@ -21,40 +25,44 @@ 
 if ($action == 'Ship') {
 	if ($type_id == HARDWARE_SHIELDS) {
 		// do we want transfer more than we have?
-		if ($amount > $planet->getShields())
-			create_error('You can\'t take more shields from planet than are on it!');
+		if ($amount > $planet->getShields()) {
+					create_error('You can\'t take more shields from planet than are on it!');
+		}
 
 		// do we want to transfer more than we can carry?
-		if ($amount > $ship->getMaxShields() - $ship->getShields())
-			create_error('You can\'t take more shields than you can carry!');
+		if ($amount > $ship->getMaxShields() - $ship->getShields()) {
+					create_error('You can\'t take more shields than you can carry!');
+		}
 
 		// now transfer
 		$planet->decreaseShields($amount);
 		$ship->increaseShields($amount);
 		$account->log(LOG_TYPE_PLANETS, 'Player takes ' . $amount . ' shields from planet.', $player->getSectorID());
-	}
-	else if ($type_id == HARDWARE_COMBAT) {
+	} else if ($type_id == HARDWARE_COMBAT) {
 		// do we want transfer more than we have?
-		if ($amount > $planet->getCDs())
-			create_error('You can\'t take more drones from planet than are on it!');
+		if ($amount > $planet->getCDs()) {
+					create_error('You can\'t take more drones from planet than are on it!');
+		}
 
 		// do we want to transfer more than we can carry?
-		if ($amount > $ship->getMaxCDs() - $ship->getCDs())
-			create_error('You can\'t take more drones than you can carry!');
+		if ($amount > $ship->getMaxCDs() - $ship->getCDs()) {
+					create_error('You can\'t take more drones than you can carry!');
+		}
 
 		// now transfer
 		$planet->decreaseCDs($amount);
 		$ship->increaseCDs($amount);
 		$account->log(LOG_TYPE_PLANETS, 'Player takes ' . $amount . ' drones from planet.', $player->getSectorID());
-	}
-	else if ($type_id == HARDWARE_ARMOUR) {
+	} else if ($type_id == HARDWARE_ARMOUR) {
 		// do we want transfer more than we have?
-		if ($amount > $planet->getArmour())
-			create_error('You can\'t take more armour from planet than are on it!');
+		if ($amount > $planet->getArmour()) {
+					create_error('You can\'t take more armour from planet than are on it!');
+		}
 
 		// do we want to transfer more than we can carry?
-		if ($amount > $ship->getMaxArmour() - $ship->getArmour())
-			create_error('You can\'t take more armour than you can carry!');
+		if ($amount > $ship->getMaxArmour() - $ship->getArmour()) {
+					create_error('You can\'t take more armour than you can carry!');
+		}
 
 		// now transfer
 		$planet->decreaseArmour($amount);
@@ -62,32 +70,34 @@ 
 		$account->log(LOG_TYPE_PLANETS, 'Player takes ' . $amount . ' armour from planet.', $player->getSectorID());
 	}
 	
-}
-elseif ($action == 'Planet') {
+} elseif ($action == 'Planet') {
 	// does the user wants to transfer shields?
 	if ($type_id == HARDWARE_SHIELDS) {
 		// do we want transfer more than we have?
-		if ($amount > $ship->getShields())
-			create_error('You can\'t transfer more shields than you carry!');
+		if ($amount > $ship->getShields()) {
+					create_error('You can\'t transfer more shields than you carry!');
+		}
 
 		// do we want to transfer more than the planet can hold?
-		if ($amount + $planet->getShields() > $planet->getMaxShields())
-			create_error('The planet can\'t hold more than ' . $planet->getMaxShields() . ' shields!');
+		if ($amount + $planet->getShields() > $planet->getMaxShields()) {
+					create_error('The planet can\'t hold more than ' . $planet->getMaxShields() . ' shields!');
+		}
 
 		// now transfer
 		$planet->increaseShields($amount);
 		$ship->decreaseShields($amount);
 		$account->log(LOG_TYPE_PLANETS, 'Player puts ' . $amount . ' shields on planet.', $player->getSectorID());
 	// does the user wants to transfer drones?
-	}
-	else if ($type_id == HARDWARE_COMBAT) {
+	} else if ($type_id == HARDWARE_COMBAT) {
 		// do we want transfer more than we have?
-		if ($amount > $ship->getCDs())
-			create_error('You can\'t transfer more combat drones than you carry!');
+		if ($amount > $ship->getCDs()) {
+					create_error('You can\'t transfer more combat drones than you carry!');
+		}
 
 		// do we want to transfer more than we can carry?
-		if ($amount + $planet->getCDs() > $planet->getMaxCDs())
-			create_error('The planet can\'t hold more than ' . $planet->getMaxCDs() . ' drones!');
+		if ($amount + $planet->getCDs() > $planet->getMaxCDs()) {
+					create_error('The planet can\'t hold more than ' . $planet->getMaxCDs() . ' drones!');
+		}
 
 		// now transfer
 		$planet->increaseCDs($amount);
@@ -97,12 +107,14 @@ 
 	// does the user wish to transfare armour?
 	else if ($type_id == HARDWARE_ARMOUR) {
 		// do we want transfer more than we have?
-		if ($amount >= $ship->getArmour())
-			create_error('You can\'t transfer more armour than what you carry minus one!');
+		if ($amount >= $ship->getArmour()) {
+					create_error('You can\'t transfer more armour than what you carry minus one!');
+		}
 
 		// do we want to transfer more than we can carry?
-		if ($amount + $planet->getArmour() > $planet->getMaxArmour())
-			create_error('The planet can\'t hold more than ' . $planet->getMaxArmour() . ' armour!');
+		if ($amount + $planet->getArmour() > $planet->getMaxArmour()) {
+					create_error('The planet can\'t hold more than ' . $planet->getMaxArmour() . ' armour!');
+		}
 
 		// now transfer
 		$planet->increaseArmour($amount);
@@ -110,9 +122,9 @@ 
 		$account->log(LOG_TYPE_PLANETS, 'Player puts ' . $amount . ' armour on planet.', $player->getSectorID());
 	}
 	
-}
-else
+} else {
 	create_error('You must choose if you want to transfer to planet or to the ship!');
+}
 
 $ship->removeUnderAttack();
 

engine/Default/planet_stockpile_processing.php

Braces +19 added lines, -13 removed lines

@@ -1,14 +1,17 @@ 
 <?php declare(strict_types=1);
-if (!$player->isLandedOnPlanet())
+if (!$player->isLandedOnPlanet()) {
 	create_error('You are not on a planet!');
+}
 $amount = $_REQUEST['amount'];
-if (!is_numeric($amount))
+if (!is_numeric($amount)) {
 	create_error('Numbers only please');
+}
 	
 $amount = floor($amount);
 
-if ($amount <= 0)
+if ($amount <= 0) {
 	create_error('You must actually enter an amount > 0!');
+}
 
 // get a planet from the sector where the player is in
 $planet = $player->getSectorPlanet();
@@ -17,12 +20,14 @@ 
 if ($action == 'Ship') {
 
 	// do we want transfer more than we have?
-	if ($amount > $planet->getStockpile($var['good_id']))
-		create_error('You can\'t take more than on planet!');
+	if ($amount > $planet->getStockpile($var['good_id'])) {
+			create_error('You can\'t take more than on planet!');
+	}
 
 	// do we want to transfer more than we can carry?
-	if ($amount > $ship->getEmptyHolds())
-		create_error('You can\'t take more than you can carry!');
+	if ($amount > $ship->getEmptyHolds()) {
+			create_error('You can\'t take more than you can carry!');
+	}
 
 	// now transfer
 	$planet->decreaseStockpile($var['good_id'], $amount);
@@ -30,15 +35,16 @@ 
 	$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!');
+	if ($amount > $ship->getCargo($var['good_id'])) {
+			create_error('You can\'t store more than you carry!');
+	}
 
 	// do we want to transfer more than the planet can hold?
-	if ($amount > $planet->getRemainingStockpile($var['good_id']))
-		create_error('This planet cannot store more than ' . SmrPlanet::MAX_STOCKPILE . ' of each good!');
+	if ($amount > $planet->getRemainingStockpile($var['good_id'])) {
+			create_error('This planet cannot store more than ' . SmrPlanet::MAX_STOCKPILE . ' of each good!');
+	}
 
 	// now transfer
 	$planet->increaseStockpile($var['good_id'], $amount);

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

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