smrealms / smr

lib/Default/SmrCombatDrones.class.php

Spacing +7 added lines, -7 removed lines

@@ -129,7 +129,7 @@ 
 	public function &getModifiedDamageAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
 		if (!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstForces($weaponPlayer, $forces) / 100);
 		$damage['Kamikaze'] = 0;
 		if ($weaponPlayer->isCombatDronesKamikazeOnMines()) { // If kamikaze then damage is same as MINE_ARMOUR
@@ -151,7 +151,7 @@ 
 	public function &getModifiedDamageAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
 		if (!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPort($weaponPlayer, $port) / 100);
 		$damage['MaxDamage'] = ceil($damage['Launched'] * $damage['MaxDamage']);
 		$damage['Shield'] = ceil($damage['Launched'] * $damage['Shield']);
@@ -163,7 +163,7 @@ 
 	public function &getModifiedDamageAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) {
 		if (!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPlanet($weaponPlayer, $planet) / 100);
 		$planetMod = self::PLANET_DAMAGE_MOD;
 		$damage['MaxDamage'] = ceil($damage['Launched'] * $damage['MaxDamage'] * $planetMod);
@@ -178,7 +178,7 @@ 
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		if ($targetPlayer->getShip()->hasDCS()) {
 			$damage['MaxDamage'] *= DCS_PLAYER_DAMAGE_DECIMAL_PERCENT;
 			$damage['Shield'] *= DCS_PLAYER_DAMAGE_DECIMAL_PERCENT;
@@ -196,7 +196,7 @@ 
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		
 		if ($targetPlayer->getShip()->hasDCS()) {
 			$damage['MaxDamage'] *= DCS_FORCE_DAMAGE_DECIMAL_PERCENT;
@@ -216,7 +216,7 @@ 
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		
 		if ($targetPlayer->getShip()->hasDCS()) {
 			$damage['MaxDamage'] *= DCS_PORT_DAMAGE_DECIMAL_PERCENT;
@@ -235,7 +235,7 @@ 
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		
 		if ($targetPlayer->getShip()->hasDCS()) {
 			$damage['MaxDamage'] *= DCS_PLANET_DAMAGE_DECIMAL_PERCENT;

Braces +13 added lines, -7 removed lines

@@ -13,8 +13,7 @@ 
 			$this->maxDamage = 2;
 			$this->shieldDamage = 2;
 			$this->armourDamage = 2;
-		}
-		else {
+		} else {
 			$this->maxDamage = 1;
 			$this->shieldDamage = 1;
 			$this->armourDamage = 1;
@@ -84,8 +83,9 @@ 
 		$weaponShip = $weaponPlayer->getShip();
 		$targetShip = $targetPlayer->getShip();
 		$mrDiff = $targetShip->getMR() - $weaponShip->getMR();
-		if ($mrDiff > 0)
-			$modifiedAccuracy -= $this->getBaseAccuracy() * ($mrDiff / MR_FACTOR) / 100;
+		if ($mrDiff > 0) {
+					$modifiedAccuracy -= $this->getBaseAccuracy() * ($mrDiff / MR_FACTOR) / 100;
+		}
 	
 		return max(0, min(100, $modifiedAccuracy));
 	}
@@ -127,8 +127,10 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		if (!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootForces()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstForces($weaponPlayer, $forces) / 100);
 		$damage['Kamikaze'] = 0;
@@ -149,8 +151,10 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		if (!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPorts()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPort($weaponPlayer, $port) / 100);
 		$damage['MaxDamage'] = ceil($damage['Launched'] * $damage['MaxDamage']);
@@ -161,8 +165,10 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) {
-		if (!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPlanets()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		$damage['Launched'] = ceil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPlanet($weaponPlayer, $planet) / 100);
 		$planetMod = self::PLANET_DAMAGE_MOD;

lib/Default/Template.class.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
 
 		$ajaxEnabled = ($this->data['AJAX_ENABLE_REFRESH'] ?? false) !== false;
 		if ($ajaxEnabled) {
-			$ajaxXml =& $this->convertHtmlToAjaxXml($output, $outputXml);
+			$ajaxXml = & $this->convertHtmlToAjaxXml($output, $outputXml);
 			if ($outputXml) {
 				/* Left out for size: <?xml version="1.0" encoding="ISO-8859-1"?>*/
 				$output = '<all>' . $ajaxXml . '</all>';
@@ -142,7 +142,7 @@ 
 	}
 	
 	protected function &stopCapture() {
-		$captured =& $this->captures[$this->currentCaptureID];
+		$captured = & $this->captures[$this->currentCaptureID];
 		unset($this->captures[$this->currentCaptureID]);
 		$captured .= ob_get_contents();
 		ob_clean();

lib/Default/DummyShip.class.php

Spacing +9 added lines, -9 removed lines

@@ -17,7 +17,7 @@ 
 		$this->cargo_left = $this->getCargoHolds();
 	}
 	protected function doFullUNO() {
-		foreach($this->getMaxHardware() as $hardwareTypeID => $max) {
+		foreach ($this->getMaxHardware() as $hardwareTypeID => $max) {
 			$this->hardware[$hardwareTypeID] = $max;
 			$this->oldHardware[$hardwareTypeID] = $max;
 		}
@@ -47,8 +47,8 @@ 
 	}
 	
 	public function getIllusionShip() {
-		if(!isset($this->illusionShip)) {
-			$this->illusionShip=false;
+		if (!isset($this->illusionShip)) {
+			$this->illusionShip = false;
 		}
 		return $this->illusionShip;
 	}
@@ -58,20 +58,20 @@ 
 		$db = new SmrMySqlDatabase();
 		$db->query('REPLACE INTO cached_dummys ' .
 					'(type, id, info) ' .
-					'VALUES (\'DummyShip\', '.$db->escapeString($this->getPlayer()->getPlayerName()).', '.$db->escapeString($cache).')');
+					'VALUES (\'DummyShip\', ' . $db->escapeString($this->getPlayer()->getPlayerName()) . ', ' . $db->escapeString($cache) . ')');
 		unserialize($cache);
 	}
 	
 	public static function &getCachedDummyShip(AbstractSmrPlayer $player) {
-		if(!isset(self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()])) {
+		if (!isset(self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()])) {
 			$db = new SmrMySqlDatabase();
 			$db->query('SELECT info FROM cached_dummys
 						WHERE type = \'DummyShip\'
 						AND id = ' . $db->escapeString($player->getPlayerName()) . ' LIMIT 1');
-			if($db->nextRecord()) {
+			if ($db->nextRecord()) {
 				$return = unserialize($db->getField('info'));
 				$return->regenerate($player);
-				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] =& $return;
+				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] = & $return;
 			}
 			else {
 				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] = new DummyShip($player);
@@ -85,7 +85,7 @@ 
 		$db->query('SELECT id FROM cached_dummys
 					WHERE type = \'DummyShip\'');
 		$dummyNames = array();
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$dummyNames[] = $db->getField('id');
 		}
 		return $dummyNames;
@@ -94,7 +94,7 @@ 
 	
 	
 	public function __sleep() {
-		return array('gameID','weapons');
+		return array('gameID', 'weapons');
 	}
 	
 	public function __wakeup() {

Braces +1 added lines, -2 removed lines

@@ -72,8 +72,7 @@
 				$return = unserialize($db->getField('info'));
 				$return->regenerate($player);
 				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] =& $return;
-			}
-			else {
+			} else {
 				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] = new DummyShip($player);
 			}
 		}

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(mt_rand()));
@@ -209,18 +208,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;
@@ -228,8 +224,7 @@ 
 					}
 				} unset($value);
 			}
