smrealms / smr

admin/Default/newsletter_send_processing.php

Spacing +14 added lines, -14 removed lines

@@ -20,9 +20,9 @@ 
 	}
 
 	// Set the body text, giving preference to HTML
-	if(!empty($newsletterHtml)) {
+	if (!empty($newsletterHtml)) {
 		$mail->msgHTML($newsletterHtml);
-		if(!empty($newsletterText)) {
+		if (!empty($newsletterText)) {
 			$mail->AltBody = $newsletterText;
 		}
 	} else {
@@ -37,12 +37,12 @@ 
 set_mail_body($mail, $var['newsletter_html'], $var['newsletter_text'],
               $_REQUEST['salutation']);
 
-if($_REQUEST['to_email']=='*') {
+if ($_REQUEST['to_email'] == '*') {
 	// Send the newsletter to all players.
 	// Disable output buffering here so we can monitor the progress.
-	header('X-Accel-Buffering: no');    // disable Nginx output buffering
-	ob_implicit_flush();    // instruct PHP to flush after every output call
-	ob_end_flush();     // turn off PHP output buffering
+	header('X-Accel-Buffering: no'); // disable Nginx output buffering
+	ob_implicit_flush(); // instruct PHP to flush after every output call
+	ob_end_flush(); // turn off PHP output buffering
 
 	$db->query('SELECT account_id, email, login FROM account WHERE validated="TRUE" AND email NOT IN ("noone@smrealms.de","NPC@smrealms.de") AND NOT(EXISTS(SELECT account_id FROM account_is_closed WHERE account_is_closed.account_id=account.account_id))');
 
@@ -59,9 +59,9 @@ 
 
 	while ($db->nextRecord()) {
 		// get account data
-		$account_id	= $db->getField('account_id');
-		$to_email	= $db->getField('email');
-		$to_name	= $db->getField('login');
+		$account_id = $db->getField('account_id');
+		$to_email = $db->getField('email');
+		$to_name = $db->getField('login');
 
 		// Reset the message body with personalized salutation, if requested
 		if ($_REQUEST['salutation']) {
@@ -70,21 +70,21 @@ 
 		}
 
 		// debug output
-		echo '['.$account_id.'] Preparing mail for '.$to_name.' ('.$to_email.')... ';
+		echo '[' . $account_id . '] Preparing mail for ' . $to_name . ' (' . $to_email . ')... ';
 
 		// set a bounce address we can process later
 		$mail->addReplyTo('bounce_' . $account_id . '@smrealms.de', 'SMR Support');
 		$mail->addAddress($to_email, $to_name);
 
 		if (!$mail->send()) {
-			echo 'error.'.EOL . $mail->ErrorInfo;
+			echo 'error.' . EOL . $mail->ErrorInfo;
 			exit;
 		}
 
 		$sent++;
 		echo 'sent.<br />';
 		if (($sent % 10) == 0) {
-			echo 'Sent '. $sent . ' of ' . $total . ' mails.<br /><br />';
+			echo 'Sent ' . $sent . ' of ' . $total . ' mails.<br /><br />';
 		}
 
 		// Clear all addresses for next loop
@@ -92,7 +92,7 @@ 
 		$mail->clearAddresses();
 	}
 
-	echo '<br />Done! Total '.$sent.' mails sent.';
+	echo '<br />Done! Total ' . $sent . ' mails sent.';
 	release_lock();
 	exit();
 }
@@ -102,7 +102,7 @@ 
 	$mail->addAddress($_REQUEST['to_email'], $_REQUEST['to_email']);
 
 	if (!$mail->send()) {
-		echo 'error.'.EOL . $mail->ErrorInfo;
+		echo 'error.' . EOL . $mail->ErrorInfo;
 		exit;
 	}
 }

lib/Default/Distance.class.inc

Spacing +5 added lines, -5 removed lines

@@ -11,7 +11,7 @@ 
 	private $path = array();
 	private $warpMap = array();
 
-	public function __construct($gameID,$_startSectorId) {
+	public function __construct($gameID, $_startSectorId) {
 		$this->gameID = $gameID;
 		$this->addToPath($_startSectorId);
 	}
@@ -29,7 +29,7 @@ 
 	}
 
 	public function getTotalSectors() {
-		return $this->getDistance()+$this->getNumWarps();
+		return $this->getDistance() + $this->getNumWarps();
 	}
 
 	public function getNumWarps() {
@@ -48,11 +48,11 @@ 
 	 * @return integer
 	 */
 	public function getEndSectorID() {
-		return $this->path[count($this->path)-1];
+		return $this->path[count($this->path) - 1];
 	}
 
 	public function &getEndSector() {
-		return SmrSector::getSector($this->gameID,$this->getEndSectorID());
+		return SmrSector::getSector($this->gameID, $this->getEndSectorID());
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 	}
 
 	public function isInPath($sectorID) {
-		return in_array($sectorID,$this->getPath());
+		return in_array($sectorID, $this->getPath());
 	}
 
 	/**

lib/Default/AbstractSmrShip.class.inc

Spacing +235 added lines, -235 removed lines

@@ -23,12 +23,12 @@ 
 	protected $hasChangedCargo = false;
 	protected $hasChangedHardware = array();
 
-	public static function &getBaseShip($gameTypeID,$shipTypeID,$forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_BASE_SHIPS[$gameTypeID][$shipTypeID])) {
+	public static function &getBaseShip($gameTypeID, $shipTypeID, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_BASE_SHIPS[$gameTypeID][$shipTypeID])) {
 			// 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())
+			$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;
@@ -40,40 +40,40 @@ 
 		$ship = array();
 		$ship['Type']				= 'Ship';
 		$ship['Name']				= $db->getField('ship_name');
-		$ship['ShipTypeID']			= $db->getField('ship_type_id');
-		$ship['RaceID']				= $db->getField('race_id');
-		$ship['Hardpoint']			= $db->getField('hardpoint');
+		$ship['ShipTypeID'] = $db->getField('ship_type_id');
+		$ship['RaceID'] = $db->getField('race_id');
+		$ship['Hardpoint'] = $db->getField('hardpoint');
 		$ship['Speed']				= $db->getField('speed');
-		$ship['Cost']				= $db->getField('cost');
-		$ship['AlignRestriction']	= $db->getField('buyer_restriction');
+		$ship['Cost'] = $db->getField('cost');
+		$ship['AlignRestriction'] = $db->getField('buyer_restriction');
 		$ship['Level']				= $db->getField('lvl_needed');
 
 		$maxPower = 0;
-		switch($ship['Hardpoint']) {
+		switch ($ship['Hardpoint']) {
 			default:
-				$maxPower+=1*$ship['Hardpoint']-10;
+				$maxPower += 1 * $ship['Hardpoint'] - 10;
 			case 10:
-				$maxPower+=2;
+				$maxPower += 2;
 			case 9:
-				$maxPower+=2;
+				$maxPower += 2;
 			case 8:
-				$maxPower+=2;
+				$maxPower += 2;
 			case 7:
-				$maxPower+=2;
+				$maxPower += 2;
 			case 6:
-				$maxPower+=3;
+				$maxPower += 3;
 			case 5:
-				$maxPower+=3;
+				$maxPower += 3;
 			case 4:
-				$maxPower+=3;
+				$maxPower += 3;
 			case 3:
-				$maxPower+=4;
+				$maxPower += 4;
 			case 2:
-				$maxPower+=4;
+				$maxPower += 4;
 			case 1:
-				$maxPower+=5;
+				$maxPower += 5;
 			case 0:
-				$maxPower+=0;
+				$maxPower += 0;
 		}
 		$ship['MaxPower'] = $maxPower;
 
@@ -81,38 +81,38 @@ 
 		// get supported hardware from db
 		$db2 = new SmrMySqlDatabase();
 		$db2->query('SELECT hardware_type_id, max_amount FROM ship_type_support_hardware ' .
-			'WHERE ship_type_id = '.$db2->escapeNumber($ship['ShipTypeID']).' ORDER BY hardware_type_id');
+			'WHERE ship_type_id = ' . $db2->escapeNumber($ship['ShipTypeID']) . ' ORDER BY hardware_type_id');
 
 		while ($db2->nextRecord()) {
 			// adding hardware to array
 			$ship['MaxHardware'][$db2->getField('hardware_type_id')] = $db2->getField('max_amount');
 		}
 
-		$ship['BaseMR'] = 	round(
+		$ship['BaseMR'] = round(
 								700 -
 								(
 									(
 										$ship['MaxHardware'][HARDWARE_SHIELDS]
 										+$ship['MaxHardware'][HARDWARE_ARMOUR]
-										+$ship['MaxHardware'][HARDWARE_COMBAT]*3
-									)/25
+										+$ship['MaxHardware'][HARDWARE_COMBAT] * 3
+									) / 25
 									+(
-										$ship['MaxHardware'][HARDWARE_CARGO]/100
-										-$ship['Speed']*5
-										+$ship['Hardpoint']*5
-										+$ship['MaxHardware'][HARDWARE_COMBAT]/5
+										$ship['MaxHardware'][HARDWARE_CARGO] / 100
+										-$ship['Speed'] * 5
+										+$ship['Hardpoint'] * 5
+										+$ship['MaxHardware'][HARDWARE_COMBAT] / 5
 									)
 								)
 							);
 		return $ship;
 	}
 
-	public static function &getAllBaseShips($gameTypeID,$forceUpdate = false) {
+	public static function &getAllBaseShips($gameTypeID, $forceUpdate = false) {
 		// determine ship
 		$db = new SmrMySqlDatabase();
 		$db->query('SELECT * FROM ship_type ORDER BY ship_type_id ASC'); //TODO add game type id
-		while($db->nextRecord()) {
-			if(!isset(self::$CACHE_BASE_SHIPS[$gameTypeID][$db->getInt('ship_type_id')])) {
+		while ($db->nextRecord()) {
+			if (!isset(self::$CACHE_BASE_SHIPS[$gameTypeID][$db->getInt('ship_type_id')])) {
 				self::$CACHE_BASE_SHIPS[$gameTypeID][$db->getInt('ship_type_id')] = self::buildBaseShip($db);
 			}
 		}
@@ -126,7 +126,7 @@ 
 	}
 
 	protected function regenerateBaseShip() {
-		$this->baseShip = AbstractSmrShip::getBaseShip(Globals::getGameType($this->gameID),$this->player->getShipTypeID());
+		$this->baseShip = AbstractSmrShip::getBaseShip(Globals::getGameType($this->gameID), $this->player->getShipTypeID());
 		$this->checkForExcess();
 	}
 
@@ -144,7 +144,7 @@ 
 	}
 
 	public function checkForExcessCargo() {
-		if($this->hasCargo()) {
+		if ($this->hasCargo()) {
 			foreach ($this->getCargo() as $goodID => $amount) {
 				$excess = array_sum($this->getCargo()) - $this->getCargoHolds();
 				if ($excess > 0) {
@@ -157,28 +157,28 @@ 
 
 	public function checkForExcessHardware() {
 		//check hardware to see if anything needs to be removed
-		if(is_array($hardware = $this->getHardware()))
+		if (is_array($hardware = $this->getHardware()))
 			foreach ($hardware as $hardwareTypeID => $amount) {
-				if ($amount > ($max=$this->getMaxHardware($hardwareTypeID))) {
-					$this->setHardware($hardwareTypeID,$max,true);
+				if ($amount > ($max = $this->getMaxHardware($hardwareTypeID))) {
+					$this->setHardware($hardwareTypeID, $max, true);
 				}
 			}
 	}
 
 	public function getPowerUsed() {
 		$power = 0;
-		if($this->getNumWeapons()>0)
+		if ($this->getNumWeapons() > 0)
 			foreach ($this->weapons as $weapon)
 				$power += $weapon->getPowerLevel();
 		return $power;
 	}
 
 	public function getRemainingPower() {
-		return $this->getMaxPower()-$this->getPowerUsed();
+		return $this->getMaxPower() - $this->getPowerUsed();
 	}
 
 	public function hasRemainingPower() {
-		return $this->getRemainingPower()>0;
+		return $this->getRemainingPower() > 0;
 	}
 
 	public function getMaxPower() {
@@ -190,14 +190,14 @@ 
 	}
 
 	public function getDisplayAttackRating(AbstractSmrPlayer $player) {
-		if($this->hasActiveIllusion())
+		if ($this->hasActiveIllusion())
 			return $this->getIllusionAttack();
 		else
 			return $this->getAttackRating();
 	}
 
 	public function getDisplayDefenseRating() {
-		if($this->hasActiveIllusion())
+		if ($this->hasActiveIllusion())
 			return $this->getIllusionDefense();
 		else
 			return $this->getDefenseRating();
@@ -229,9 +229,9 @@ 
 
 
 	public function &addWeapon($weaponTypeID) {
-		if($this->hasOpenWeaponSlots() && $this->hasRemainingPower()) {
+		if ($this->hasOpenWeaponSlots() && $this->hasRemainingPower()) {
 			$weapon = SmrWeapon::getWeapon($weaponTypeID);
-			if($this->getRemainingPower()>=$weapon->getPowerLevel()) {
+			if ($this->getRemainingPower() >= $weapon->getPowerLevel()) {
 				$this->weapons[count($this->weapons)] = $weapon;
 				$this->hasChangedWeapons = true;
 				return $weapon;
@@ -243,13 +243,13 @@ 
 
 	public function moveWeaponUp($orderID) {
 		$replacement = $orderID - 1;
-		if($replacement < 0) {
+		if ($replacement < 0) {
 			// Shift everything up by one and put the selected weapon at the bottom
-			$temp =& $this->weapons[$orderID];
-			for($i=1;$i<count($this->weapons);++$i) {
-				$this->weapons[$i-1] =& $this->weapons[$i]; //If we go above the bounds of the array it will keep on going due to assign by ref. Hence $i-1 =& $i not $i =& $i+1
+			$temp = & $this->weapons[$orderID];
+			for ($i = 1; $i < count($this->weapons); ++$i) {
+				$this->weapons[$i - 1] = & $this->weapons[$i]; //If we go above the bounds of the array it will keep on going due to assign by ref. Hence $i-1 =& $i not $i =& $i+1
 			}
-			$this->weapons[count($this->weapons)-1] =& $temp;
+			$this->weapons[count($this->weapons) - 1] = & $temp;
 		}
 		else {
 			$temp = $this->weapons[$replacement];
@@ -261,13 +261,13 @@ 
 
 	public function moveWeaponDown($orderID) {
 		$replacement = $orderID + 1;
-		if($replacement >= count($this->weapons)) {
+		if ($replacement >= count($this->weapons)) {
 			// Shift everything down by one and put the selected weapon at the top
-			$temp =& $this->weapons[count($this->weapons)-1];
-			for($i=count($this->weapons)-1;$i>0;--$i) {
-				$this->weapons[$i] =& $this->weapons[$i-1];
+			$temp = & $this->weapons[count($this->weapons) - 1];
+			for ($i = count($this->weapons) - 1; $i > 0; --$i) {
+				$this->weapons[$i] = & $this->weapons[$i - 1];
 			}
-			$this->weapons[0] =& $temp;
+			$this->weapons[0] = & $temp;
 		}
 		else {
 			$temp = $this->weapons[$replacement];
@@ -278,22 +278,22 @@ 
 	}
 
 	public function setWeaponLocations(array $orderArray) {
-		$weapons=$this->weapons;
-		foreach($orderArray as $newOrder => $oldOrder) {
-			$this->weapons[$newOrder] =& $weapons[$oldOrder];
+		$weapons = $this->weapons;
+		foreach ($orderArray as $newOrder => $oldOrder) {
+			$this->weapons[$newOrder] = & $weapons[$oldOrder];
 		}
 		$this->hasChangedWeapons = true;
 	}
 
 	public function removeLastWeapon() {
-		$this->removeWeapon($this->getNumWeapons()-1);
+		$this->removeWeapon($this->getNumWeapons() - 1);
 	}
 
 	public function removeWeapon($orderID) {
 		// Shift everything after the removed weapon up by one and put the selected weapon at the bottom
-		for($i=$orderID+1;$i<count($this->weapons);++$i) {
-			$this->weapons[$i-1] =& $this->weapons[$i]; //If we go above the bounds of the array it will keep on going due to assign by ref. Hence $i-1 =& $i not $i =& $i+1
-		} unset($this->weapons[count($this->weapons)-1]);
+		for ($i = $orderID + 1; $i < count($this->weapons); ++$i) {
+			$this->weapons[$i - 1] = & $this->weapons[$i]; //If we go above the bounds of the array it will keep on going due to assign by ref. Hence $i-1 =& $i not $i =& $i+1
+		} unset($this->weapons[count($this->weapons) - 1]);
 		$this->hasChangedWeapons = true;
 	}
 
@@ -303,9 +303,9 @@ 
 	}
 
 	public function removeAllCargo() {
-		if(is_array($this->cargo)) {
-			foreach($this->cargo as $goodID => $amount) {
-				$this->setCargo($goodID,0);
+		if (is_array($this->cargo)) {
+			foreach ($this->cargo as $goodID => $amount) {
+				$this->setCargo($goodID, 0);
 			}
 		}
 	}
@@ -323,15 +323,15 @@ 
 		$this->removeAllCargo();
 		$this->removeAllHardware();
 
-		if($isNewbie) {
-			$this->setShields(75,true);
-			$this->setArmour(150,true);
+		if ($isNewbie) {
+			$this->setShields(75, true);
+			$this->setArmour(150, true);
 			$this->setCargoHolds(40);
 			$this->setShipTypeID(SHIP_TYPE_NEWBIE_MERCHANT_VESSEL);
 		}
 		else {
-			$this->setShields(50,true);
-			$this->setArmour(50,true);
+			$this->setShields(50, true);
+			$this->setArmour(50, true);
 			$this->setCargoHolds(5);
 			$this->setShipTypeID(SHIP_TYPE_ESCAPE_POD);
 		}
@@ -349,9 +349,9 @@ 
 
 
 	public function hasActiveIllusion() {
-		if(!$this->hasIllusion())
+		if (!$this->hasIllusion())
 			return false;
-		return $this->getIllusionShip()!==false;
+		return $this->getIllusionShip() !== false;
 
 	}
 
@@ -443,7 +443,7 @@ 
 	}
 
 	public function getCostToUpgrade($upgradeShipID) {
-		$upgadeBaseShip = AbstractSmrShip::getBaseShip(Globals::getGameType($this->getGameID()),$upgradeShipID);
+		$upgadeBaseShip = AbstractSmrShip::getBaseShip(Globals::getGameType($this->getGameID()), $upgradeShipID);
 		return $upgadeBaseShip['Cost'] - floor($this->getCost() * SHIP_REFUND_PERCENT);
 	}
 
@@ -452,11 +452,11 @@ 
 	}
 
 	protected function getCostToUNOAgainstShip($shipID) {
-		$baseShip = AbstractSmrShip::getBaseShip(Globals::getGameType($this->getGameID()),$shipID);
+		$baseShip = AbstractSmrShip::getBaseShip(Globals::getGameType($this->getGameID()), $shipID);
 		$cost = 0;
 		$hardwareTypes = array(HARDWARE_SHIELDS, HARDWARE_ARMOUR, HARDWARE_CARGO);
-		foreach($hardwareTypes as $hardwareTypeID) {
-			$cost += max(0,$baseShip['MaxHardware'][$hardwareTypeID]-$this->getHardware($hardwareTypeID))*Globals::getHardwareCost($hardwareTypeID);
+		foreach ($hardwareTypes as $hardwareTypeID) {
+			$cost += max(0, $baseShip['MaxHardware'][$hardwareTypeID] - $this->getHardware($hardwareTypeID)) * Globals::getHardwareCost($hardwareTypeID);
 		}
 		return $cost;
 	}
@@ -474,41 +474,41 @@ 
 	}
 
 	public function getHardware($hardwareTypeID = false) {
-		if($hardwareTypeID === false)
+		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)
+	public function setHardware($hardwareTypeID, $amount) {
+		if ($this->getHardware($hardwareTypeID) == $amount)
 			return;
 		$this->hardware[$hardwareTypeID] = $amount;
 		$this->hasChangedHardware[$hardwareTypeID] = true;
 	}
 
-	public function increaseHardware($hardwareTypeID,$amount) {
-		$this->setHardware($hardwareTypeID,$this->getHardware($hardwareTypeID)+$amount);
+	public function increaseHardware($hardwareTypeID, $amount) {
+		$this->setHardware($hardwareTypeID, $this->getHardware($hardwareTypeID) + $amount);
 	}
 
 	public function getOldHardware($hardwareTypeID = false) {
-		if($hardwareTypeID === false)
+		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)
+	public function setOldHardware($hardwareTypeID, $amount) {
+		if ($this->getOldHardware($hardwareTypeID) == $amount)
 			return;
 		$this->oldHardware[$hardwareTypeID] = $amount;
 		$this->hasChangedHardware[$hardwareTypeID] = true;
 	}
 
 	public function hasMaxHardware($hardwareTypeID) {
-		return $this->getHardware($hardwareTypeID)==$this->getMaxHardware($hardwareTypeID);
+		return $this->getHardware($hardwareTypeID) == $this->getMaxHardware($hardwareTypeID);
 	}
 
 	public function getMaxHardware($hardwareTypeID = false) {
-		if($hardwareTypeID === false)
+		if ($hardwareTypeID === false)
 			return $this->baseShip['MaxHardware'];
 		return $this->baseShip['MaxHardware'][$hardwareTypeID];
 	}
@@ -517,18 +517,18 @@ 
 		return $this->getHardware(HARDWARE_SHIELDS);
 	}
 
-	public function setShields($amount,$updateOldAmount=false) {
-		if($updateOldAmount && !$this->hasLostShields())
-			$this->setOldHardware(HARDWARE_SHIELDS,$amount);
-		$this->setHardware(HARDWARE_SHIELDS,$amount);
+	public function setShields($amount, $updateOldAmount = false) {
+		if ($updateOldAmount && !$this->hasLostShields())
+			$this->setOldHardware(HARDWARE_SHIELDS, $amount);
+		$this->setHardware(HARDWARE_SHIELDS, $amount);
 	}
 
 	public function decreaseShields($amount) {
-		$this->setShields($this->getShields()-$amount);
+		$this->setShields($this->getShields() - $amount);
 	}
 
 	public function increaseShields($amount) {
-		$this->setShields($this->getShields()+$amount);
+		$this->setShields($this->getShields() + $amount);
 	}
 
 	public function getOldShields() {
@@ -536,19 +536,19 @@ 
 	}
 
 	public function setOldShields($amount) {
-		$this->setOldHardware(HARDWARE_SHIELDS,$amount);
+		$this->setOldHardware(HARDWARE_SHIELDS, $amount);
 	}
 
 	public function hasShields() {
-		return $this->getShields()>0;
+		return $this->getShields() > 0;
 	}
 
 	public function hasLostShields() {
-		return $this->getShields()<$this->getOldShields();
+		return $this->getShields() < $this->getOldShields();
 	}
 
 	public function hasMaxShields() {
-		return $this->getShields()==$this->getMaxShields();
+		return $this->getShields() == $this->getMaxShields();
 	}
 
 	public function getMaxShields() {
@@ -559,18 +559,18 @@ 
 		return $this->getHardware(HARDWARE_ARMOUR);
 	}
 
-	public function setArmour($amount,$updateOldAmount=false) {
-		if($updateOldAmount && !$this->hasLostArmour())
-			$this->setOldHardware(HARDWARE_ARMOUR,$amount);
-		$this->setHardware(HARDWARE_ARMOUR,$amount);
+	public function setArmour($amount, $updateOldAmount = false) {
+		if ($updateOldAmount && !$this->hasLostArmour())
+			$this->setOldHardware(HARDWARE_ARMOUR, $amount);
+		$this->setHardware(HARDWARE_ARMOUR, $amount);
 	}
 
 	public function decreaseArmour($amount) {
-		$this->setArmour($this->getArmour()-$amount);
+		$this->setArmour($this->getArmour() - $amount);
 	}
 
 	public function increaseArmour($amount) {
-		$this->setArmour($this->getArmour()+$amount);
+		$this->setArmour($this->getArmour() + $amount);
 	}
 
 	public function getOldArmour() {
@@ -578,19 +578,19 @@ 
 	}
 
 	public function setOldArmour($amount) {
-		$this->setOldHardware(HARDWARE_ARMOUR,$amount);
+		$this->setOldHardware(HARDWARE_ARMOUR, $amount);
 	}
 
 	public function hasArmour() {
-		return $this->getArmour()>0;
+		return $this->getArmour() > 0;
 	}
 
 	public function hasLostArmour() {
-		return $this->getArmour()<$this->getOldArmour();
+		return $this->getArmour() < $this->getOldArmour();
 	}
 
 	public function hasMaxArmour() {
-		return $this->getArmour()==$this->getMaxArmour();
+		return $this->getArmour() == $this->getMaxArmour();
 	}
 
 	public function getMaxArmour() {
@@ -598,53 +598,53 @@ 
 	}
 
 	public function isDead() {
-		return !$this->hasArmour()&&!$this->hasShields();
+		return !$this->hasArmour() && !$this->hasShields();
 	}
 
 	public function canAcceptCDs() {
-		return $this->getCDs()<$this->getMaxCDs();
+		return $this->getCDs() < $this->getMaxCDs();
 	}
 
 	public function canAcceptSDs() {
-		return $this->getSDs()<$this->getMaxSDs();
+		return $this->getSDs() < $this->getMaxSDs();
 	}
 
 	public function canAcceptMines() {
-		return $this->getMines()<$this->getMaxMines();
+		return $this->getMines() < $this->getMaxMines();
 	}
 
 	public function hasCDs() {
-		return $this->getCDs()>0;
+		return $this->getCDs() > 0;
 	}
 
 	public function hasSDs() {
-		return $this->getSDs()>0;
+		return $this->getSDs() > 0;
 	}
 
 	public function hasMines() {
-		return $this->getMines()>0;
+		return $this->getMines() > 0;
 	}
 
 	public function getCDs() {
 		return $this->getHardware(HARDWARE_COMBAT);
 	}
 
-	public function setCDs($amount,$updateOldAmount=false) {
-		if($updateOldAmount && !$this->hasLostCDs())
-			$this->setOldHardware(HARDWARE_COMBAT,$amount);
-		$this->setHardware(HARDWARE_COMBAT,$amount);
+	public function setCDs($amount, $updateOldAmount = false) {
+		if ($updateOldAmount && !$this->hasLostCDs())
+			$this->setOldHardware(HARDWARE_COMBAT, $amount);
+		$this->setHardware(HARDWARE_COMBAT, $amount);
 	}
 
 	/**
 	 * Decreases the ship CDs. Use $updateOldAmount=true to prevent
 	 * this change from triggering `isUnderAttack`.
 	 */
-	public function decreaseCDs($amount,$updateOldAmount=false) {
-		$this->setCDs($this->getCDs()-$amount,$updateOldAmount);
+	public function decreaseCDs($amount, $updateOldAmount = false) {
+		$this->setCDs($this->getCDs() - $amount, $updateOldAmount);
 	}
 
 	public function increaseCDs($amount) {
-		$this->setCDs($this->getCDs()+$amount);
+		$this->setCDs($this->getCDs() + $amount);
 	}
 
 	public function getOldCDs() {
@@ -652,11 +652,11 @@ 
 	}
 
 	public function setOldCDs($amount) {
-		$this->setOldHardware(HARDWARE_COMBAT,$amount);
+		$this->setOldHardware(HARDWARE_COMBAT, $amount);
 	}
 
 	public function hasLostCDs() {
-		return $this->getCDs()<$this->getOldCDs();
+		return $this->getCDs() < $this->getOldCDs();
 	}
 
 	public function getMaxCDs() {
@@ -668,15 +668,15 @@ 
 	}
 
 	public function setSDs($amount) {
-		$this->setHardware(HARDWARE_SCOUT,$amount);
+		$this->setHardware(HARDWARE_SCOUT, $amount);
 	}
 
 	public function decreaseSDs($amount) {
-		$this->setSDs($this->getSDs()-$amount);
+		$this->setSDs($this->getSDs() - $amount);
 	}
 
 	public function increaseSDs($amount) {
-		$this->setSDs($this->getSDs()+$amount);
+		$this->setSDs($this->getSDs() + $amount);
 	}
 
 	public function getMaxSDs() {
@@ -688,15 +688,15 @@ 
 	}
 
 	public function setMines($amount) {
-		$this->setHardware(HARDWARE_MINE,$amount);
+		$this->setHardware(HARDWARE_MINE, $amount);
 	}
 
 	public function decreaseMines($amount) {
-		$this->setMines($this->getMines()-$amount);
+		$this->setMines($this->getMines() - $amount);
 	}
 
 	public function increaseMines($amount) {
-		$this->setMines($this->getMines()+$amount);
+		$this->setMines($this->getMines() + $amount);
 	}
 
 	public function getMaxMines() {
@@ -708,12 +708,12 @@ 
 	}
 
 	public function setCargoHolds($amount) {
-		$this->setHardware(HARDWARE_CARGO,$amount);
+		$this->setHardware(HARDWARE_CARGO, $amount);
 	}
 
-	public function &getCargo($goodID=false) {
-		if($goodID!==false) {
-			if(isset($this->cargo[$goodID]))
+	public function &getCargo($goodID = false) {
+		if ($goodID !== false) {
+			if (isset($this->cargo[$goodID]))
 				return $this->cargo[$goodID];
 			$cargo = 0;
 			return $cargo;
@@ -721,16 +721,16 @@ 
 		return $this->cargo;
 	}
 
-	public function hasCargo($goodID=false) {
-		if($goodID!==false)
-			return $this->getCargo($goodID)>0;
-		if(is_array($cargo = $this->getCargo()))
-			return array_sum($cargo)>0;
+	public function hasCargo($goodID = false) {
+		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)
+	public function setCargo($goodID, $amount) {
+		if ($this->getCargo($goodID) == $amount)
 			return;
 		$this->cargo[$goodID] = $amount;
 		$this->hasChangedCargo = true;
@@ -739,20 +739,20 @@ 
 		ksort($this->cargo);
 	}
 
-	public function decreaseCargo($goodID,$amount) {
-		if($amount < 0)
+	public function decreaseCargo($goodID, $amount) {
+		if ($amount < 0)
 			throw new Exception('Trying to decrease negative cargo.');
-		$this->setCargo($goodID,$this->getCargo($goodID)-$amount);
+		$this->setCargo($goodID, $this->getCargo($goodID) - $amount);
 	}
 
-	public function increaseCargo($goodID,$amount) {
-		if($amount < 0)
+	public function increaseCargo($goodID, $amount) {
+		if ($amount < 0)
 			throw new Exception('Trying to increase negative cargo.');
-		$this->setCargo($goodID,$this->getCargo($goodID)+$amount);
+		$this->setCargo($goodID, $this->getCargo($goodID) + $amount);
 	}
 
 	public function getEmptyHolds() {
-		return $this->getCargoHolds()-$this->getUsedHolds();
+		return $this->getCargoHolds() - $this->getUsedHolds();
 	}
 
 	public function getUsedHolds() {
@@ -760,7 +760,7 @@ 
 	}
 
 	public function hasMaxCargoHolds() {
-		return $this->getCargoHolds()==$this->getMaxCargoHolds();
+		return $this->getCargoHolds() == $this->getMaxCargoHolds();
 	}
 
 	public function getMaxCargoHolds() {
@@ -777,16 +777,16 @@ 
 		$this->setOldShields($this->getShields());
 		$this->setOldCDs($this->getCDs());
 		$this->setOldArmour($this->getArmour());
-		if(isset($var['UnderAttack']))
+		if (isset($var['UnderAttack']))
 			return $var['UnderAttack'];
-		if($underAttack && !USING_AJAX) {
-			SmrSession::updateVar('UnderAttack',$underAttack); //Remember we are under attack for AJAX
+		if ($underAttack && !USING_AJAX) {
+			SmrSession::updateVar('UnderAttack', $underAttack); //Remember we are under attack for AJAX
 		}
 		return $underAttack;
 	}
 
 	public function hasWeapons() {
-		return $this->getNumWeapons()>0;
+		return $this->getNumWeapons() > 0;
 	}
 
 	public function &getWeapons() {
@@ -802,11 +802,11 @@ 
 	}
 
 	public function getOpenWeaponSlots() {
-		return $this->getHardpoints()-$this->getNumWeapons();
+		return $this->getHardpoints() - $this->getNumWeapons();
 	}
 
 	public function hasOpenWeaponSlots() {
-		return $this->getOpenWeaponSlots()>0;
+		return $this->getOpenWeaponSlots() > 0;
 	}
 
 	public function getHardpoints() {
@@ -816,8 +816,8 @@ 
 	public function getTotalShieldDamage() {
 		$weapons = $this->getWeapons();
 		$shieldDamage = 0;
-		foreach($weapons as $weapon) {
-			$shieldDamage+=$weapon->getShieldDamage();
+		foreach ($weapons as $weapon) {
+			$shieldDamage += $weapon->getShieldDamage();
 		}
 		return $shieldDamage;
 	}
@@ -825,8 +825,8 @@ 
 	public function getTotalArmourDamage() {
 		$weapons = $this->getWeapons();
 		$armourDamage = 0;
-		foreach($weapons as $weapon) {
-			$armourDamage+=$weapon->getArmourDamage();
+		foreach ($weapons as $weapon) {
+			$armourDamage += $weapon->getArmourDamage();
 		}
 		return $armourDamage;
 	}
@@ -846,86 +846,86 @@ 
 	public function &shootPlayers(array $targetPlayers) {
 		$thisPlayer = $this->getPlayer();
 		$results = array('Player' => $thisPlayer, 'TotalDamage' => 0);
-		if($thisPlayer->isDead()) {
+		if ($thisPlayer->isDead()) {
 			$results['DeadBeforeShot'] = true;
 			return $results;
 		}
 		$results['DeadBeforeShot'] = false;
-		foreach($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
-			if($results['Weapons'][$orderID]['Hit'])
+		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($this->hasCDs()) {
-			$thisCDs = new SmrCombatDrones($this->getGameID(),$this->getCDs());
-			$results['Drones'] =& $thisCDs->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
+		if ($this->hasCDs()) {
+			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
+			$results['Drones'] = & $thisCDs->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
-		$thisPlayer->increaseExperience(round($results['TotalDamage']/4)); // 1/4 weapon damage to exp.
-		$thisPlayer->increaseHOF($results['TotalDamage'],array('Combat','Player','Damage Done'), HOF_PUBLIC);
-		$thisPlayer->increaseHOF(1,array('Combat','Player','Shots'), HOF_PUBLIC);
+		$thisPlayer->increaseExperience(round($results['TotalDamage'] / 4)); // 1/4 weapon damage to exp.
+		$thisPlayer->increaseHOF($results['TotalDamage'], array('Combat', 'Player', 'Damage Done'), HOF_PUBLIC);
+		$thisPlayer->increaseHOF(1, array('Combat', 'Player', 'Shots'), HOF_PUBLIC);
 		return $results;
 	}
 
 	public function &shootForces(SmrForce $forces) {
 		$thisPlayer = $this->getPlayer();
 		$results = array('Player' => $thisPlayer, 'TotalDamage' => 0);
-		if($thisPlayer->isDead()) {
+		if ($thisPlayer->isDead()) {
 			$results['DeadBeforeShot'] = true;
 			return $results;
 		}
 		$results['DeadBeforeShot'] = false;
-		foreach($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootForces($thisPlayer, $forces);
-			if($results['Weapons'][$orderID]['Hit']) {
+		foreach ($this->weapons as $orderID => $weapon) {
+			$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);
-				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['Mines'],array('Combat','Forces','Mines','Damage Done'), HOF_PUBLIC);
-				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['NumCDs'],array('Combat','Forces','Combat Drones','Killed'), HOF_PUBLIC);
-				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['CDs'],array('Combat','Forces','Combat Drones','Damage Done'), HOF_PUBLIC);
-				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['NumSDs'],array('Combat','Forces','Scout Drones','Killed'), HOF_PUBLIC);
-				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['SDs'],array('Combat','Forces','Scout Drones','Damage Done'), HOF_PUBLIC);
-				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['NumMines']+$results['Weapons'][$orderID]['ActualDamage']['NumCDs']+$results['Weapons'][$orderID]['ActualDamage']['NumSDs'],array('Combat','Forces','Killed'), HOF_PUBLIC);
+				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['NumMines'], array('Combat', 'Forces', 'Mines', 'Killed'), HOF_PUBLIC);
+				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['Mines'], array('Combat', 'Forces', 'Mines', 'Damage Done'), HOF_PUBLIC);
+				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['NumCDs'], array('Combat', 'Forces', 'Combat Drones', 'Killed'), HOF_PUBLIC);
+				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['CDs'], array('Combat', 'Forces', 'Combat Drones', 'Damage Done'), HOF_PUBLIC);
+				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['NumSDs'], array('Combat', 'Forces', 'Scout Drones', 'Killed'), HOF_PUBLIC);
+				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['SDs'], array('Combat', 'Forces', 'Scout Drones', 'Damage Done'), HOF_PUBLIC);
+				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['NumMines'] + $results['Weapons'][$orderID]['ActualDamage']['NumCDs'] + $results['Weapons'][$orderID]['ActualDamage']['NumSDs'], array('Combat', 'Forces', 'Killed'), HOF_PUBLIC);
 			}
 		}
-		if($this->hasCDs()) {
-			$thisCDs = new SmrCombatDrones($this->getGameID(),$this->getCDs());
-			$results['Drones'] =& $thisCDs->shootForces($thisPlayer, $forces);
+		if ($this->hasCDs()) {
+			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
+			$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);
-			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['NumCDs'],array('Combat','Forces','Combat Drones','Killed'), HOF_PUBLIC);
-			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['CDs'],array('Combat','Forces','Combat Drones','Damage Done'), HOF_PUBLIC);
-			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['NumSDs'],array('Combat','Forces','Scout Drones','Killed'), HOF_PUBLIC);
-			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['SDs'],array('Combat','Forces','Scout Drones','Damage Done'), HOF_PUBLIC);
-			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['NumMines']+$results['Drones']['ActualDamage']['NumCDs']+$results['Drones']['ActualDamage']['NumSDs'],array('Combat','Forces','Killed'), HOF_PUBLIC);
+			$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);
+			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['NumCDs'], array('Combat', 'Forces', 'Combat Drones', 'Killed'), HOF_PUBLIC);
+			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['CDs'], array('Combat', 'Forces', 'Combat Drones', 'Damage Done'), HOF_PUBLIC);
+			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['NumSDs'], array('Combat', 'Forces', 'Scout Drones', 'Killed'), HOF_PUBLIC);
+			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['SDs'], array('Combat', 'Forces', 'Scout Drones', 'Damage Done'), HOF_PUBLIC);
+			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['NumMines'] + $results['Drones']['ActualDamage']['NumCDs'] + $results['Drones']['ActualDamage']['NumSDs'], array('Combat', 'Forces', 'Killed'), HOF_PUBLIC);
 		}
-		$thisPlayer->increaseExperience(round($results['TotalDamage']/20)); // 1/20 weapon damage to exp.
-		$thisPlayer->increaseHOF($results['TotalDamage'],array('Combat','Forces','Damage Done'), HOF_PUBLIC);
-		$thisPlayer->increaseHOF(1,array('Combat','Forces','Shots'), HOF_PUBLIC);
+		$thisPlayer->increaseExperience(round($results['TotalDamage'] / 20)); // 1/20 weapon damage to exp.
+		$thisPlayer->increaseHOF($results['TotalDamage'], array('Combat', 'Forces', 'Damage Done'), HOF_PUBLIC);
+		$thisPlayer->increaseHOF(1, array('Combat', 'Forces', 'Shots'), HOF_PUBLIC);
 		return $results;
 	}
 
 	public function &shootPort(SmrPort $port) {
 		$thisPlayer = $this->getPlayer();
 		$results = array('Player' => $thisPlayer, 'TotalDamage' => 0);
-		if($thisPlayer->isDead()) {
+		if ($thisPlayer->isDead()) {
 			$results['DeadBeforeShot'] = true;
 			return $results;
 		}
 		$results['DeadBeforeShot'] = false;
-		foreach($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPort($thisPlayer, $port);
-			if($results['Weapons'][$orderID]['Hit'])
+		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($this->hasCDs()) {
-			$thisCDs = new SmrCombatDrones($this->getGameID(),$this->getCDs());
-			$results['Drones'] =& $thisCDs->shootPort($thisPlayer, $port);
+		if ($this->hasCDs()) {
+			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
+			$results['Drones'] = & $thisCDs->shootPort($thisPlayer, $port);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
-		$thisPlayer->increaseExperience(round($results['TotalDamage']/20)); // 1/20 weapon damage to exp.
-		$thisPlayer->increaseHOF($results['TotalDamage'],array('Combat','Port','Damage Done'), HOF_PUBLIC);
+		$thisPlayer->increaseExperience(round($results['TotalDamage'] / 20)); // 1/20 weapon damage to exp.
+		$thisPlayer->increaseHOF($results['TotalDamage'], array('Combat', 'Port', 'Damage Done'), HOF_PUBLIC);
 //		$thisPlayer->increaseHOF(1,array('Combat','Port','Shots')); //in SmrPortt::attackedBy()
 
 		// Change alignment if we reach a damage threshold.
@@ -934,10 +934,10 @@ 
 			$relations = Globals::getRaceRelations($thisPlayer->getGameID(), $thisPlayer->getRaceID());
 			if ($relations[$port->getRaceID()] <= RELATIONS_WAR) {
 				$thisPlayer->increaseAlignment(1);
-				$thisPlayer->increaseHOF(1, array('Combat','Port','Alignment','Gain'), HOF_PUBLIC);
+				$thisPlayer->increaseHOF(1, array('Combat', 'Port', 'Alignment', 'Gain'), HOF_PUBLIC);
 			} else {
 				$thisPlayer->decreaseAlignment(1);
-				$thisPlayer->increaseHOF(1, array('Combat','Port','Alignment','Loss'), HOF_PUBLIC);
+				$thisPlayer->increaseHOF(1, array('Combat', 'Port', 'Alignment', 'Loss'), HOF_PUBLIC);
 			}
 		}
 		return $results;
@@ -946,23 +946,23 @@ 
 	public function &shootPlanet(SmrPlanet $planet, $delayed) {
 		$thisPlayer = $this->getPlayer();
 		$results = array('Player' => $thisPlayer, 'TotalDamage' => 0);
-		if($thisPlayer->isDead()) {
+		if ($thisPlayer->isDead()) {
 			$results['DeadBeforeShot'] = true;
 			return $results;
 		}
 		$results['DeadBeforeShot'] = false;
-		foreach($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPlanet($thisPlayer, $planet, $delayed);
-			if($results['Weapons'][$orderID]['Hit'])
+		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($this->hasCDs()) {
-			$thisCDs = new SmrCombatDrones($this->getGameID(),$this->getCDs());
-			$results['Drones'] =& $thisCDs->shootPlanet($thisPlayer, $planet, $delayed);
+		if ($this->hasCDs()) {
+			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
+			$results['Drones'] = & $thisCDs->shootPlanet($thisPlayer, $planet, $delayed);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
-		$thisPlayer->increaseExperience(round($results['TotalDamage']/20)); // 1/20 weapon damage to exp.
-		$thisPlayer->increaseHOF($results['TotalDamage'],array('Combat','Planet','Damage Done'), HOF_PUBLIC);
+		$thisPlayer->increaseExperience(round($results['TotalDamage'] / 20)); // 1/20 weapon damage to exp.
+		$thisPlayer->increaseHOF($results['TotalDamage'], array('Combat', 'Planet', 'Damage Done'), HOF_PUBLIC);
 //		$thisPlayer->increaseHOF(1,array('Combat','Planet','Shots')); //in SmrPlanet::attackedBy()
 		return $results;
 	}
@@ -972,15 +972,15 @@ 
 		$armourDamage = 0;
 		$cdDamage = 0;
 		$shieldDamage = 0;
-		if(!$alreadyDead) {
-			$shieldDamage = $this->doShieldDamage(min($damage['MaxDamage'],$damage['Shield']));
+		if (!$alreadyDead) {
+			$shieldDamage = $this->doShieldDamage(min($damage['MaxDamage'], $damage['Shield']));
 			$damage['MaxDamage'] -= $shieldDamage;
-			if(!$this->hasShields() && ($shieldDamage == 0 || $damage['Rollover'])) {
-				$cdDamage = $this->doCDDamage(min($damage['MaxDamage'],$damage['Armour']));
+			if (!$this->hasShields() && ($shieldDamage == 0 || $damage['Rollover'])) {
+				$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(
@@ -988,10 +988,10 @@ 
 						'TargetAlreadyDead' => $alreadyDead,
 						'Shield' => $shieldDamage,
 						'CDs' => $cdDamage,
-						'NumCDs' => $cdDamage/CD_ARMOUR,
+						'NumCDs' => $cdDamage / CD_ARMOUR,
 						'Armour' => $armourDamage,
 						'HasCDs' => $this->hasCDs(),
-						'TotalDamage' => $shieldDamage+$cdDamage+$armourDamage
+						'TotalDamage' => $shieldDamage + $cdDamage + $armourDamage
 		);
 		return $return;
 	}
@@ -1001,11 +1001,11 @@ 
 		$armourDamage = 0;
 		$cdDamage = 0;
 		$shieldDamage = 0;
-		if(!$alreadyDead) {
-			$shieldDamage = $this->doShieldDamage(min($damage['MaxDamage'],$damage['Shield']));
+		if (!$alreadyDead) {
+			$shieldDamage = $this->doShieldDamage(min($damage['MaxDamage'], $damage['Shield']));
 			$damage['MaxDamage'] -= $shieldDamage;
-			if(!$this->hasShields() && ($shieldDamage == 0 || $damage['Rollover'])) { //skip CDs if it's mines
-				$armourDamage = $this->doArmourDamage(min($damage['MaxDamage'],$damage['Armour']));
+			if (!$this->hasShields() && ($shieldDamage == 0 || $damage['Rollover'])) { //skip CDs if it's mines
+				$armourDamage = $this->doArmourDamage(min($damage['MaxDamage'], $damage['Armour']));
 			}
 		}
 		$return = array(
@@ -1013,28 +1013,28 @@ 
 						'TargetAlreadyDead' => $alreadyDead,
 						'Shield' => $shieldDamage,
 						'CDs' => $cdDamage,
-						'NumCDs' => $cdDamage/CD_ARMOUR,
+						'NumCDs' => $cdDamage / CD_ARMOUR,
 						'Armour' => $armourDamage,
 						'HasCDs' => $this->hasCDs(),
-						'TotalDamage' => $shieldDamage+$cdDamage+$armourDamage
+						'TotalDamage' => $shieldDamage + $cdDamage + $armourDamage
 		);
 		return $return;
 	}
 
 	protected function doShieldDamage($damage) {
-		$actualDamage = min($this->getShields(),$damage);
+		$actualDamage = min($this->getShields(), $damage);
 		$this->decreaseShields($actualDamage);
 		return $actualDamage;
 	}
 
 	protected function doCDDamage($damage) {
-		$actualDamage = min($this->getCDs(),floor($damage/CD_ARMOUR));
+		$actualDamage = min($this->getCDs(), floor($damage / CD_ARMOUR));
 		$this->decreaseCDs($actualDamage);
-		return $actualDamage*CD_ARMOUR;
+		return $actualDamage * CD_ARMOUR;
 	}
 
 	protected function doArmourDamage($damage) {
-		$actualDamage = min($this->getArmour(),$damage);
+		$actualDamage = min($this->getArmour(), $damage);
 		$this->decreaseArmour($actualDamage);
 		return $actualDamage;
 	}
@@ -1046,17 +1046,17 @@ 
 							(
 								$this->getShields()
 								+$this->getArmour()
-								+$this->getCDs()*3
-							)/25
+								+$this->getCDs() * 3
+							) / 25
 							+(
-								$this->getCargoHolds()/100
-								-$this->getSpeed()*5
-								+($this->getHardpoints()/*+$ship['Increases']['Ship Power']*/)*5
+								$this->getCargoHolds() / 100
+								-$this->getSpeed() * 5
+								+($this->getHardpoints()/*+$ship['Increases']['Ship Power']*/) * 5
 								/*+(
 									$ship['Increases']['Mines']
 									+$ship['Increases']['Scout Drones']
 								)/12*/
-								+$this->getCDs()/5
+								+$this->getCDs() / 5
 							)
 						)
 					);

Braces +84 added lines, -62 removed lines

@@ -28,10 +28,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];
 	}
@@ -157,19 +158,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;
 	}
 
@@ -190,17 +193,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() {
@@ -250,8 +255,7 @@ 
 				$this->weapons[$i-1] =& $this->weapons[$i]; //If we go above the bounds of the array it will keep on going due to assign by ref. Hence $i-1 =& $i not $i =& $i+1
 			}
 			$this->weapons[count($this->weapons)-1] =& $temp;
-		}
-		else {
+		} else {
 			$temp = $this->weapons[$replacement];
 			$this->weapons[$replacement] = $this->weapons[$orderID];
 			$this->weapons[$orderID] = $temp;
@@ -268,8 +272,7 @@ 
 				$this->weapons[$i] =& $this->weapons[$i-1];
 			}
 			$this->weapons[0] =& $temp;
-		}
-		else {
+		} else {
 			$temp = $this->weapons[$replacement];
 			$this->weapons[$replacement] = $this->weapons[$orderID];
 			$this->weapons[$orderID] = $temp;
@@ -328,8 +331,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);
@@ -349,8 +351,9 @@ 
 
 
 	public function hasActiveIllusion() {
-		if(!$this->hasIllusion())
-			return false;
+		if(!$this->hasIllusion()) {
+					return false;
+		}
 		return $this->getIllusionShip()!==false;
 
 	}
@@ -474,14 +477,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;
 	}
@@ -491,14 +496,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;
 	}
@@ -508,8 +515,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];
 	}
 
@@ -518,8 +526,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);
 	}
 
@@ -560,8 +569,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);
 	}
 
@@ -630,8 +640,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);
 	}
 
@@ -713,8 +724,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;
 		}
@@ -722,16 +734,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
@@ -740,14 +755,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);
 	}
 
@@ -777,8 +794,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
 		}
@@ -853,8 +871,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());
@@ -916,8 +935,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());
@@ -953,8 +973,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());
@@ -979,8 +1000,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(