-		}
-		else {
+		} else {
 			self::$generate = true;
 			self::$account_id = 0;
 			self::$game_id = 0;
@@ -250,8 +245,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;
@@ -398,8 +392,7 @@ 
 		if ($value === null) {
 			unset($var[$key]);
 			unset(self::$var[self::$SN][$key]);
-		}
-		else {
+		} else {
 			$var[$key] = $value;
 			self::$var[self::$SN][$key] = $value;
 		}
@@ -421,8 +414,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'];
 		}
@@ -435,8 +427,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(mt_rand()), 0, 8);
 			} while (isset(self::$var[$sn]));

lib/Default/AbstractSmrShip.class.php

Spacing +9 added lines, -9 removed lines

@@ -284,7 +284,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;
 	}
@@ -865,13 +865,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(round($results['TotalDamage'] * self::EXP_PER_DAMAGE_PLAYER));
@@ -889,7 +889,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);
@@ -903,7 +903,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);
@@ -928,13 +928,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(round($results['TotalDamage'] * self::EXP_PER_DAMAGE_PORT));
@@ -965,13 +965,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(round($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];
 	}
@@ -167,19 +168,21 @@ 
 
 	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);
+		}
 				}
 			}
 	}
 
 	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;
 	}
 
@@ -200,17 +203,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() {
@@ -256,8 +261,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];
@@ -271,8 +275,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];
@@ -331,8 +334,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);
@@ -352,8 +354,9 @@ 
 
 
 	public function hasActiveIllusion() {
-		if (!$this->hasIllusion())
-			return false;
+		if (!$this->hasIllusion()) {
+					return false;
+		}
 		return $this->getIllusionShip() !== false;
 
 	}
@@ -487,14 +490,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;
 	}
@@ -504,14 +509,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;
 	}
@@ -521,8 +528,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];
 	}
 
@@ -531,8 +539,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);
 	}
 
@@ -573,8 +582,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);
 	}
 
@@ -643,8 +653,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);
 	}
 
@@ -726,8 +737,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;
 		}
@@ -735,16 +747,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
@@ -753,14 +768,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);
 	}
 
@@ -790,8 +807,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
 		}
@@ -866,8 +884,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());
@@ -929,8 +948,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());
@@ -966,8 +986,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());
@@ -992,8 +1013,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(

lib/Default/SmrSector.class.php

Indentation +1 added lines, -1 removed lines

@@ -549,7 +549,7 @@
 	 */
 	public function setWarp(SmrSector $warp) {
 		if ($this->getWarp() == $warp->getSectorID() &&
-		    $warp->getWarp() == $this->getSectorID()) {
+			$warp->getWarp() == $this->getSectorID()) {
 			// Warps are already set correctly!
 			return;
 		}

Braces +143 added lines, -99 removed lines

@@ -126,15 +126,13 @@ 
 				$this->links['Right'] = $db->getInt('link_right');
 			}
 			$this->warp = $db->getInt('warp');
-		}
-		else if ($create) {
+		} else if ($create) {
 			$this->battles = 0;
 			$this->links = array();
 			$this->warp = 0;
 			$this->isNew = true;
 			return;
-		}
-		else {
+		} else {
 			throw new SectorNotFoundException('No sector ' . $sectorID . ' in game ' . $gameID);
 		}
 	}
@@ -167,52 +165,59 @@ 
 	}
 
 	public function markVisited(AbstractSmrPlayer $player) {
-		if ($this->hasPort())
-			$this->getPort()->addCachePort($player->getAccountID());
+		if ($this->hasPort()) {
+					$this->getPort()->addCachePort($player->getAccountID());
+		}
 
 		//now delete the entry from visited
-		if (!$this->isVisited($player))
-			$this->db->query('DELETE FROM player_visited_sector WHERE ' . $this->SQL . '
+		if (!$this->isVisited($player)) {
+					$this->db->query('DELETE FROM player_visited_sector WHERE ' . $this->SQL . '
 								 AND account_id = ' . $this->db->escapeNumber($player->getAccountID()) . ' LIMIT 1');
+		}
 		$this->visited[$player->getAccountID()] = true;
 	}
 
 	public function hasWeaponShop() {
 		foreach ($this->getLocations() as $location) {
-			if ($location->isWeaponSold())
-				return true;
+			if ($location->isWeaponSold()) {
+							return true;
+			}
 		}
 		return false;
 	}
 
 	public function hasHQ() {
 		foreach ($this->getLocations() as $location) {
-			if ($location->isHQ())
-				return true;
+			if ($location->isHQ()) {
+							return true;
+			}
 		}
 		return false;
 	}
 
 	public function hasUG() {
 		foreach ($this->getLocations() as $location) {
-			if ($location->isUG())
-				return true;
+			if ($location->isUG()) {
+							return true;
+			}
 		}
 		return false;
 	}
 
 	public function hasShipShop() {
 		foreach ($this->getLocations() as $location) {
-			if ($location->isShipSold())
-				return true;
+			if ($location->isShipSold()) {
+							return true;
+			}
 		}
 		return false;
 	}
 
 	public function offersFederalProtection() {
 		foreach ($this->getLocations() as $location) {
-			if ($location->isFed())
-				return true;
+			if ($location->isFed()) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -220,32 +225,36 @@ 
 	public function getFedRaceIDs() {
 		$raceIDs = array();
 		foreach ($this->getLocations() as $location) {
-			if ($location->isFed())
-				$raceIDs[$location->getRaceID()] = $location->getRaceID();
+			if ($location->isFed()) {
+							$raceIDs[$location->getRaceID()] = $location->getRaceID();
+			}
 		}
 		return $raceIDs;
 	}
 
 	public function hasBar() {
 		foreach ($this->getLocations() as $location) {
-			if ($location->isBar())
-				return true;
+			if ($location->isBar()) {
+							return true;
+			}
 		}
 		return false;
 	}
 
 	public function hasHardwareShop() {
 		foreach ($this->getLocations() as $location) {
-			if ($location->isHardwareSold())
-				return true;
+			if ($location->isHardwareSold()) {
+							return true;
+			}
 		}
 		return false;
 	}
 
 	public function hasBank() {
 		foreach ($this->getLocations() as $location) {
-			if ($location->isBank())
-				return true;
+			if ($location->isBank()) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -322,8 +331,9 @@ 
 	}
 
 	public function setGalaxyID($galaxyID) {
-		if ($this->galaxyID == $galaxyID)
-			return;
+		if ($this->galaxyID == $galaxyID) {
+					return;
+		}
 		$this->galaxyID = $galaxyID;
 		$this->hasChanged = true;
 	}
@@ -334,18 +344,21 @@ 
 
 	public function getNumberOfLinks() {
 		$num = 0;
-		if (!is_array($this->getLinks()))
-			return $num;
-		foreach ($this->getLinks() as $link)
-			if ($link !== 0)
+		if (!is_array($this->getLinks())) {
+					return $num;
+		}
+		foreach ($this->getLinks() as $link) {
+					if ($link !== 0)
 				$num++;
+		}
 		return $num;
 	}
 
 	public function getNumberOfConnections() {
 		$links = $this->getNumberOfLinks();
-		if ($this->hasWarp())
-			$links++;
+		if ($this->hasWarp()) {
+					$links++;
+		}
 		return $links;
 	}
 
@@ -354,30 +367,35 @@ 
 	}
 
 	public function getNeighbourID($dir) {
-		if ($this->hasLink($dir))
-			return $this->getLink($dir);
+		if ($this->hasLink($dir)) {
+					return $this->getLink($dir);
+		}
 		$galaxy = $this->getGalaxy();
 		$neighbour = $this->getSectorID();
 		switch ($dir) {
 			case 'Up':
 				$neighbour -= $galaxy->getWidth();
-				if ($neighbour < $galaxy->getStartSector())
-					$neighbour += $galaxy->getSize();
+				if ($neighbour < $galaxy->getStartSector()) {
+									$neighbour += $galaxy->getSize();
+				}
 			break;
 			case 'Down':
 				$neighbour += $galaxy->getWidth();
-				if ($neighbour > $galaxy->getEndSector())
-					$neighbour -= $galaxy->getSize();
+				if ($neighbour > $galaxy->getEndSector()) {
+									$neighbour -= $galaxy->getSize();
+				}
 			break;
 			case 'Left':
 				$neighbour -= 1;
-				if ((1 + $neighbour - $galaxy->getStartSector()) % $galaxy->getWidth() == 0)
-					$neighbour += $galaxy->getWidth();
+				if ((1 + $neighbour - $galaxy->getStartSector()) % $galaxy->getWidth() == 0) {
+									$neighbour += $galaxy->getWidth();
+				}
 			break;
 			case 'Right':
 				$neighbour += 1;
-				if (($neighbour - $galaxy->getStartSector()) % $galaxy->getWidth() == 0)
-					$neighbour -= $galaxy->getWidth();
+				if (($neighbour - $galaxy->getStartSector()) % $galaxy->getWidth() == 0) {
+									$neighbour -= $galaxy->getWidth();
+				}
 			break;
 			default:
 				throw new Exception($dir . ': is not a valid direction');
@@ -386,13 +404,16 @@ 
 	}
 
 	public function getSectorDirection($sectorID) {
-		if ($sectorID == $this->getSectorID())
-			return 'Current';
+		if ($sectorID == $this->getSectorID()) {
+					return 'Current';
+		}
 		$dir = array_search($sectorID, $this->getLinks());
-		if ($dir !== false)
-			return $dir;
-		if ($sectorID == $this->getWarp())
-			return 'Warp';
+		if ($dir !== false) {
+					return $dir;
+		}
+		if ($sectorID == $this->getWarp()) {
+					return 'Warp';
+		}
 		return 'None';
 	}
 
@@ -417,8 +438,9 @@ 
 	}
 
 	public function &getLinkSector($name) {
-		if ($this->hasLink($name))
-			return SmrSector::getSector($this->getGameID(), $this->getLink($name));
+		if ($this->hasLink($name)) {
+					return SmrSector::getSector($this->getGameID(), $this->getLink($name));
+		}
 		return false;
 	}
 
@@ -426,12 +448,14 @@ 
 	 * Cannot be used for Warps
 	 */
 	public function setLink($name, $linkID) {
-		if ($this->getLink($name) == $linkID)
-			return;
-		if ($linkID == 0)
-			unset($this->links[$name]);
-		else
-			$this->links[$name] = $linkID;
+		if ($this->getLink($name) == $linkID) {
+					return;
+		}
+		if ($linkID == 0) {
+					unset($this->links[$name]);
+		} else {
+					$this->links[$name] = $linkID;
+		}
 		$this->hasChanged = true;
 	}
 
@@ -439,8 +463,9 @@ 
 	 * Cannot be used for Warps
 	 */
 	public function setLinkSector($dir, SmrSector $linkSector) {
-		if ($this->getLink($dir) == $linkSector->getSectorID() || $linkSector->equals($this))
-			return;
+		if ($this->getLink($dir) == $linkSector->getSectorID() || $linkSector->equals($this)) {
+					return;
+		}
 		$this->setLink($dir, $linkSector->getSectorID());
 		$linkSector->setLink(self::oppositeDir($dir), $this->getSectorID());
 		$this->hasChanged = true;
@@ -464,8 +489,7 @@ 
 	public function toggleLink($dir) {
 		if ($this->hasLink($dir)) {
 			$this->disableLink($dir);
-		}
-		else {
+		} else {
 			$this->enableLink($dir);
 		}
 	}
@@ -629,21 +653,25 @@ 
 		$locations = SmrLocation::getSectorLocations($this->getGameID(), $this->getSectorID());
 		$hasAction = false;
 		foreach ($locations as $location) {
-			if ($location->hasAction())
-				$hasAction = true;
+			if ($location->hasAction()) {
+							$hasAction = true;
+			}
 		}
 		return $hasAction;
 	}
 
 	public function hasLocation($locationTypeID = false) {
 		$locations = $this->getLocations();
-		if (count($locations) == 0)
-			return false;
-		if ($locationTypeID == false)
-			return true;
+		if (count($locations) == 0) {
+					return false;
+		}
+		if ($locationTypeID == false) {
+					return true;
+		}
 		foreach ($locations as $location) {
-			if ($location->getTypeID() == $locationTypeID)
-				return true;
+			if ($location->getTypeID() == $locationTypeID) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -703,11 +731,13 @@ 
 	}
 
 	public function hasEnemyForces(AbstractSmrPlayer $player = null) {
-		if ($player == null || !$this->hasForces())
-			return false;
+		if ($player == null || !$this->hasForces()) {
+					return false;
+		}
 		foreach ($this->getForces() as $force) {
-			if (!$player->forceNAPAlliance($force->getOwner()))
-				return true;
+			if (!$player->forceNAPAlliance($force->getOwner())) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -715,8 +745,9 @@ 
 	public function &getEnemyForces(AbstractSmrPlayer $player) {
 		$enemyForces = array();
 		foreach ($this->getForces() as $force) {
-			if (!$player->forceNAPAlliance($force->getOwner()))
-				$enemyForces[] = $force;
+			if (!$player->forceNAPAlliance($force->getOwner())) {
+							$enemyForces[] = $force;
+			}
 		}
 		return $enemyForces;
 	}
@@ -734,11 +765,13 @@ 
 	}
 
 	public function hasFriendlyForces(AbstractSmrPlayer $player = null) {
-		if ($player == null || !$this->hasForces())
-			return false;
+		if ($player == null || !$this->hasForces()) {
+					return false;
+		}
 		foreach ($this->getForces() as $force) {
-			if ($player->forceNAPAlliance($force->getOwner()))
-				return true;
+			if ($player->forceNAPAlliance($force->getOwner())) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -746,8 +779,9 @@ 
 	public function &getFriendlyForces(AbstractSmrPlayer $player) {
 		$friendlyForces = array();
 		foreach ($this->getForces() as $force) {
-			if ($player->forceNAPAlliance($force->getOwner()))
-				$friendlyForces[] = $force;
+			if ($player->forceNAPAlliance($force->getOwner())) {
+							$friendlyForces[] = $force;
+			}
 		}
 		return $friendlyForces;
 	}
@@ -775,8 +809,9 @@ 
 	}
 
 	public function hasEnemyTraders(AbstractSmrPlayer $player = null) {
-		if ($player == null || !$this->hasOtherTraders($player))
-			return false;
+		if ($player == null || !$this->hasOtherTraders($player)) {
+					return false;
+		}
 		$otherPlayers = $this->getOtherTraders($player);
 		foreach ($otherPlayers as $otherPlayer) {
 			if (!$player->traderNAPAlliance($otherPlayer) 
@@ -789,12 +824,14 @@ 
 	}
 
 	public function hasFriendlyTraders(AbstractSmrPlayer $player = null) {
-		if ($player == null || !$this->hasOtherTraders($player))
-			return false;
+		if ($player == null || !$this->hasOtherTraders($player)) {
+					return false;
+		}
 		$otherPlayers = $this->getOtherTraders($player);
 		foreach ($otherPlayers as $otherPlayer) {
-			if ($player->traderNAPAlliance($otherPlayer))
-				return true;
+			if ($player->traderNAPAlliance($otherPlayer)) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -816,8 +853,9 @@ 
 	}
 
 	public function hasProtectedTraders(AbstractSmrPlayer $player = null) {
-		if ($player == null || !$this->hasOtherTraders($player))
-			return false;
+		if ($player == null || !$this->hasOtherTraders($player)) {
+					return false;
+		}
 		$otherPlayers = $this->getOtherTraders($player);
 		foreach ($otherPlayers as $otherPlayer) {
 			if (!$player->traderNAPAlliance($otherPlayer) 
@@ -853,8 +891,9 @@ 
 			$planetOwner = $defendingPlanet->getOwner();
 			foreach ($alliancePlayers as $accountID => $player) {
 				if ($player->canFight()) {
-					if ($attackingPlayer->traderAttackPlanetAlliance($player) && !$planetOwner->planetNAPAlliance($player))
-						$fightingPlayers[$accountID] = $alliancePlayers[$accountID];
+					if ($attackingPlayer->traderAttackPlanetAlliance($player) && !$planetOwner->planetNAPAlliance($player)) {
+											$fightingPlayers[$accountID] = $alliancePlayers[$accountID];
+					}
 				}
 			}
 		}
@@ -862,8 +901,9 @@ 
 	}
 
 	public function &getFightingTraders(AbstractSmrPlayer $attackingPlayer, AbstractSmrPlayer $defendingPlayer, $checkForCloak = false) {
-		if ($attackingPlayer->traderNAPAlliance($defendingPlayer))
-			throw new Exception('These traders are NAPed.');
+		if ($attackingPlayer->traderNAPAlliance($defendingPlayer)) {
+					throw new Exception('These traders are NAPed.');
+		}
 		$fightingPlayers = array('Attackers' => array(), 'Defenders' => array());
 		$alliancePlayers = SmrPlayer::getSectorPlayersByAlliances($this->getGameID(), $this->getSectorID(), array($attackingPlayer->getAllianceID(), $defendingPlayer->getAllianceID()));
 		$attackers = array();
@@ -923,8 +963,9 @@ 
 	}
 
 	public function setBattles($amount) {
-		if ($this->battles == $amount)
-			return;
+		if ($this->battles == $amount) {
+					return;
+		}
 		$this->battles = $amount;
 		$this->hasChanged = true;
 	}
@@ -946,8 +987,9 @@ 
 	}
 
 	public function isVisited(AbstractSmrPlayer $player = null) {
-		if ($player === null)
-			return true;
+		if ($player === null) {
+					return true;
+		}
 		if (!isset($this->visited[$player->getAccountID()])) {
 			$this->db->query('SELECT sector_id FROM player_visited_sector WHERE ' . $this->SQL . ' AND account_id=' . $this->db->escapeNumber($player->getAccountID()) . ' LIMIT 1');
 			$this->visited[$player->getAccountID()] = !$this->db->nextRecord();
@@ -988,10 +1030,12 @@ 
 			return $x->contains($this);
 		}
 
-		if (is_array($x) && $x['Type'] == 'Good') //Check if it's possible for port to have X, hacky but nice performance gains
+		if (is_array($x) && $x['Type'] == 'Good') {
+			//Check if it's possible for port to have X, hacky but nice performance gains
 			if ($this->hasPort())
 				if ($this->getPort()->hasX($x))
 					return true;
+		}
 
 		//Check if it's possible for location to have X, hacky but nice performance gains
 		if ($x instanceof SmrWeapon || (is_array($x) && ($x['Type'] == 'Ship' || $x['Type'] == 'Hardware')) || (is_string($x) && ($x == 'Bank' || $x == 'Bar' || $x == 'Fed' || $x == 'SafeFed' || $x == 'HQ' || $x == 'UG' || $x == 'Hardware' || $x == 'Ship' || $x == 'Weapon'))) {

lib/Default/SmrForce.class.php

Spacing +3 added lines, -3 removed lines

@@ -446,20 +446,20 @@
 
 		if ($this->hasMines()) {
 			$thisMines = new SmrMines($this->getGameID(), $this->getMines());
-			$results['Results']['Mines'] =& $thisMines->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)], $minesAreAttacker);
+			$results['Results']['Mines'] = & $thisMines->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)], $minesAreAttacker);
 			$results['TotalDamage'] += $results['Results']['Mines']['ActualDamage']['TotalDamage'];
 		}
 
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Results']['Drones'] =& $thisCDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
+			$results['Results']['Drones'] = & $thisCDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
 			$results['TotalDamage'] += $results['Results']['Drones']['ActualDamage']['TotalDamage'];
 		}
 
 		if (!$minesAreAttacker) {
 			if ($this->hasSDs()) {
 				$thisSDs = new SmrScoutDrones($this->getGameID(), $this->getSDs());
-				$results['Results']['Scouts'] =& $thisSDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
+				$results['Results']['Scouts'] = & $thisSDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
 				$results['TotalDamage'] += $results['Results']['Scouts']['ActualDamage']['TotalDamage'];
 			}
 		}

Braces +8 added lines, -12 removed lines

@@ -252,16 +252,16 @@ 
 		}
 		$this->hasChanged = true;
 		$this->expire = $time;
-		if (!$this->isNew)
-			$this->update();
+		if (!$this->isNew) {
+					$this->update();
+		}
 	}
 
 	public function updateExpire() {
 		// Changed (26/10/05) - scout drones count * 2
 		if ($this->getCDs() == 0 && $this->getMines() == 0 && $this->getSDs() > 0) {
 			$time = self::TIME_PER_SCOUT_ONLY * $this->getSDs();
-		}
-		else {
+		} else {
 			$time = ($this->getCDs() * self::TIME_PERCENT_PER_COMBAT + $this->getSDs() * self::TIME_PERCENT_PER_SCOUT + $this->getMines() * self::TIME_PERCENT_PER_MINE) * $this->getMaxGalaxyExpireTime();
 		}
 		$this->setExpire(TIME + $time);
@@ -288,11 +288,9 @@ 
 		}
 		if ($mines < 10) {
 			$turns = 1;
-		}
-		else if ($mines < 25) {
+		} else if ($mines < 25) {
 			$turns = 2;
-		}
-		else {
+		} else {
 			$turns = 3;
 		}
 		if ($ship->isFederal() || $ship->hasDCS()) {
@@ -347,12 +345,10 @@ 
 			if (!$this->exists()) {
 				$this->db->query('DELETE FROM sector_has_forces WHERE ' . $this->SQL);
 				$this->isNew = true;
-			}
-			else if ($this->hasChanged) {
+			} else if ($this->hasChanged) {
 				$this->db->query('UPDATE sector_has_forces SET combat_drones = ' . $this->db->escapeNumber($this->combatDrones) . ', scout_drones = ' . $this->db->escapeNumber($this->scoutDrones) . ', mines = ' . $this->db->escapeNumber($this->mines) . ', expire_time = ' . $this->db->escapeNumber($this->expire) . ' WHERE ' . $this->SQL);
 			}
-		}
-		else if ($this->exists()) {
+		} else if ($this->exists()) {
 			$this->db->query('INSERT INTO sector_has_forces (game_id, sector_id, owner_id, combat_drones, scout_drones, mines, expire_time)
 								VALUES('.$this->db->escapeNumber($this->gameID) . ', ' . $this->db->escapeNumber($this->sectorID) . ', ' . $this->db->escapeNumber($this->ownerID) . ', ' . $this->db->escapeNumber($this->combatDrones) . ', ' . $this->db->escapeNumber($this->scoutDrones) . ', ' . $this->db->escapeNumber($this->mines) . ', ' . $this->db->escapeNumber($this->expire) . ')');
 			$this->isNew = false;

lib/Default/AbstractSmrCombatWeapon.class.php

Spacing +29 added lines, -29 removed lines

@@ -12,7 +12,7 @@ 
 	protected $maxDamage;
 	protected $shieldDamage;
 	protected $armourDamage;
-	protected $empDamage=0;
+	protected $empDamage = 0;
 	protected $accuracy;
 	protected $damageRollover;
 	protected $raidWeapon;
@@ -85,62 +85,62 @@ 
 	abstract public function &getModifiedForceDamageAgainstPlayer(SmrForce $forces, AbstractSmrPlayer $targetPlayer);
 	
 	protected function &doPlayerDamageToForce(array &$return, AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstForces($weaponPlayer,$forces);
-		$return['ActualDamage'] =& $forces->doWeaponDamage($return['WeaponDamage']);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $forces->killForcesByPlayer($weaponPlayer);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstForces($weaponPlayer, $forces);
+		$return['ActualDamage'] = & $forces->doWeaponDamage($return['WeaponDamage']);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $forces->killForcesByPlayer($weaponPlayer);
 		return $return;
 	}
 	
 	protected function &doPlayerDamageToPlayer(array &$return, AbstractSmrPlayer $weaponPlayer, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlayer($weaponPlayer,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstPlayer($weaponPlayer, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPlayer($weaponPlayer);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $targetPlayer->killPlayerByPlayer($weaponPlayer);
 		return $return;
 	}
 	
 	protected function &doPlayerDamageToPort(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPort($weaponPlayer,$port);
-		$return['ActualDamage'] =& $port->doWeaponDamage($return['WeaponDamage']);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $port->killPortByPlayer($weaponPlayer);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstPort($weaponPlayer, $port);
+		$return['ActualDamage'] = & $port->doWeaponDamage($return['WeaponDamage']);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $port->killPortByPlayer($weaponPlayer);
 		return $return;
 	}
 	
 	protected function &doPlayerDamageToPlanet(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet, $delayed) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlanet($weaponPlayer,$planet);
-		$return['ActualDamage'] =& $planet->doWeaponDamage($return['WeaponDamage'],$delayed);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $planet->killPlanetByPlayer($weaponPlayer);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstPlanet($weaponPlayer, $planet);
+		$return['ActualDamage'] = & $planet->doWeaponDamage($return['WeaponDamage'], $delayed);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $planet->killPlanetByPlayer($weaponPlayer);
 		return $return;
 	}
 	
 	protected function &doPortDamageToPlayer(array &$return, SmrPort $port, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedPortDamageAgainstPlayer($port,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedPortDamageAgainstPlayer($port, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPort($port);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $targetPlayer->killPlayerByPort($port);
 		return $return;
 	}
 	
 	protected function &doPlanetDamageToPlayer(array &$return, SmrPlanet $planet, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedPlanetDamageAgainstPlayer($planet,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedPlanetDamageAgainstPlayer($planet, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPlanet($planet);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $targetPlayer->killPlayerByPlanet($planet);
 		return $return;
 	}
 	
 	protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $targetPlayer->killPlayerByForces($forces);
 		return $return;
 	}
 	

Braces +21 added lines, -14 removed lines

@@ -87,8 +87,9 @@ 
 	protected function &doPlayerDamageToForce(array &$return, AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
 		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstForces($weaponPlayer,$forces);
 		$return['ActualDamage'] =& $forces->doWeaponDamage($return['WeaponDamage']);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $forces->killForcesByPlayer($weaponPlayer);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $forces->killForcesByPlayer($weaponPlayer);
+		}
 		return $return;
 	}
 	
@@ -96,24 +97,27 @@ 
 		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlayer($weaponPlayer,$targetPlayer);
 		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPlayer($weaponPlayer);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $targetPlayer->killPlayerByPlayer($weaponPlayer);
+		}
 		return $return;
 	}
 	
 	protected function &doPlayerDamageToPort(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
 		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPort($weaponPlayer,$port);
 		$return['ActualDamage'] =& $port->doWeaponDamage($return['WeaponDamage']);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $port->killPortByPlayer($weaponPlayer);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $port->killPortByPlayer($weaponPlayer);
+		}
 		return $return;
 	}
 	
 	protected function &doPlayerDamageToPlanet(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet, $delayed) {
 		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlanet($weaponPlayer,$planet);
 		$return['ActualDamage'] =& $planet->doWeaponDamage($return['WeaponDamage'],$delayed);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $planet->killPlanetByPlayer($weaponPlayer);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $planet->killPlanetByPlayer($weaponPlayer);
+		}
 		return $return;
 	}
 	
@@ -121,8 +125,9 @@ 
 		$return['WeaponDamage'] =& $this->getModifiedPortDamageAgainstPlayer($port,$targetPlayer);
 		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPort($port);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $targetPlayer->killPlayerByPort($port);
+		}
 		return $return;
 	}
 	
@@ -130,8 +135,9 @@ 
 		$return['WeaponDamage'] =& $this->getModifiedPlanetDamageAgainstPlayer($planet,$targetPlayer);
 		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPlanet($planet);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $targetPlayer->killPlayerByPlanet($planet);
+		}
 		return $return;
 	}
 	
@@ -139,8 +145,9 @@ 
 		$return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces,$targetPlayer);
 		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+		if($return['ActualDamage']['KillingShot']) {
+					$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+		}
 		return $return;
 	}
 	

lib/Default/AbstractSmrLocation.class.php

Braces +55 added lines, -46 removed lines

@@ -74,8 +74,7 @@ 
 			$this->name = $db->getField('location_name');
 			$this->processor = $db->getField('location_processor');
 			$this->image = $db->getField('location_image');
-		}
-		else {
+		} else {
 			throw new Exception('Cannot find location: ' . $locationTypeID);
 		}
 	}
@@ -134,8 +133,7 @@ 
 		if ($bool === true) {
 			$this->db->query('INSERT IGNORE INTO location_is_fed (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->fed = true;
-		}
-		else if ($bool === false) {
+		} else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_fed WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->fed = false;
 		}
@@ -150,13 +148,13 @@ 
 	}
 	
 	public function setBank($bool) {
-		if ($this->bank === $bool)
-			return;
+		if ($this->bank === $bool) {
+					return;
+		}
 		if ($bool === true) {
 			$this->db->query('INSERT INTO location_is_bank (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->bank = true;
-		}
-		else if ($bool === false) {
+		} else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_bank WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->bank = false;
 		}
@@ -171,13 +169,13 @@ 
 	}
 	
 	public function setBar($bool) {
-		if ($this->bar === $bool)
-			return;
+		if ($this->bar === $bool) {
+					return;
+		}
 		if ($bool === true) {
 			$this->db->query('INSERT IGNORE INTO location_is_bar (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->bar = true;
-		}
-		else if ($bool === false) {
+		} else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_bar WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->bar = false;
 		}
@@ -192,13 +190,13 @@ 
 	}
 	
 	public function setHQ($bool) {
-		if ($this->HQ === $bool)
-			return;
+		if ($this->HQ === $bool) {
+					return;
+		}
 		if ($bool === true) {
 			$this->db->query('INSERT IGNORE INTO location_is_hq (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->HQ = true;
-		}
-		else if ($bool === false) {
+		} else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_hq WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->HQ = false;
 		}
@@ -213,13 +211,13 @@ 
 	}
 	
 	public function setUG($bool) {
-		if ($this->UG === $bool)
-			return;
+		if ($this->UG === $bool) {
+					return;
+		}
 		if ($bool === true) {
 			$this->db->query('INSERT INTO location_is_ug (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->UG = true;
-		}
-		else if ($bool === false) {
+		} else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_ug WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->UG = false;
 		}
@@ -245,18 +243,21 @@ 
 	}
 	
 	public function addHardwareSold($hardwareTypeID) {
-		if ($this->isHardwareSold($hardwareTypeID))
-			return;
+		if ($this->isHardwareSold($hardwareTypeID)) {
+					return;
+		}
 		$this->db->query('SELECT * FROM hardware_type WHERE hardware_type_id = ' . $this->db->escapeNumber($hardwareTypeID) . ' LIMIT 1');
-		if (!$this->db->nextRecord())
-			throw new Exception('Invalid hardware type id given');
+		if (!$this->db->nextRecord()) {
+					throw new Exception('Invalid hardware type id given');
+		}
 		$this->db->query('INSERT INTO location_sells_hardware (location_type_id,hardware_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ',' . $this->db->escapeNumber($hardwareTypeID) . ')');
 		$this->hardwareSold[$hardwareTypeID] = $this->db->getField('hardware_name');
 	}
 	
 	public function removeHardwareSold($hardwareTypeID) {
-		if (!$this->isHardwareSold($hardwareTypeID))
-			return;
+		if (!$this->isHardwareSold($hardwareTypeID)) {
+					return;
+		}
 		$this->db->query('DELETE FROM location_sells_hardware WHERE ' . $this->SQL . ' AND hardware_type_id = ' . $this->db->escapeNumber($hardwareTypeID) . ' LIMIT 1');
 		unset($this->hardwareSold[$hardwareTypeID]);
 	}
@@ -274,24 +275,28 @@ 
 	
 	public function isShipSold($shipTypeID = false) {
 		$ships = $this->getShipsSold();
-		if ($shipTypeID === false)
-			return count($ships) != 0;
+		if ($shipTypeID === false) {
+					return count($ships) != 0;
+		}
 		return isset($ships[$shipTypeID]);
 	}
 	
 	public function addShipSold($shipTypeID) {
-		if ($this->isShipSold($shipTypeID))
-			return;
+		if ($this->isShipSold($shipTypeID)) {
+					return;
+		}
 		$ship = AbstractSmrShip::getBaseShip(Globals::getGameType(SmrSession::getGameID()), $shipTypeID);
-		if ($ship === false)
-			throw new Exception('Invalid ship type id given');
+		if ($ship === false) {
+					throw new Exception('Invalid ship type id given');
+		}
 		$this->db->query('INSERT INTO location_sells_ships (location_type_id,ship_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ',' . $this->db->escapeNumber($shipTypeID) . ')');
 		$this->shipsSold[$shipTypeID] = $ship;
 	}
 	
 	public function removeShipSold($shipTypeID) {
-		if (!$this->isShipSold($shipTypeID))
-			return;
+		if (!$this->isShipSold($shipTypeID)) {
+					return;
+		}
 		$this->db->query('DELETE FROM location_sells_ships WHERE ' . $this->SQL . ' AND ship_type_id = ' . $this->db->escapeNumber($shipTypeID) . ' LIMIT 1');
 		unset($this->shipsSold[$shipTypeID]);
 	}
@@ -300,32 +305,37 @@ 
 		if (!isset($this->weaponsSold)) {
 			$this->weaponsSold = array();
 			$this->db->query('SELECT * FROM location_sells_weapons JOIN weapon_type USING (weapon_type_id) WHERE ' . $this->SQL);
-			while ($this->db->nextRecord())
-				$this->weaponsSold[$this->db->getInt('weapon_type_id')] = SmrWeapon::getWeapon($this->db->getInt('weapon_type_id'), false, $this->db);
+			while ($this->db->nextRecord()) {
+							$this->weaponsSold[$this->db->getInt('weapon_type_id')] = SmrWeapon::getWeapon($this->db->getInt('weapon_type_id'), false, $this->db);
+			}
 		}
 		return $this->weaponsSold;
 	}
 	
 	public function isWeaponSold($weaponTypeID = false) {
 		$weapons = $this->getWeaponsSold();
-		if ($weaponTypeID === false)
-			return count($weapons) != 0;
+		if ($weaponTypeID === false) {
+					return count($weapons) != 0;
+		}
 		return isset($weapons[$weaponTypeID]);
 	}
 	
 	public function addWeaponSold($weaponTypeID) {
-		if ($this->isWeaponSold($weaponTypeID))
-			return;
+		if ($this->isWeaponSold($weaponTypeID)) {
+					return;
+		}
 		$weapon = SmrWeapon::getWeapon($weaponTypeID);
-		if ($weapon === false)
-			throw new Exception('Invalid weapon type id given');
+		if ($weapon === false) {
+					throw new Exception('Invalid weapon type id given');
+		}
 		$this->db->query('INSERT INTO location_sells_weapons (location_type_id,weapon_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ',' . $this->db->escapeNumber($weaponTypeID) . ')');
 		$this->weaponsSold[$weaponTypeID] = $weapon;
 	}
 	
 	public function removeWeaponSold($weaponTypeID) {
-		if (!$this->isWeaponSold($weaponTypeID))
-			return;
+		if (!$this->isWeaponSold($weaponTypeID)) {
+					return;
+		}
 		$this->db->query('DELETE FROM location_sells_weapons WHERE ' . $this->SQL . ' AND weapon_type_id = ' . $this->db->escapeNumber($weaponTypeID) . ' LIMIT 1');
 		unset($this->weaponsSold[$weaponTypeID]);
 	}
@@ -336,8 +346,7 @@ 
 			if ($this->getTypeID() == LOCATION_TYPE_FEDERAL_HQ) {
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_TYPE_FEDERAL_BEACON);
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_TYPE_FEDERAL_MINT);
-			}
-			else {
+			} else {
 				$raceID = $this->getRaceID();
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_GROUP_RACIAL_BEACONS + $raceID);
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_GROUP_RACIAL_SHIPS + $raceID);