smrealms / smr

lib/Default/AbstractSmrPlayer.class.inc

Spacing +240 added lines, -240 removed lines

@@ -50,9 +50,9 @@ 
 	protected $HOF;
 	protected static $HOFVis;
 
-	protected $hasChanged=false;
-	protected $hasHOFChanged=false;
-	protected static $hasHOFVisChanged=array();
+	protected $hasChanged = false;
+	protected $hasHOFChanged = false;
+	protected static $hasHOFVisChanged = array();
 	protected $hasBountyChanged = array();
 
 	protected function __construct() {
@@ -75,13 +75,13 @@ 
 	}
 
 	public function hasNewbieTurns() {
-		return $this->getNewbieTurns()>0;
+		return $this->getNewbieTurns() > 0;
 	}
 	public function setNewbieTurns($newbieTurns) {
-		if($this->newbieTurns == $newbieTurns)
+		if ($this->newbieTurns == $newbieTurns)
 			return;
-		$this->newbieTurns=$newbieTurns;
-		$this->hasChanged=true;
+		$this->newbieTurns = $newbieTurns;
+		$this->hasChanged = true;
 	}
 
 	public function getShipTypeID() {
@@ -89,10 +89,10 @@ 
 	}
 
 	public function setShipTypeID($shipID) {
-		if($this->shipID == $shipID)
+		if ($this->shipID == $shipID)
 			return;
-		$this->shipID=$shipID;
-		$this->hasChanged=true;
+		$this->shipID = $shipID;
+		$this->hasChanged = true;
 	}
 
 	/**
@@ -109,11 +109,11 @@ 
 	}
 
 	public function &getSectorPlanet() {
-		return SmrPlanet::getPlanet($this->getGameID(),$this->getSectorID());
+		return SmrPlanet::getPlanet($this->getGameID(), $this->getSectorID());
 	}
 
 	public function &getSectorPort() {
-		return SmrPort::getPort($this->getGameID(),$this->getSectorID());
+		return SmrPort::getPort($this->getGameID(), $this->getSectorID());
 	}
 
 	public function getSectorID() {
@@ -121,15 +121,15 @@ 
 	}
 
 	public function &getSector() {
-		return SmrSector::getSector($this->getGameID(),$this->getSectorID());
+		return SmrSector::getSector($this->getGameID(), $this->getSectorID());
 	}
 
 	public function setSectorID($sectorID) {
 		$this->lastSectorID = $this->getSectorID();
-		$this->actionTaken('LeaveSector',array('Sector'=>$this->getSector()));
+		$this->actionTaken('LeaveSector', array('Sector'=>$this->getSector()));
 		$this->sectorID = $sectorID;
-		$this->actionTaken('EnterSector',array('Sector'=>$this->getSector()));
-		$this->hasChanged=true;
+		$this->actionTaken('EnterSector', array('Sector'=>$this->getSector()));
+		$this->hasChanged = true;
 	}
 
 	public function getLastSectorID() {
@@ -164,7 +164,7 @@ 
 	}
 
 	public function isDraftLeader() {
-		if(!isset($this->draftLeader)) {
+		if (!isset($this->draftLeader)) {
 			$this->draftLeader = false;
 			$this->db->query('SELECT 1 FROM draft_leaders WHERE ' . $this->SQL . ' LIMIT 1');
 			if ($this->db->nextRecord()) {
@@ -175,7 +175,7 @@ 
 	}
 
 	public function getGPWriter() {
-		if(!isset($this->gpWriter)) {
+		if (!isset($this->gpWriter)) {
 			$this->gpWriter = false;
 			$this->db->query('SELECT position FROM galactic_post_writer WHERE ' . $this->SQL);
 			if ($this->db->nextRecord()) {
@@ -200,7 +200,7 @@ 
 	}
 
 	public function hasFederalProtection() {
-		$sector = SmrSector::getSector($this->getGameID(),$this->getSectorID());
+		$sector = SmrSector::getSector($this->getGameID(), $this->getSectorID());
 		if (!$sector->offersFederalProtection()) {
 			return false;
 		}
@@ -210,8 +210,8 @@ 
 			return false;
 
 		if ($ship->getAttackRating() <= $this->getSafeAttackRating()) {
-			foreach($sector->getFedRaceIDs() as $fedRaceID) {
-				if($this->canBeProtectedByRace($fedRaceID)) {
+			foreach ($sector->getFedRaceIDs() as $fedRaceID) {
+				if ($this->canBeProtectedByRace($fedRaceID)) {
 					return true;
 				}
 			}
@@ -221,15 +221,15 @@ 
 	}
 
 	public function canBeProtectedByRace($raceID) {
-		if(!isset($this->canFed)) {
+		if (!isset($this->canFed)) {
 			$this->canFed = array();
 			$RACES = Globals::getRaces();
-			foreach($RACES as $raceID2 => $raceName) {
+			foreach ($RACES as $raceID2 => $raceName) {
 				$this->canFed[$raceID2] = $this->getRelation($raceID2) >= ALIGN_FED_PROTECTION;
 			}
 			$this->db->query('SELECT race_id, allowed FROM player_can_fed
 								WHERE ' . $this->SQL . ' AND expiry > ' . $this->db->escapeNumber(TIME));
-			while($this->db->nextRecord()) {
+			while ($this->db->nextRecord()) {
 				$this->canFed[$this->db->getInt('race_id')] = $this->db->getBoolean('allowed');
 			}
 		}
@@ -248,10 +248,10 @@ 
 	}
 
 	public function setDead($bool) {
-		if($this->dead == $bool)
+		if ($this->dead == $bool)
 			return;
-		$this->dead=$bool;
-		$this->hasChanged=true;
+		$this->dead = $bool;
+		$this->hasChanged = true;
 	}
 
 	public function getKills() {
@@ -259,16 +259,16 @@ 
 	}
 
 	public function increaseKills($kills) {
-		if($kills < 0)
+		if ($kills < 0)
 			throw new Exception('Trying to increase negative kills.');
-		$this->setKills($this->kills+$kills);
+		$this->setKills($this->kills + $kills);
 	}
 
 	public function setKills($kills) {
-		if($this->kills == $kills)
+		if ($this->kills == $kills)
 			return;
-		$this->kills=$kills;
-		$this->hasChanged=true;
+		$this->kills = $kills;
+		$this->hasChanged = true;
 	}
 
 	public function getDeaths() {
@@ -276,16 +276,16 @@ 
 	}
 
 	public function increaseDeaths($deaths) {
-		if($deaths < 0)
+		if ($deaths < 0)
 			throw new Exception('Trying to increase negative deaths.');
-		$this->setDeaths($this->getDeaths()+$deaths);
+		$this->setDeaths($this->getDeaths() + $deaths);
 	}
 
 	public function setDeaths($deaths) {
-		if($this->deaths == $deaths)
+		if ($this->deaths == $deaths)
 			return;
 		$this->deaths = $deaths;
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 	}
 
 	public function getAssists() {
@@ -305,26 +305,26 @@ 
 	}
 
 	public function increaseAlignment($align) {
-		if($align < 0)
+		if ($align < 0)
 			throw new Exception('Trying to increase negative align.');
-		if($align == 0)
+		if ($align == 0)
 			return;
 		$align += $this->alignment;
 		$this->setAlignment($align);
 	}
 	public function decreaseAlignment($align) {
-		if($align < 0)
+		if ($align < 0)
 			throw new Exception('Trying to decrease negative align.');
-		if($align == 0)
+		if ($align == 0)
 			return;
 		$align = $this->alignment - $align;
 		$this->setAlignment($align);
 	}
 	public function setAlignment($align) {
-		if($this->alignment == $align)
+		if ($this->alignment == $align)
 			return;
 		$this->alignment = $align;
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 	}
 
 	public function getCredits() {
@@ -336,9 +336,9 @@ 
 	}
 
 	public function getNextLevelPercentAcquired() {
-		if($this->getNextLevelExperience() == $this->getThisLevelExperience())
+		if ($this->getNextLevelExperience() == $this->getThisLevelExperience())
 			return 100;
-		return max(0,min(100,round(($this->getExperience() - $this->getThisLevelExperience()) / ($this->getNextLevelExperience() - $this->getThisLevelExperience())*100)));
+		return max(0, min(100, round(($this->getExperience() - $this->getThisLevelExperience()) / ($this->getNextLevelExperience() - $this->getThisLevelExperience()) * 100)));
 	}
 
 	public function getNextLevelPercentRemaining() {
@@ -347,9 +347,9 @@ 
 
 	public function getNextLevelExperience() {
 		$LEVELS_REQUIREMENTS = Globals::getLevelRequirements();
-		if(!isset($LEVELS_REQUIREMENTS[$this->getLevelID()+1]))
+		if (!isset($LEVELS_REQUIREMENTS[$this->getLevelID() + 1]))
 			return $this->getThisLevelExperience(); //Return current level experience if on last level.
-		return $LEVELS_REQUIREMENTS[$this->getLevelID()+1]['Requirement'];
+		return $LEVELS_REQUIREMENTS[$this->getLevelID() + 1]['Requirement'];
 	}
 
 	public function getThisLevelExperience() {
@@ -358,14 +358,14 @@ 
 	}
 
 	public function setExperience($experience) {
-		if($this->experience == $experience)
+		if ($this->experience == $experience)
 			return;
-		if($experience<MIN_EXPERIENCE)
+		if ($experience < MIN_EXPERIENCE)
 			$experience = MIN_EXPERIENCE;
-		if($experience>MAX_EXPERIENCE)
+		if ($experience > MAX_EXPERIENCE)
 			$experience = MAX_EXPERIENCE;
 		$this->experience = $experience;
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 
 		// Since exp has changed, invalidate the player level so that it can
 		// be recomputed next time it is queried (in case it has changed).
@@ -373,49 +373,49 @@ 
 	}
 
 	public function increaseCredits($credits) {
-		if($credits < 0)
+		if ($credits < 0)
 			throw new Exception('Trying to increase negative credits.');
-		if($credits == 0)
+		if ($credits == 0)
 			return;
 		$credits += $this->credits;
 		$this->setCredits($credits);
 	}
 	public function decreaseCredits($credits) {
-		if($credits < 0)
+		if ($credits < 0)
 			throw new Exception('Trying to decrease negative credits.');
-		if($credits == 0)
+		if ($credits == 0)
 			return;
 		$credits = $this->credits - $credits;
 		$this->setCredits($credits);
 	}
 	public function setCredits($credits) {
-		if($this->credits == $credits)
+		if ($this->credits == $credits)
 			return;
-		if($credits < 0)
+		if ($credits < 0)
 			throw new Exception('Trying to set negative credits.');
-		if($credits > MAX_MONEY)
+		if ($credits > MAX_MONEY)
 			$credits = MAX_MONEY;
 		$this->credits = $credits;
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 	}
 
 	public function increaseExperience($experience) {
-		if($experience < 0)
+		if ($experience < 0)
 			throw new Exception('Trying to increase negative experience.');
-		if($experience == 0)
+		if ($experience == 0)
 			return;
 		$newExperience = $this->experience + $experience;
 		$this->setExperience($newExperience);
-		$this->increaseHOF($experience,array('Experience','Total','Gain'), HOF_PUBLIC);
+		$this->increaseHOF($experience, array('Experience', 'Total', 'Gain'), HOF_PUBLIC);
 	}
 	public function decreaseExperience($experience) {
-		if($experience < 0)
+		if ($experience < 0)
 			throw new Exception('Trying to decrease negative experience.');
-		if($experience == 0)
+		if ($experience == 0)
 			return;
 		$newExperience = $this->experience - $experience;
 		$this->setExperience($newExperience);
-		$this->decreaseHOF($experience,array('Experience','Total','Loss'), HOF_PUBLIC);
+		$this->decreaseHOF($experience, array('Experience', 'Total', 'Loss'), HOF_PUBLIC);
 	}
 
 	public function isLandedOnPlanet() {
@@ -423,10 +423,10 @@ 
 	}
 
 	public function setLandedOnPlanet($bool) {
-		if($this->landedOnPlanet == $bool)
+		if ($this->landedOnPlanet == $bool)
 			return;
-		$this->landedOnPlanet=$bool;
-		$this->hasChanged=true;
+		$this->landedOnPlanet = $bool;
+		$this->hasChanged = true;
 	}
 
 	/**
@@ -472,24 +472,24 @@ 
 		$this->hasChanged = true;
 	}
 
-	public function getDisplayName($includeAlliance=false) {
-		$return = get_colored_text($this->getAlignment(),$this->playerName.' ('.$this->getPlayerID().')');
-		if($this->isNPC()) {
+	public function getDisplayName($includeAlliance = false) {
+		$return = get_colored_text($this->getAlignment(), $this->playerName . ' (' . $this->getPlayerID() . ')');
+		if ($this->isNPC()) {
 			$return .= ' <span class="npcColour">[NPC]</span>';
 		}
-		if($includeAlliance) {
-			$return.= ' (' . $this->getAllianceName() . '</a>' . ')';
+		if ($includeAlliance) {
+			$return .= ' (' . $this->getAllianceName() . '</a>' . ')';
 		}
 		return $return;
 	}
 
 	public function getBBLink() {
-			return '[player='.$this->getPlayerID().']';
+			return '[player=' . $this->getPlayerID() . ']';
 	}
 
-	public function getLinkedDisplayName($includeAlliance=true) {
-		$return = '<a href="'.$this->getTraderSearchHREF().'">'.$this->getDisplayName().'</a>';
-		if($includeAlliance) {
+	public function getLinkedDisplayName($includeAlliance = true) {
+		$return = '<a href="' . $this->getTraderSearchHREF() . '">' . $this->getDisplayName() . '</a>';
+		if ($includeAlliance) {
 			$return .= ' (' . $this->getAllianceName(true) . ')';
 		}
 		return $return;
@@ -505,7 +505,7 @@ 
 
 	public static function getColouredRaceNameOrDefault($otherRaceID, AbstractSmrPlayer $player = null, $linked = false) {
 		$relations = 0;
-		if($player !== null) {
+		if ($player !== null) {
 			$relations = $player->getRelation($otherRaceID);
 		}
 		return Globals::getColouredRaceName($otherRaceID, $relations, $linked);
@@ -516,10 +516,10 @@ 
 	}
 
 	public function setRaceID($raceID) {
-		if($this->raceID == $raceID)
+		if ($this->raceID == $raceID)
 			return;
-		$this->raceID=$raceID;
-		$this->hasChanged=true;
+		$this->raceID = $raceID;
+		$this->hasChanged = true;
 	}
 
 	public function isAllianceLeader($forceUpdate = false) {
@@ -535,27 +535,27 @@ 
 	}
 
 	public function hasAlliance() {
-		return $this->getAllianceID()!=0;
+		return $this->getAllianceID() != 0;
 	}
 
 	public function setAllianceID($ID) {
-		if($this->allianceID == $ID)
+		if ($this->allianceID == $ID)
 			return;
-		$this->allianceID=$ID;
+		$this->allianceID = $ID;
 		if ($this->allianceID != 0) {
 			$status = $this->hasNewbieStatus() ? 'NEWBIE' : 'VETERAN';
 			$this->db->query('INSERT IGNORE INTO player_joined_alliance (account_id,game_id,alliance_id,status) ' .
-				'VALUES ('.$this->db->escapeNumber($this->getAccountID()).','.$this->db->escapeNumber($this->getGameID()).','.$this->db->escapeNumber($this->getAllianceID()).','.$this->db->escapeString($status).')');
+				'VALUES (' . $this->db->escapeNumber($this->getAccountID()) . ',' . $this->db->escapeNumber($this->getGameID()) . ',' . $this->db->escapeNumber($this->getAllianceID()) . ',' . $this->db->escapeString($status) . ')');
 		}
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 	}
 
 	public function getAllianceBBLink() {
-		return $this->hasAlliance()?'[alliance='.$this->getAllianceID().']':$this->getAllianceName();
+		return $this->hasAlliance() ? '[alliance=' . $this->getAllianceID() . ']' : $this->getAllianceName();
 	}
 
-	public function getAllianceName($linked=false, $includeAllianceID=false) {
-		if($this->hasAlliance()) {
+	public function getAllianceName($linked = false, $includeAllianceID = false) {
+		if ($this->hasAlliance()) {
 			return $this->getAlliance()->getAllianceName($linked, $includeAllianceID);
 		}
 		else {
@@ -567,7 +567,7 @@ 
 		if ($allianceID === false) {
 			$allianceID = $this->getAllianceID();
 		}
-		if(!isset($this->allianceRoles[$allianceID])) {
+		if (!isset($this->allianceRoles[$allianceID])) {
 			$this->allianceRoles[$allianceID] = 0;
 			$this->db->query('SELECT role_id
 						FROM player_has_alliance_role
@@ -590,10 +590,10 @@ 
 	}
 
 	public function setCombatDronesKamikazeOnMines($bool) {
-		if($this->combatDronesKamikazeOnMines == $bool)
+		if ($this->combatDronesKamikazeOnMines == $bool)
 			return;
 		$this->combatDronesKamikazeOnMines = $bool;
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 	}
 
 	protected abstract function getGadgetsData();
@@ -603,19 +603,19 @@ 
 	}
 
 	public function getGadget($gadgetID) {
-		if(!is_numeric($gadgetID)) {
+		if (!is_numeric($gadgetID)) {
 			global $GADGETS;
 			$gadgetID = $GADGETS[$gadgetID]['ID'];
 		}
 		$gadgets = $this->getGadgets();
-		if(isset($gadgets[$gadgetID]))
+		if (isset($gadgets[$gadgetID]))
 			return $gadgets[$gadgetID];
 		return false;
 	}
 
 	public function isGadgetEquipped($gadgetID) {
 		$gadget = $this->getGadget($gadgetID);
-		if($gadget===false)
+		if ($gadget === false)
 			return false;
 		return $gadget['Equipped'] > 0 && $gadget['Equipped'] < TIME && ($gadget['Expires'] == 0 || $gadget['Expires'] > TIME) && $gadget['Cooldown'] <= TIME;
 	}
@@ -636,10 +636,10 @@ 
 	}
 
 	public function getRelations() {
-		if(!isset($this->relations)) {
+		if (!isset($this->relations)) {
 			//get relations
 			$RACES = Globals::getRaces();
-			$raceRelations = Globals::getRaceRelations($this->getGameID(),$this->getRaceID());
+			$raceRelations = Globals::getRaceRelations($this->getGameID(), $this->getRaceID());
 			$pureRels = $this->getPureRelations(); // make sure they're initialised.
 			$this->relations = array();
 			foreach ($RACES as $raceID => $raceName) {
@@ -684,26 +684,26 @@ 
 	}
 
 	public function hasMilitaryPayment() {
-		return $this->getMilitaryPayment()>0;
+		return $this->getMilitaryPayment() > 0;
 	}
 
 	public function setMilitaryPayment($amount) {
-		if($this->militaryPayment == $amount)
+		if ($this->militaryPayment == $amount)
 			return;
 		$this->militaryPayment = $amount;
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 	}
 
 	public function increaseMilitaryPayment($amount) {
-		if($amount < 0)
+		if ($amount < 0)
 			throw new Exception('Trying to increase negative military payment.');
-		$this->setMilitaryPayment($this->getMilitaryPayment()+$amount);
+		$this->setMilitaryPayment($this->getMilitaryPayment() + $amount);
 	}
 
 	public function decreaseMilitaryPayment($amount) {
-		if($amount < 0)
+		if ($amount < 0)
 			throw new Exception('Trying to decrease negative military payment.');
-		$this->setMilitaryPayment($this->getMilitaryPayment()-$amount);
+		$this->setMilitaryPayment($this->getMilitaryPayment() - $amount);
 	}
 
 	abstract protected function getBountiesData();
@@ -714,7 +714,7 @@ 
 	}
 
 	public function hasBounties() {
-		return count($this->getBounties())>0;
+		return count($this->getBounties()) > 0;
 	}
 
 	public function getBounty($bountyID) {
@@ -723,7 +723,7 @@ 
 	}
 
 	public function hasBounty($bountyID) {
-		return $this->getBounty($bountyID)!==false;
+		return $this->getBounty($bountyID) !== false;
 	}
 
 	public function getBountyAmount($bountyID) {
@@ -744,15 +744,15 @@ 
 
 	public function getNextBountyID() {
 		$keys = array_keys($this->getBounties());
-		if(count($keys)>0)
-			return max($keys)+1;
+		if (count($keys) > 0)
+			return max($keys) + 1;
 		else
 			return 0;
 	}
 
 	public function setBounty(array $bounty) {
 		$this->bounties[$bounty['ID']] = $bounty;
-		$this->hasBountyChanged[$bounty['ID']]=true;
+		$this->hasBountyChanged[$bounty['ID']] = true;
 	}
 
 	public function setBountyAmount($bountyID, $amount) {
@@ -761,22 +761,22 @@ 
 		$this->setBounty($bounty);
 	}
 
-	public function increaseBountyAmount($bountyID,$amount) {
-		if($amount < 0)
+	public function increaseBountyAmount($bountyID, $amount) {
+		if ($amount < 0)
 			throw new Exception('Trying to increase negative bounty.');
-		$this->setBountyAmount($this->getBountyAmount($bountyID)+$amount);
+		$this->setBountyAmount($this->getBountyAmount($bountyID) + $amount);
 	}
 
-	public function decreaseBountyAmount($bountyID,$amount) {
-		if($amount < 0)
+	public function decreaseBountyAmount($bountyID, $amount) {
+		if ($amount < 0)
 			throw new Exception('Trying to decrease negative bounty.');
-		$this->setBountyAmount($this->getBountyAmount($bountyID)+$amount);
+		$this->setBountyAmount($this->getBountyAmount($bountyID) + $amount);
 	}
 
 	public function getCurrentBounty($type) {
 		$bounties = $this->getBounties();
-		foreach($bounties as $bounty) {
-			if($bounty['Claimer'] == 0 && $bounty['Type']==$type)
+		foreach ($bounties as $bounty) {
+			if ($bounty['Claimer'] == 0 && $bounty['Type'] == $type)
 				return $bounty;
 		}
 		return $this->createBounty($type);
@@ -784,8 +784,8 @@ 
 
 	public function hasCurrentBounty($type) {
 		$bounties = $this->getBounties();
-		foreach($bounties as $bounty) {
-			if($bounty['Claimer'] == 0 && $bounty['Type']==$type)
+		foreach ($bounties as $bounty) {
+			if ($bounty['Claimer'] == 0 && $bounty['Type'] == $type)
 				return true;
 		}
 		return false;
@@ -798,22 +798,22 @@ 
 
 	public function setCurrentBountyAmount($type, $amount) {
 		$bounty = $this->getCurrentBounty($type);
-		if($bounty['Amount'] == $amount)
+		if ($bounty['Amount'] == $amount)
 			return;
 		$bounty['Amount'] = $amount;
 		$this->setBounty($bounty);
 	}
 
-	public function increaseCurrentBountyAmount($type,$amount) {
-		if($amount < 0)
+	public function increaseCurrentBountyAmount($type, $amount) {
+		if ($amount < 0)
 			throw new Exception('Trying to increase negative current bounty.');
-		$this->setCurrentBountyAmount($type,$this->getCurrentBountyAmount($type)+$amount);
+		$this->setCurrentBountyAmount($type, $this->getCurrentBountyAmount($type) + $amount);
 	}
 
-	public function decreaseCurrentBountyAmount($type,$amount) {
-		if($amount < 0)
+	public function decreaseCurrentBountyAmount($type, $amount) {
+		if ($amount < 0)
 			throw new Exception('Trying to decrease negative current bounty.');
-		$this->setCurrentBountyAmount($type,$this->getCurrentBountyAmount($type)-$amount);
+		$this->setCurrentBountyAmount($type, $this->getCurrentBountyAmount($type) - $amount);
 	}
 
 	public function getCurrentBountySmrCredits($type) {
@@ -823,29 +823,29 @@ 
 
 	public function setCurrentBountySmrCredits($type, $credits) {
 		$bounty = $this->getCurrentBounty($type);
-		if($bounty['SmrCredits'] == $credits)
+		if ($bounty['SmrCredits'] == $credits)
 			return;
 		$bounty['SmrCredits'] = $credits;
 		$this->setBounty($bounty);
 	}
 
-	public function increaseCurrentBountySmrCredits($type,$credits) {
-		if($credits<0)
+	public function increaseCurrentBountySmrCredits($type, $credits) {
+		if ($credits < 0)
 			throw new Exception('Trying to increase negative current bounty.');
-		$this->setCurrentBountySmrCredits($type,$this->getCurrentBountySmrCredits($type)+$credits);
+		$this->setCurrentBountySmrCredits($type, $this->getCurrentBountySmrCredits($type) + $credits);
 	}
 
-	public function decreaseCurrentBountySmrCredits($type,$credits) {
-		if($credits<0)
+	public function decreaseCurrentBountySmrCredits($type, $credits) {
+		if ($credits < 0)
 			throw new Exception('Trying to decrease negative current bounty.');
-		$this->setCurrentBountySmrCredits($type,$this->getCurrentBountySmrCredits($type)-$credits);
+		$this->setCurrentBountySmrCredits($type, $this->getCurrentBountySmrCredits($type) - $credits);
 	}
 
 	public function setBountiesClaimable(AbstractSmrPlayer $claimer) {
 		$bounties = $this->getBounties();
-		if(is_array($bounties)) {
-			foreach($bounties as $bounty) {
-				if($bounty['Claimer'] == 0) {
+		if (is_array($bounties)) {
+			foreach ($bounties as $bounty) {
+				if ($bounty['Claimer'] == 0) {
 					$bounty['Claimer'] = $claimer->getAccountID();
 					$this->setBounty($bounty);
 				}
@@ -858,71 +858,71 @@ 
 
 	public function getHOF(array $typeList = null) {
 		$this->getHOFData();
-		if($typeList==null)
+		if ($typeList == null)
 			return $this->HOF;
-		$hof=$this->HOF;
-		foreach($typeList as $type) {
-			if(!isset($hof[$type]))
+		$hof = $this->HOF;
+		foreach ($typeList as $type) {
+			if (!isset($hof[$type]))
 				return 0;
 			$hof = $hof[$type];
 		}
 		return $hof;
 	}
 
-	public function increaseHOF($amount,array $typeList, $visibility) {
-		if($amount < 0)
-			throw new Exception('Trying to increase negative HOF: '.implode(':',$typeList));
-		if($amount == 0)
+	public function increaseHOF($amount, array $typeList, $visibility) {
+		if ($amount < 0)
+			throw new Exception('Trying to increase negative HOF: ' . implode(':', $typeList));
+		if ($amount == 0)
 			return;
-		$this->setHOF($this->getHOF($typeList)+$amount,$typeList, $visibility);
+		$this->setHOF($this->getHOF($typeList) + $amount, $typeList, $visibility);
 	}
 
-	public function decreaseHOF($amount,array $typeList, $visibility) {
-		if($amount < 0)
-			throw new Exception('Trying to decrease negative HOF: '.implode(':',$typeList));
-		if($amount == 0)
+	public function decreaseHOF($amount, array $typeList, $visibility) {
+		if ($amount < 0)
+			throw new Exception('Trying to decrease negative HOF: ' . implode(':', $typeList));
+		if ($amount == 0)
 			return;
-		$this->setHOF($this->getHOF($typeList)-$amount,$typeList, $visibility);
+		$this->setHOF($this->getHOF($typeList) - $amount, $typeList, $visibility);
 	}
 
-	public function setHOF($amount,array $typeList, $visibility) {
-		if(is_array($this->getHOF($typeList)))
-			throw new Exception('Trying to overwrite a HOF type: '.implode(':',$typeList));
-		if($this->isNPC()) {
+	public function setHOF($amount, array $typeList, $visibility) {
+		if (is_array($this->getHOF($typeList)))
+			throw new Exception('Trying to overwrite a HOF type: ' . implode(':', $typeList));
+		if ($this->isNPC()) {
 			// Don't store HOF for NPCs.
 			return;
 		}
-		if($this->getHOF($typeList)==$amount)
+		if ($this->getHOF($typeList) == $amount)
 			return;
-		if($amount < 0)
-			$amount=0;
+		if ($amount < 0)
+			$amount = 0;
 		$this->getHOF();
 
-		$hofType = implode(':',$typeList);
-		if(!isset(self::$HOFVis[$hofType])) {
+		$hofType = implode(':', $typeList);
+		if (!isset(self::$HOFVis[$hofType])) {
 			self::$hasHOFVisChanged[$hofType] = self::HOF_NEW;
 		}
-		else if(self::$HOFVis[$hofType] != $visibility) {
+		else if (self::$HOFVis[$hofType] != $visibility) {
 			self::$hasHOFVisChanged[$hofType] = self::HOF_CHANGED;
 		}
 		self::$HOFVis[$hofType] = $visibility;
 
-		$hof =& $this->HOF;
-		$hofChanged =& $this->hasHOFChanged;
+		$hof = & $this->HOF;
+		$hofChanged = & $this->hasHOFChanged;
 		$new = false;
-		foreach($typeList as $type) {
-			if(!isset($hofChanged[$type]))
+		foreach ($typeList as $type) {
+			if (!isset($hofChanged[$type]))
 				$hofChanged[$type] = array();
-			if(!isset($hof[$type])) {
+			if (!isset($hof[$type])) {
 				$hof[$type] = array();
 				$new = true;
 			}
-			$hof =& $hof[$type];
-			$hofChanged =& $hofChanged[$type];
+			$hof = & $hof[$type];
+			$hofChanged = & $hofChanged[$type];
 		}
-		if($hofChanged==null) {
+		if ($hofChanged == null) {
 			$hofChanged = self::HOF_CHANGED;
-			if($new)
+			if ($new)
 				$hofChanged = self::HOF_NEW;
 		}
 		$hof = $amount;
@@ -940,7 +940,7 @@ 
 	}
 
 	public function hasTurns() {
-		return $this->turns>0;
+		return $this->turns > 0;
 	}
 
 	public function getMaxTurns() {
@@ -948,41 +948,41 @@ 
 //		round(DEFAULT_MAX_TURNS * Globals::getGameSpeed($this->getGameID()));
 	}
 
-	public function setTurns($turns,$newNoob = false,$updateLastActive = false) {
-		if($this->turns == $turns && ($this->newbieTurns == $newNoob || $newNoob==false) && !$updateLastActive)
+	public function setTurns($turns, $newNoob = false, $updateLastActive = false) {
+		if ($this->turns == $turns && ($this->newbieTurns == $newNoob || $newNoob == false) && !$updateLastActive)
 			return;
 
 		// Make sure turns are in range [0, MaxTurns]
 		$this->turns = max(0, min($turns, $this->getMaxTurns()));
 
-		if($newNoob !== false)
+		if ($newNoob !== false)
 			$this->newbieTurns = $newNoob;
 		if ($this->newbieTurns < 0)
 			$this->newbieTurns = 0;
 
-		$this->hasChanged=true;
-		if($updateLastActive === true) {
+		$this->hasChanged = true;
+		if ($updateLastActive === true) {
 			$this->setLastActive(TIME);
 			$this->updateLastCPLAction();
 		}
 	}
 
 	public function takeTurns($take, $noob = 0, $updateLastActive = true) {
-		if($take < 0 || $noob < 0)
+		if ($take < 0 || $noob < 0)
 			throw new Exception('Trying to take negative turns.');
 		$take = ceil($take);
 		$new_turns = $this->getTurns() - $take;
-		$newbiesTaken = min($this->getNewbieTurns(),$noob);
+		$newbiesTaken = min($this->getNewbieTurns(), $noob);
 		$new_noob = $this->getNewbieTurns() - $noob;
 
 		$this->setTurns($new_turns, $new_noob, $updateLastActive);
-		$this->increaseHOF($take,array('Movement','Turns Used','Since Last Death'), HOF_ALLIANCE);
-		$this->increaseHOF($take,array('Movement','Turns Used','Total'), HOF_ALLIANCE);
-		$this->increaseHOF($newbiesTaken,array('Movement','Turns Used','Newbie'), HOF_ALLIANCE);
+		$this->increaseHOF($take, array('Movement', 'Turns Used', 'Since Last Death'), HOF_ALLIANCE);
+		$this->increaseHOF($take, array('Movement', 'Turns Used', 'Total'), HOF_ALLIANCE);
+		$this->increaseHOF($newbiesTaken, array('Movement', 'Turns Used', 'Newbie'), HOF_ALLIANCE);
 	}
 
-	public function giveTurns($give, $noob = 0,$updateLastActive = false) {
-		if($give < 0 || $noob < 0)
+	public function giveTurns($give, $noob = 0, $updateLastActive = false) {
+		if ($give < 0 || $noob < 0)
 			throw new Exception('Trying to give negative turns.');
 		$give = floor($give);
 
@@ -994,10 +994,10 @@ 
 	}
 
 	public function setLastActive($lastActive) {
-		if($this->lastActive == $lastActive)
+		if ($this->lastActive == $lastActive)
 			return;
-		$this->lastActive=$lastActive;
-		$this->hasChanged=true;
+		$this->lastActive = $lastActive;
+		$this->hasChanged = true;
 	}
 
 	public function getLastCPLAction() {
@@ -1005,10 +1005,10 @@ 
 	}
 
 	public function setLastCPLAction($time) {
-		if($this->lastCPLAction == $time)
+		if ($this->lastCPLAction == $time)
 			return;
-		$this->lastCPLAction=$time;
-		$this->hasChanged=true;
+		$this->lastCPLAction = $time;
+		$this->hasChanged = true;
 	}
 
 	public function updateLastCPLAction() {
@@ -1017,7 +1017,7 @@ 
 
 
 	function getCompletedMissions() {
-		if(!isset($this->completedMissions)) {
+		if (!isset($this->completedMissions)) {
 			//Get Player missions
 			$this->db->query('SELECT mission_id FROM player_completed_mission WHERE ' . $this->SQL);
 			$this->completedMissions = array();
@@ -1028,7 +1028,7 @@ 
 	}
 
 	public function getMissions() {
-		if(!isset($this->missions)) {
+		if (!isset($this->missions)) {
 			$this->db->query('SELECT * FROM player_has_mission WHERE ' . $this->SQL);
 			$this->missions = array();
 			while ($this->db->nextRecord()) {
@@ -1049,7 +1049,7 @@ 
 
 	public function getActiveMissions() {
 		$missions = $this->getMissions();
-		foreach($missions as $missionID => $mission) {
+		foreach ($missions as $missionID => $mission) {
 			if ($mission['On Step'] >= count(MISSIONS[$missionID]['Steps'])) {
 				unset($missions[$missionID]);
 			}
@@ -1059,7 +1059,7 @@ 
 
 	function getMission($missionID) {
 		$missions = $this->getMissions();
-		if(isset($missions[$missionID]))
+		if (isset($missions[$missionID]))
 			return $missions[$missionID];
 		return false;
 	}
@@ -1070,7 +1070,7 @@ 
 
 	function updateMission($missionID) {
 		$this->getMissions();
-		if(isset($this->missions[$missionID])) {
+		if (isset($this->missions[$missionID])) {
 			$mission = $this->missions[$missionID];
 			$this->db->query('
 				UPDATE player_has_mission
@@ -1088,15 +1088,15 @@ 
 	}
 
 	private function setupMissionStep($missionID) {
-		$mission =& $this->missions[$missionID];
+		$mission = & $this->missions[$missionID];
 		$step = MISSIONS[$missionID]['Steps'][$mission['On Step']];
-		if(isset($step['PickSector'])) {
+		if (isset($step['PickSector'])) {
 			$realX = Plotter::getX($step['PickSector']['Type'], $step['PickSector']['X'], $this->getGameID());
-			if($realX === false) {
+			if ($realX === false) {
 				throw new Exception('Invalid PickSector definition in mission: ' . $missionID);
 			}
 			$path = Plotter::findDistanceToX($realX, $this->getSector(), true, null, $this);
-			if($path === false) {
+			if ($path === false) {
 				throw new Exception('Cannot find location: ' . $missionID);
 			}
 			$mission['Sector'] = $path->getEndSectorID();
@@ -1106,7 +1106,7 @@ 
 	function addMission($missionID) {
 		$this->getMissions();
 
-		if(isset($this->missions[$missionID]))
+		if (isset($this->missions[$missionID]))
 			return;
 		$sector = 0;
 
@@ -1119,13 +1119,13 @@ 
 			'Starting Sector' => $this->getSectorID()
 		);
 
-		$this->missions[$missionID] =& $mission;
+		$this->missions[$missionID] = & $mission;
 		$this->setupMissionStep($missionID);
 		$this->rebuildMission($missionID);
 
 		$this->db->query('
 			REPLACE INTO player_has_mission (game_id,account_id,mission_id,on_step,progress,unread,starting_sector,mission_sector,step_fails)
-			VALUES ('.$this->db->escapeNumber($this->gameID).','.$this->db->escapeNumber($this->accountID).','.$this->db->escapeNumber($missionID).','.$this->db->escapeNumber($mission['On Step']).','.$this->db->escapeNumber($mission['Progress']).','.$this->db->escapeBoolean($mission['Unread']).','.$this->db->escapeNumber($mission['Starting Sector']).','.$this->db->escapeNumber($mission['Sector']).','.$this->db->escapeNumber($mission['Expires']).')'
+			VALUES ('.$this->db->escapeNumber($this->gameID) . ',' . $this->db->escapeNumber($this->accountID) . ',' . $this->db->escapeNumber($missionID) . ',' . $this->db->escapeNumber($mission['On Step']) . ',' . $this->db->escapeNumber($mission['Progress']) . ',' . $this->db->escapeBoolean($mission['Unread']) . ',' . $this->db->escapeNumber($mission['Starting Sector']) . ',' . $this->db->escapeNumber($mission['Sector']) . ',' . $this->db->escapeNumber($mission['Expires']) . ')'
 		);
 	}
 
@@ -1139,12 +1139,12 @@ 
 		}
 		else {
 			$currentStep = MISSIONS[$missionID]['Steps'][$mission['On Step']];
-			$currentStep['Text'] = str_replace(array('<Race>','<Sector>','<Starting Sector>','<trader>'),array($this->getRaceID(),$mission['Sector'],$mission['Starting Sector'],$this->playerName),$currentStep['Text']);
+			$currentStep['Text'] = str_replace(array('<Race>', '<Sector>', '<Starting Sector>', '<trader>'), array($this->getRaceID(), $mission['Sector'], $mission['Starting Sector'], $this->playerName), $currentStep['Text']);
 			if (isset($currentStep['Task'])) {
-				$currentStep['Task'] = str_replace(array('<Race>','<Sector>','<Starting Sector>','<trader>'),array($this->getRaceID(),$mission['Sector'],$mission['Starting Sector'],$this->playerName),$currentStep['Task']);
+				$currentStep['Task'] = str_replace(array('<Race>', '<Sector>', '<Starting Sector>', '<trader>'), array($this->getRaceID(), $mission['Sector'], $mission['Starting Sector'], $this->playerName), $currentStep['Task']);
 			}
 			if (isset($currentStep['Level'])) {
-				$currentStep['Level'] = str_replace('<Player Level>',$this->levelID,$currentStep['Level']);
+				$currentStep['Level'] = str_replace('<Player Level>', $this->levelID, $currentStep['Level']);
 			}
 			else {
 				$currentStep['Level'] = 0;
@@ -1155,9 +1155,9 @@ 
 
 	function deleteMission($missionID) {
 		$this->getMissions();
-		if(isset($this->missions[$missionID])) {
+		if (isset($this->missions[$missionID])) {
 			unset($this->missions[$missionID]);
-			$this->db->query('DELETE FROM player_has_mission WHERE '.$this->SQL.' AND mission_id = '.$this->db->escapeNumber($missionID).' LIMIT 1');
+			$this->db->query('DELETE FROM player_has_mission WHERE ' . $this->SQL . ' AND mission_id = ' . $this->db->escapeNumber($missionID) . ' LIMIT 1');
 			return true;
 		}
 		return false;
@@ -1166,8 +1166,8 @@ 
 	public function markMissionsRead() {
 		$this->getMissions();
 		$unreadMissions = array();
-		foreach($this->missions as $missionID => &$mission) {
-			if($mission['Unread']) {
+		foreach ($this->missions as $missionID => &$mission) {
+			if ($mission['Unread']) {
 				$unreadMissions[] = $missionID;
 				$mission['Unread'] = false;
 				$this->updateMission($missionID);
@@ -1178,17 +1178,17 @@ 
 
 	public function claimMissionReward($missionID) {
 		$this->getMissions();
-		$mission =& $this->missions[$missionID];
-		if($mission === false) {
+		$mission = & $this->missions[$missionID];
+		if ($mission === false) {
 			throw new Exception('Unknown mission: ' . $missionID);
 		}
-		if($mission['Task'] === false || $mission['Task']['Step'] != 'Claim') {
+		if ($mission['Task'] === false || $mission['Task']['Step'] != 'Claim') {
 			throw new Exception('Cannot claim mission: ' . $missionID . ', for step: ' . $mission['On Step']);
 		}
 		$mission['On Step']++;
 		$mission['Unread'] = true;
-		foreach($mission['Task']['Rewards'] as $rewardItem => $amount) {
-			switch($rewardItem) {
+		foreach ($mission['Task']['Rewards'] as $rewardItem => $amount) {
+			switch ($rewardItem) {
 				case 'Credits':
 					$this->increaseCredits($amount);
 				break;
@@ -1210,14 +1210,14 @@ 
 	public function getAvailableMissions() {
 		$availableMissions = array();
 		foreach (MISSIONS as $missionID => $mission) {
-			if($this->hasMission($missionID)) {
+			if ($this->hasMission($missionID)) {
 				continue;
 			}
 			$realX = Plotter::getX($mission['HasX']['Type'], $mission['HasX']['X'], $this->getGameID());
-			if($realX === false) {
+			if ($realX === false) {
 				throw new Exception('Invalid HasX definition in mission: ' . $missionID);
 			}
-			if($this->getSector()->hasX($realX)) {
+			if ($this->getSector()->hasX($realX)) {
 				$availableMissions[$missionID] = $mission;
 			}
 		}
@@ -1229,31 +1229,31 @@ 
 			throw new Exception('Unknown action: ' . $actionID);
 		}
 // TODO: Reenable this once tested.		if($this->getAccount()->isLoggingEnabled())
-			switch($actionID) {
+			switch ($actionID) {
 				case 'WalkSector':
 					$this->getAccount()->log(LOG_TYPE_MOVEMENT, 'Walks to sector: ' . $values['Sector']->getSectorID(), $this->getSectorID());
 				break;
 				case 'JoinAlliance':
-					$this->getAccount()->log(LOG_TYPE_ALLIANCE, 'joined alliance: '.$values['Alliance']->getAllianceName(), $this->getSectorID());
+					$this->getAccount()->log(LOG_TYPE_ALLIANCE, 'joined alliance: ' . $values['Alliance']->getAllianceName(), $this->getSectorID());
 				break;
 				case 'LeaveAlliance':
-					$this->getAccount()->log(LOG_TYPE_ALLIANCE, 'left alliance: '.$values['Alliance']->getAllianceName(), $this->getSectorID());
+					$this->getAccount()->log(LOG_TYPE_ALLIANCE, 'left alliance: ' . $values['Alliance']->getAllianceName(), $this->getSectorID());
 				break;
 				case 'DisbandAlliance':
-					$this->getAccount()->log(LOG_TYPE_ALLIANCE, 'disbanded alliance '.$values['Alliance']->getAllianceName(), $this->getSectorID());
+					$this->getAccount()->log(LOG_TYPE_ALLIANCE, 'disbanded alliance ' . $values['Alliance']->getAllianceName(), $this->getSectorID());
 				break;
 				case 'KickPlayer':
-					$this->getAccount()->log(LOG_TYPE_ALLIANCE, 'kicked '.$values['Player']->getAccount()->getLogin().' ('.$values['Player']->getPlayerName().') from alliance '.$values['Alliance']->getAllianceName(), 0);
+					$this->getAccount()->log(LOG_TYPE_ALLIANCE, 'kicked ' . $values['Player']->getAccount()->getLogin() . ' (' . $values['Player']->getPlayerName() . ') from alliance ' . $values['Alliance']->getAllianceName(), 0);
 				break;
 				case 'PlayerKicked':
-					$this->getAccount()->log(LOG_TYPE_ALLIANCE, 'was kicked from alliance '.$values['Alliance']->getAllianceName().' by '.$values['Player']->getAccount()->getLogin().' ('.$values['Player']->getPlayerName().')', 0);
+					$this->getAccount()->log(LOG_TYPE_ALLIANCE, 'was kicked from alliance ' . $values['Alliance']->getAllianceName() . ' by ' . $values['Player']->getAccount()->getLogin() . ' (' . $values['Player']->getPlayerName() . ')', 0);
 				break;
 
 			}
 		$this->getMissions();
-		foreach($this->missions as $missionID => &$mission) {
-			if($mission['Task'] !== false && $mission['Task']['Step'] == $actionID) {
-				if(checkMissionRequirements($values, $mission, $this) === true) {
+		foreach ($this->missions as $missionID => &$mission) {
+			if ($mission['Task'] !== false && $mission['Task']['Step'] == $actionID) {
+				if (checkMissionRequirements($values, $mission, $this) === true) {
 					$mission['On Step']++;
 					$mission['Unread'] = true;
 					$this->setupMissionStep($missionID);
@@ -1265,8 +1265,8 @@ 
 	}
 
 	public function canSeeAny(array $otherPlayerArray) {
-		foreach($otherPlayerArray as $otherPlayer) {
-			if($this->canSee($otherPlayer)) {
+		foreach ($otherPlayerArray as $otherPlayer) {
+			if ($this->canSee($otherPlayer)) {
 				return true;
 			}
 		}
@@ -1274,21 +1274,21 @@ 
 	}
 
 	public function canSee(AbstractSmrPlayer $otherPlayer) {
-		if(!$otherPlayer->getShip()->isCloaked())
+		if (!$otherPlayer->getShip()->isCloaked())
 			return true;
-		if($this->sameAlliance($otherPlayer))
+		if ($this->sameAlliance($otherPlayer))
 			return true;
-		if($this->getExperience()>=$otherPlayer->getExperience())
+		if ($this->getExperience() >= $otherPlayer->getExperience())
 			return true;
 		return false;
 	}
 
 	public function equals(AbstractSmrPlayer $otherPlayer = null) {
-		return $otherPlayer!==null && $this->getAccountID()==$otherPlayer->getAccountID() && $this->getGameID()==$otherPlayer->getGameID();
+		return $otherPlayer !== null && $this->getAccountID() == $otherPlayer->getAccountID() && $this->getGameID() == $otherPlayer->getGameID();
 	}
 
 	public function sameAlliance(AbstractSmrPlayer $otherPlayer = null) {
-		return $otherPlayer != null && ($this->equals($otherPlayer) || ($this->hasAlliance() && $this->getAllianceID()==$otherPlayer->getAllianceID()));
+		return $otherPlayer != null && ($this->equals($otherPlayer) || ($this->hasAlliance() && $this->getAllianceID() == $otherPlayer->getAllianceID()));
 	}
 
 	public function sharedForceAlliance(AbstractSmrPlayer $otherPlayer = null) {
@@ -1332,10 +1332,10 @@ 
 	}
 
 	public function meetsAlignmentRestriction($restriction) {
-		if($restriction<0)
-			return $this->getAlignment()<=$restriction;
-		if($restriction>0)
-			return $this->getAlignment()>=$restriction;
+		if ($restriction < 0)
+			return $this->getAlignment() <= $restriction;
+		if ($restriction > 0)
+			return $this->getAlignment() >= $restriction;
 		return true;
 	}
 
@@ -1355,10 +1355,10 @@ 
 	 * Will retrieve all visited sectors, use only when you are likely to check a large number of these
 	 */
 	public function hasVisitedSector($sectorID) {
-		if(!isset($this->visitedSectors)) {
+		if (!isset($this->visitedSectors)) {
 			$this->visitedSectors = array();
 			$this->db->query('SELECT sector_id FROM player_visited_sector WHERE ' . $this->SQL);
-			while($this->db->nextRecord())
+			while ($this->db->nextRecord())
 				$this->visitedSectors[$this->db->getField('sector_id')] = false;
 		}
 		return !isset($this->visitedSectors[$sectorID]);
@@ -1369,7 +1369,7 @@ 
 	}
 
 	public function getExamineTraderHREF() {
-		$container = create_container('skeleton.php','trader_examine.php');
+		$container = create_container('skeleton.php', 'trader_examine.php');
 		$container['target'] = $this->getAccountID();
 		return SmrSession::getNewHREF($container);
 	}
@@ -1379,13 +1379,13 @@ 
 	}
 
 	public function getPlanetKickHREF() {
-		$container = create_container('planet_kick_processing.php','trader_attack_processing.php');
+		$container = create_container('planet_kick_processing.php', 'trader_attack_processing.php');
 		$container['account_id'] = $this->getAccountID();
 		return SmrSession::getNewHREF($container);
 	}
 
 	public function getTraderSearchHREF() {
-		$container = create_container('skeleton.php','trader_search_result.php');
+		$container = create_container('skeleton.php', 'trader_search_result.php');
 		$container['player_id'] = $this->getPlayerID();
 		return SmrSession::getNewHREF($container);
 	}
@@ -1395,7 +1395,7 @@ 
 	}
 
 	public function getToggleWeaponHidingHREF() {
-		$container = create_container('skeleton.php','toggle_processing.php');
+		$container = create_container('skeleton.php', 'toggle_processing.php');
 		$container['toggle'] = 'WeaponHiding';
 		return SmrSession::getNewHREF($container);
 	}

lib/Default/Plotter.class.inc

Spacing +33 added lines, -33 removed lines

@@ -4,16 +4,16 @@ 
 	public function __construct() {
 	}
 
-	public static function getX($xType, $X, $gameID, $player=null) {
-		switch($xType) {
+	public static function getX($xType, $X, $gameID, $player = null) {
+		switch ($xType) {
 			case 'Technology':
 				return Globals::getHardwareTypes($X);
 			case 'Ships':
-				return AbstractSmrShip::getBaseShip(Globals::getGameType($gameID),$X);
+				return AbstractSmrShip::getBaseShip(Globals::getGameType($gameID), $X);
 			case 'Weapons':
 				return SmrWeapon::getWeapon($X);
 			case 'Locations':
-				if(is_numeric($X)) {
+				if (is_numeric($X)) {
 					return SmrLocation::getLocation($X);
 				}
 				return $X;
@@ -40,7 +40,7 @@ 
 	 * is not true for findDistanceToX. If $x is not a SmrSector, then this
 	 * function does 2x the work.
 	 */
-	public static function findReversiblePathToX($x, SmrSector $sector, $useFirst, AbstractSmrPlayer $needsToHaveBeenExploredBy=null, AbstractSmrPlayer $player=null) {
+	public static function findReversiblePathToX($x, SmrSector $sector, $useFirst, AbstractSmrPlayer $needsToHaveBeenExploredBy = null, AbstractSmrPlayer $player = null) {
 		if ($x instanceof SmrSector) {
 
 			// To ensure reversibility, always plot lowest to highest.
@@ -53,8 +53,8 @@ 
 				$end = $x;
 			}
 			$path = Plotter::findDistanceToX($end, $start, $useFirst, $needsToHaveBeenExploredBy, $player);
-			if ($path===false) {
-				create_error('Unable to plot from '.$sector->getSectorID().' to '.$x->getSectorID().'.');
+			if ($path === false) {
+				create_error('Unable to plot from ' . $sector->getSectorID() . ' to ' . $x->getSectorID() . '.');
 			}
 			// Reverse if we plotted $x -> $sector (since we want $sector -> $x)
 			if ($reverse) {
@@ -65,13 +65,13 @@ 
 
 			// At this point we don't know what sector $x will be at
 			$path = Plotter::findDistanceToX($x, $sector, $useFirst, $needsToHaveBeenExploredBy, $player);
-			if ($path===false) {
+			if ($path === false) {
 				create_error('Unable to find what you\'re looking for, it either hasn\'t been added to this game or you haven\'t explored it yet.');
 			}
 			// Now that we know where $x is, make sure path is reversible
 			// (i.e. start sector < end sector)
 			if ($path->getEndSectorID() < $sector->getSectorID()) {
-				$path =& Plotter::findDistanceToX($sector, $path->getEndSector(), true);
+				$path = & Plotter::findDistanceToX($sector, $path->getEndSector(), true);
 				$path->reversePath();
 			}
 
@@ -85,8 +85,8 @@ 
 	 * The resulting path prefers neighbors in their order in SmrSector->links,
 	 * (i.e. up, down, left, right).
 	 */
-	public static function &findDistanceToX($x, SmrSector $sector, $useFirst, AbstractSmrPlayer $needsToHaveBeenExploredBy=null, AbstractSmrPlayer $player=null, $distanceLimit=10000, $lowLimit=0, $highLimit=100000) {
-		$warpAddIndex = TURNS_WARP_SECTOR_EQUIVALENCE-1;
+	public static function &findDistanceToX($x, SmrSector $sector, $useFirst, AbstractSmrPlayer $needsToHaveBeenExploredBy = null, AbstractSmrPlayer $player = null, $distanceLimit = 10000, $lowLimit = 0, $highLimit = 100000) {
+		$warpAddIndex = TURNS_WARP_SECTOR_EQUIVALENCE - 1;
 
 		$checkSector = $sector;
 		$gameID = $sector->getGameID();
@@ -94,57 +94,57 @@ 
 		$sectorsTravelled = 0;
 		$visitedSectors = array();
 		$visitedSectors[$checkSector->getSectorID()] = true;
-		if($x=='Distance')
-			$distances[0][$checkSector->getSectorID()] = new Distance($gameID,$checkSector->getSectorID());
+		if ($x == 'Distance')
+			$distances[0][$checkSector->getSectorID()] = new Distance($gameID, $checkSector->getSectorID());
 
 		$distanceQ = array();
-		for($i=0;$i<=TURNS_WARP_SECTOR_EQUIVALENCE;$i++)
+		for ($i = 0; $i <= TURNS_WARP_SECTOR_EQUIVALENCE; $i++)
 			$distanceQ[] = array();
 		//Warps first as a slight optimisation due to how visitedSectors is set.
-		if($checkSector->hasWarp()===true) {
-			$d = new Distance($gameID,$checkSector->getSectorID());
+		if ($checkSector->hasWarp() === true) {
+			$d = new Distance($gameID, $checkSector->getSectorID());
 			$d->addWarpToPath($checkSector->getWarp(), $checkSector->getSectorID());
 			$distanceQ[$warpAddIndex][] = $d;
 		}
 		foreach ($checkSector->getLinks() as $nextSector) {
-			if($nextSector!==0) {
+			if ($nextSector !== 0) {
 				$visitedSectors[$nextSector] = true;
-				$d = new Distance($gameID,$checkSector->getSectorID());
+				$d = new Distance($gameID, $checkSector->getSectorID());
 				$d->addToPath($nextSector);
 				$distanceQ[0][] = $d;
 			}
 		}
-		$maybeWarps=0;
-		while ($maybeWarps<=TURNS_WARP_SECTOR_EQUIVALENCE) {
+		$maybeWarps = 0;
+		while ($maybeWarps <= TURNS_WARP_SECTOR_EQUIVALENCE) {
 			$sectorsTravelled++;
 			if ($sectorsTravelled > $distanceLimit)
 				return $distances;
-			if($x=='Distance') {
+			if ($x == 'Distance') {
 				$distances[$sectorsTravelled] = array();
 			}
 			$distanceQ[] = array();
-			if(count($q = array_shift($distanceQ))===0) {
+			if (count($q = array_shift($distanceQ)) === 0) {
 				$maybeWarps++;
 				continue;
 			}
-			$maybeWarps=0;
-			while (($distance = array_shift($q))!==null) {
+			$maybeWarps = 0;
+			while (($distance = array_shift($q)) !== null) {
 				$checkSectorID = $distance->getEndSectorID();
 				$visitedSectors[$checkSectorID] = true; // This is here for warps, because they are delayed visits if we set this before the actual visit we'll get sectors marked as visited long before they are actually visited - causes problems when it's quicker to walk to the warp exit than to warp there.
 																// We still need to mark walked sectors as visited before we go to each one otherwise we get a huge number of paths being checked twice (up then left, left then up are essentially the same but if we set up-left as visited only when we actually check it then it gets queued up twice - nasty)
 				if ($checkSectorID >= $lowLimit && $checkSectorID <= $highLimit) {
-					$checkSector = SmrSector::getSector($gameID,$checkSectorID);
-					if($x=='Distance') {
+					$checkSector = SmrSector::getSector($gameID, $checkSectorID);
+					if ($x == 'Distance') {
 						$distances[$sectorsTravelled][$checkSector->getSectorID()] = $distance;
 					}
-					else if (($needsToHaveBeenExploredBy===null||$needsToHaveBeenExploredBy->hasVisitedSector($checkSector->getSectorID()))===true
-							&& $checkSector->hasX($x,$player)===true) {
-						if($useFirst===true)
+					else if (($needsToHaveBeenExploredBy === null || $needsToHaveBeenExploredBy->hasVisitedSector($checkSector->getSectorID())) === true
+							&& $checkSector->hasX($x, $player) === true) {
+						if ($useFirst === true)
 							return $distance;
 						$distances[$checkSector->getSectorID()] = $distance;
 					}
 					//Warps first as a slight optimisation due to how visitedSectors is set.
-					if($checkSector->hasWarp()===true) {
+					if ($checkSector->hasWarp() === true) {
 						if (!isset($visitedSectors[$checkSector->getWarp()])) {
 							$cloneDistance = clone($distance);
 							$cloneDistance->addWarpToPath($checkSector->getWarp(), $checkSector->getSectorID());
@@ -163,7 +163,7 @@ 
 				}
 			}
 		}
-		if($useFirst===true) {
+		if ($useFirst === true) {
 			$return = false;
 			return $return;
 		}
@@ -172,10 +172,10 @@ 
 	
 	public static function &calculatePortToPortDistances(array $sectors, $distanceLimit = 10000, $lowLimit = 0, $highLimit = 100000) {
 		$distances = array();
-		foreach($sectors as $sec) {
+		foreach ($sectors as $sec) {
 			if ($sec !== null) {
 				if ($sec->getSectorID() >= $lowLimit && $sec->getSectorID() <= $highLimit) {
-					if ($sec->hasPort()===true) {
+					if ($sec->hasPort() === true) {
 						$distances[$sec->getSectorID()] = self::findDistanceToOtherPorts($sec, $distanceLimit, $lowLimit, $highLimit);
 					}
 				}

lib/Default/SmrPlanet.class.inc

Spacing +166 added lines, -166 removed lines

@@ -36,7 +36,7 @@ 
 	protected $typeInfo;
 	
 	protected $hasChanged = false;
-	protected $hasChangedFinancial = false;  // for credits, bond, maturity
+	protected $hasChangedFinancial = false; // for credits, bond, maturity
 	protected $hasChangedStockpile = false;
 	protected $hasChangedWeapons = array();
 	protected $hasChangedBuildings = array();
@@ -48,9 +48,9 @@ 
 	protected $delayedArmourDelta = 0;
 
 	public static function refreshCache() {
-		foreach(self::$CACHE_PLANETS as $gameID => &$gamePlanets) {
-			foreach($gamePlanets as $sectorID => &$planet) {
-				$planet = self::getPlanet($gameID,$sectorID,true);
+		foreach (self::$CACHE_PLANETS as $gameID => &$gamePlanets) {
+			foreach ($gamePlanets as $sectorID => &$planet) {
+				$planet = self::getPlanet($gameID, $sectorID, true);
 			}
 		}
 	}
@@ -60,22 +60,22 @@ 
 	}
 
 	public static function savePlanets() {
-		foreach(self::$CACHE_PLANETS as $gamePlanets) {
-			foreach($gamePlanets as $planet) {
+		foreach (self::$CACHE_PLANETS as $gamePlanets) {
+			foreach ($gamePlanets as $planet) {
 				$planet->update();
 			}
 		}
 	}
 
-	public static function &getPlanet($gameID, $sectorID, $forceUpdate=false, $db=null) {
-		if($forceUpdate || !isset(self::$CACHE_PLANETS[$gameID][$sectorID])) {
+	public static function &getPlanet($gameID, $sectorID, $forceUpdate = false, $db = null) {
+		if ($forceUpdate || !isset(self::$CACHE_PLANETS[$gameID][$sectorID])) {
 			self::$CACHE_PLANETS[$gameID][$sectorID] = new SmrPlanet($gameID, $sectorID, $db);
 		}
 		return self::$CACHE_PLANETS[$gameID][$sectorID];
 	}
 
-	public static function &createPlanet($gameID,$sectorID,$type=1) {
-		if(!self::getPlanet($gameID,$sectorID)->exists()) {
+	public static function &createPlanet($gameID, $sectorID, $type = 1) {
+		if (!self::getPlanet($gameID, $sectorID)->exists()) {
 			$minTime = max(SmrGame::getGame($gameID)->getStartDate(),
 			               SmrGame::getGame($gameID)->getStartTurnsDate());
 			$inhabitableTime = $minTime + pow(mt_rand(45, 85), 3);
@@ -85,10 +85,10 @@ 
 			$db->query('INSERT INTO planet (game_id, sector_id, inhabitable_time, planet_type_id)
 				VALUES (' . $db->escapeNumber($gameID) . ', ' . $db->escapeNumber($sectorID) . ', ' . $db->escapeNumber($inhabitableTime) . ', ' . $db->escapeNumber($type) . ')');
 		}
-		return self::getPlanet($gameID,$sectorID,true);
+		return self::getPlanet($gameID, $sectorID, true);
 	}
 
-	public static function removePlanet($gameID,$sectorID) {
+	public static function removePlanet($gameID, $sectorID) {
 		$db = new SmrMySqlDatabase();
 		$SQL = 'game_id = ' . $db->escapeNumber($gameID) . ' AND sector_id = ' . $db->escapeNumber($sectorID);
 		$db->query('DELETE FROM planet WHERE ' . $SQL);
@@ -102,7 +102,7 @@ 
 		unset(self::$CACHE_PLANETS[$gameID][$sectorID]);
 	}
 
-	protected function __construct($gameID, $sectorID, $db=null) {
+	protected function __construct($gameID, $sectorID, $db = null) {
 		$this->db = new SmrMySqlDatabase();
 		$this->SQL = 'game_id = ' . $this->db->escapeNumber($gameID) . ' AND sector_id = ' . $this->db->escapeNumber($sectorID);
 
@@ -115,8 +115,8 @@ 
 		}
 
 		if ($planetExists) {
-			$this->gameID = (int) $gameID;
-			$this->sectorID = (int) $sectorID;
+			$this->gameID = (int)$gameID;
+			$this->sectorID = (int)$sectorID;
 			$this->planetName = stripslashes($db->getField('planet_name'));
 			$this->ownerID = $db->getInt('owner_id');
 			$this->password = $db->getField('password');
@@ -167,7 +167,7 @@ 
 			// calc the interest for the time
 			$interest = $this->getBonds() * $this->getInterestRate();
 
-			if($partial === true && $this->getMaturity() > TIME) {
+			if ($partial === true && $this->getMaturity() > TIME) {
 				// Adjust interest based upon how much of the bond duration has passed.
 				$interest -= ($interest / $this->getBondTime()) * ($this->getMaturity() - TIME);
 			}
@@ -209,7 +209,7 @@ 
 	}
 
 	public function &getGalaxy() {
-		return SmrGalaxy::getGalaxyContaining($this->getGameID(),$this->getSectorID());
+		return SmrGalaxy::getGalaxyContaining($this->getGameID(), $this->getSectorID());
 	}
 
 	public function getOwnerID() {
@@ -217,19 +217,19 @@ 
 	}
 
 	public function hasOwner() {
-		return $this->ownerID!=0;
+		return $this->ownerID != 0;
 	}
 
 	public function setOwnerID($claimerID) {
-		if($this->ownerID==$claimerID) {
+		if ($this->ownerID == $claimerID) {
 			return;
 		}
-		$this->ownerID=$claimerID;
+		$this->ownerID = $claimerID;
 		$this->hasChanged = true;
 	}
 
 	public function &getOwner() {
-		return SmrPlayer::getPlayer($this->getOwnerID(),$this->getGameID());
+		return SmrPlayer::getPlayer($this->getOwnerID(), $this->getGameID());
 	}
 
 	public function getPassword() {
@@ -237,10 +237,10 @@ 
 	}
 
 	public function setPassword($password) {
-		if($this->password==$password) {
+		if ($this->password == $password) {
 			return;
 		}
-		$this->password=$password;
+		$this->password = $password;
 		$this->hasChanged = true;
 	}
 
@@ -253,10 +253,10 @@ 
 	}
 
 	public function setCredits($num) {
-		if($this->credits==$num) {
+		if ($this->credits == $num) {
 			return;
 		}
-		if($num < 0) {
+		if ($num < 0) {
 			throw new Exception('You cannot set negative credits.');
 		}
 		$this->credits = $num;
@@ -264,14 +264,14 @@ 
 	}
 
 	public function increaseCredits($num) {
-		if($num == 0) {
+		if ($num == 0) {
 			return;
 		}
 		$this->setCredits($this->getCredits() + $num);
 	}
 
 	public function decreaseCredits($num) {
-		if($num == 0) {
+		if ($num == 0) {
 			return;
 		}
 		$this->setCredits($this->getCredits() - $num);
@@ -282,10 +282,10 @@ 
 	}
 
 	public function setMaturity($num) {
-		if($this->maturity==$num) {
+		if ($this->maturity == $num) {
 			return;
 		}
-		if($num < 0) {
+		if ($num < 0) {
 			throw new Exception('You cannot set negative maturity.');
 		}
 		$this->maturity = $num;
@@ -297,10 +297,10 @@ 
 	}
 
 	public function setBonds($num) {
-		if($this->bonds==$num) {
+		if ($this->bonds == $num) {
 			return;
 		}
-		if($num < 0) {
+		if ($num < 0) {
 			throw new Exception('You cannot set negative bonds.');
 		}
 		$this->bonds = $num;
@@ -308,14 +308,14 @@ 
 	}
 	
 	public function increaseBonds($num) {
-		if($num == 0) {
+		if ($num == 0) {
 			return;
 		}
 		$this->setBonds($this->getBonds() + $num);
 	}
 
 	public function decreaseBonds($num) {
-		if($num == 0) {
+		if ($num == 0) {
 			return;
 		}
 		$this->setBonds($this->getBonds() - $num);
@@ -344,27 +344,27 @@ 
 	}
 
 	public function getShields($delayed = false) {
-		return $this->shields + ($delayed?$this->delayedShieldsDelta:0);
+		return $this->shields + ($delayed ? $this->delayedShieldsDelta : 0);
 	}
 
 	public function hasShields($delayed = false) {
-		return $this->getShields($delayed)>0;
+		return $this->getShields($delayed) > 0;
 	}
 
 	public function setShields($shields) {
 		$shields = max(0, min($shields, $this->getMaxShields()));
-		if($this->shields == $shields) {
+		if ($this->shields == $shields) {
 			return;
 		}
-		$this->shields=$shields;
+		$this->shields = $shields;
 		$this->hasChanged = true;
 	}
 
 	public function decreaseShields($number, $delayed = false) {
-		if($number == 0) {
+		if ($number == 0) {
 			return;
 		}
-		if($delayed===false) {
+		if ($delayed === false) {
 			$this->setShields($this->getShields() - $number);
 		}
 		else {
@@ -373,10 +373,10 @@ 
 	}
 
 	public function increaseShields($number, $delayed = false) {
-		if($number == 0) {
+		if ($number == 0) {
 			return;
 		}
-		if($delayed===false) {
+		if ($delayed === false) {
 			$this->setShields($this->getShields() + $number);
 		}
 		else {
@@ -389,16 +389,16 @@ 
 	}
 
 	public function getArmour($delayed = false) {
-		return $this->armour + ($delayed?$this->delayedArmourDelta:0);
+		return $this->armour + ($delayed ? $this->delayedArmourDelta : 0);
 	}
 
 	public function hasArmour($delayed = false) {
-		return $this->getArmour($delayed)>0;
+		return $this->getArmour($delayed) > 0;
 	}
 
 	public function setArmour($armour) {
 		$armour = max(0, min($armour, $this->getMaxArmour()));
-		if($this->armour == $armour) {
+		if ($this->armour == $armour) {
 			return;
 		}
 		$this->armour = $armour;
@@ -406,10 +406,10 @@ 
 	}
 
 	public function decreaseArmour($number, $delayed = false) {
-		if($number == 0) {
+		if ($number == 0) {
 			return;
 		}
-		if($delayed===false) {
+		if ($delayed === false) {
 			$this->setArmour($this->getArmour() - $number);
 		}
 		else {
@@ -418,10 +418,10 @@ 
 	}
 
 	public function increaseArmour($number, $delayed = false) {
-		if($number == 0) {
+		if ($number == 0) {
 			return;
 		}
-		if($delayed===false) {
+		if ($delayed === false) {
 			$this->setArmour($this->getArmour() + $number);
 		}
 		else {
@@ -434,27 +434,27 @@ 
 	}
 
 	public function getCDs($delayed = false) {
-		return $this->drones + ($delayed?$this->delayedCDsDelta:0);
+		return $this->drones + ($delayed ? $this->delayedCDsDelta : 0);
 	}
 
 	public function hasCDs($delayed = false) {
-		return $this->getCDs($delayed)>0;
+		return $this->getCDs($delayed) > 0;
 	}
 
 	public function setCDs($combatDrones) {
 		$combatDrones = max(0, min($combatDrones, $this->getMaxCDs()));
-		if($this->drones == $combatDrones) {
+		if ($this->drones == $combatDrones) {
 			return;
 		}
-		$this->drones=$combatDrones;
+		$this->drones = $combatDrones;
 		$this->hasChanged = true;
 	}
 
 	public function decreaseCDs($number, $delayed = false) {
-		if($number == 0) {
+		if ($number == 0) {
 			return;
 		}
-		if($delayed===false) {
+		if ($delayed === false) {
 			$this->setCDs($this->getCDs() - $number);
 		}
 		else {
@@ -463,10 +463,10 @@ 
 	}
 
 	public function increaseCDs($number, $delayed = false) {
-		if($number == 0) {
+		if ($number == 0) {
 			return;
 		}
-		if($delayed===false) {
+		if ($delayed === false) {
 			$this->setCDs($this->getCDs() + $number);
 		}
 		else {
@@ -514,13 +514,13 @@ 
 		if ($orderID == 0) {
 			throw Exception('Cannot move this weapon up!');
 		}
-		if (isset($this->mountedWeapons[$orderID-1])) {
-			$previousWeapon = $this->mountedWeapons[$orderID-1];
+		if (isset($this->mountedWeapons[$orderID - 1])) {
+			$previousWeapon = $this->mountedWeapons[$orderID - 1];
 		}
 		if (isset($this->mountedWeapons[$orderID])) {
-			$this->mountedWeapons[$orderID-1] = $this->mountedWeapons[$orderID];
+			$this->mountedWeapons[$orderID - 1] = $this->mountedWeapons[$orderID];
 		} else {
-			unset($this->mountedWeapons[$orderID-1]);
+			unset($this->mountedWeapons[$orderID - 1]);
 		}
 		if (isset($previousWeapon)) {
 			$this->mountedWeapons[$orderID] = $previousWeapon;
@@ -528,21 +528,21 @@ 
 			unset($this->mountedWeapons[$orderID]);
 		}
 		$this->hasChangedWeapons[$orderID] = true;
-		$this->hasChangedWeapons[$orderID-1] = true;
+		$this->hasChangedWeapons[$orderID - 1] = true;
 	}
 
 	public function moveMountedWeaponDown($orderID) {
 		$this->getMountedWeapons(); // Make sure array is initialized
-		if ($orderID == $this->getMaxMountedWeapons()-1) {
+		if ($orderID == $this->getMaxMountedWeapons() - 1) {
 			throw Exception('Cannot move this weapon down!');
 		}
-		if (isset($this->mountedWeapons[$orderID+1])) {
-			$nextWeapon = $this->mountedWeapons[$orderID+1];
+		if (isset($this->mountedWeapons[$orderID + 1])) {
+			$nextWeapon = $this->mountedWeapons[$orderID + 1];
 		}
 		if (isset($this->mountedWeapons[$orderID])) {
-			$this->mountedWeapons[$orderID+1] = $this->mountedWeapons[$orderID];
+			$this->mountedWeapons[$orderID + 1] = $this->mountedWeapons[$orderID];
 		} else {
-			unset($this->mountedWeapons[$orderID+1]);
+			unset($this->mountedWeapons[$orderID + 1]);
 		}
 		if (isset($nextWeapon)) {
 			$this->mountedWeapons[$orderID] = $nextWeapon;
@@ -550,7 +550,7 @@ 
 			unset($this->mountedWeapons[$orderID]);
 		}
 		$this->hasChangedWeapons[$orderID] = true;
-		$this->hasChangedWeapons[$orderID+1] = true;
+		$this->hasChangedWeapons[$orderID + 1] = true;
 	}
 
 
@@ -559,11 +559,11 @@ 
 	}
 
 	public function exists() {
-		return $this->getGameID()!=null && $this->getSectorID()!==null;
+		return $this->getGameID() != null && $this->getSectorID() !== null;
 	}
 
-	public function getStockpile($goodID=false) {
-		if(!isset($this->stockpile)) {
+	public function getStockpile($goodID = false) {
+		if (!isset($this->stockpile)) {
 			// initialize cargo array
 			$this->stockpile = array();
 			// get supplies from db
@@ -572,15 +572,15 @@ 
 			while ($this->db->nextRecord())
 				$this->stockpile[$this->db->getInt('good_id')] = $this->db->getInt('amount');
 		}
-		if($goodID===false)
+		if ($goodID === false)
 			return $this->stockpile;
-		if(isset($this->stockpile[$goodID]))
+		if (isset($this->stockpile[$goodID]))
 			return $this->stockpile[$goodID];
 		return 0;
 	}
 
-	public function hasStockpile($goodID=false) {
-		if($goodID===false) {
+	public function hasStockpile($goodID = false) {
+		if ($goodID === false) {
 			$stockpile = $this->getStockpile($goodID);
 			return count($stockpile) > 0 && max($stockpile) > 0;
 		}
@@ -589,31 +589,31 @@ 
 		}
 	}
 
-	public function setStockpile($goodID,$amount) {
-		if($amount < 0) {
+	public function setStockpile($goodID, $amount) {
+		if ($amount < 0) {
 			throw new Exception('Trying to set negative stockpile.');
 		}
-		if($this->getStockpile($goodID) == $amount) {
+		if ($this->getStockpile($goodID) == $amount) {
 			return;
 		}
 		$this->stockpile[$goodID] = $amount;
 		$this->hasChangedStockpile = true;
 	}
 
-	public function decreaseStockpile($goodID,$amount) {
-		if($amount < 0)
+	public function decreaseStockpile($goodID, $amount) {
+		if ($amount < 0)
 			throw new Exception('Trying to decrease negative stockpile.');
-		$this->setStockpile($goodID,$this->getStockpile($goodID) - $amount);
+		$this->setStockpile($goodID, $this->getStockpile($goodID) - $amount);
 	}
 
-	public function increaseStockpile($goodID,$amount) {
-		if($amount < 0)
+	public function increaseStockpile($goodID, $amount) {
+		if ($amount < 0)
 			throw new Exception('Trying to increase negative stockpile.');
-		$this->setStockpile($goodID,$this->getStockpile($goodID) + $amount);
+		$this->setStockpile($goodID, $this->getStockpile($goodID) + $amount);
 	}
 
 	public function getBuildings() {
-		if(!isset($this->buildings)) {
+		if (!isset($this->buildings)) {
 			$this->buildings = array();
 
 			// get buildingss from db
@@ -631,41 +631,41 @@ 
 
 	public function getBuilding($buildingTypeID) {
 		$buildings = $this->getBuildings();
-		if(isset($buildings[$buildingTypeID])) {
+		if (isset($buildings[$buildingTypeID])) {
 			return $buildings[$buildingTypeID];
 		}
 		return 0;
 	}
 
 	public function hasBuilding($buildingTypeID) {
-		return $this->getBuilding($buildingTypeID)>0;
+		return $this->getBuilding($buildingTypeID) > 0;
 	}
 
-	public function setBuilding($buildingTypeID,$number) {
-		if($this->getBuilding($buildingTypeID) == $number)
+	public function setBuilding($buildingTypeID, $number) {
+		if ($this->getBuilding($buildingTypeID) == $number)
 			return;
 
 		$this->buildings[$buildingTypeID] = $number;
 		$this->hasChangedBuildings[$buildingTypeID] = true;
 	}
 
-	public function increaseBuilding($buildingTypeID,$number) {
-		$this->setBuilding($buildingTypeID,$this->getBuilding($buildingTypeID)+$number);
+	public function increaseBuilding($buildingTypeID, $number) {
+		$this->setBuilding($buildingTypeID, $this->getBuilding($buildingTypeID) + $number);
 	}
 
-	public function destroyBuilding($buildingTypeID,$number) {
-		if(!$this->hasBuilding($buildingTypeID)) {
+	public function destroyBuilding($buildingTypeID, $number) {
+		if (!$this->hasBuilding($buildingTypeID)) {
 			throw new Exception('Trying to destroy a nonexistent building');
 		}
-		$this->setBuilding($buildingTypeID,$this->getBuilding($buildingTypeID)-$number);
+		$this->setBuilding($buildingTypeID, $this->getBuilding($buildingTypeID) - $number);
 	}
 
 	function getCurrentlyBuilding() {
-		if(!isset($this->currentlyBuilding)) {
+		if (!isset($this->currentlyBuilding)) {
 			$this->currentlyBuilding = array();
 
 			$this->db->query('SELECT * FROM planet_is_building WHERE ' . $this->SQL);
-			while($this->db->nextRecord()) {
+			while ($this->db->nextRecord()) {
 				$this->currentlyBuilding[$this->db->getInt('building_slot_id')] = array(
 					'BuildingSlotID' => $this->db->getInt('building_slot_id'),
 					'ConstructionID' => $this->db->getInt('construction_id'),
@@ -681,9 +681,9 @@ 
 					unset($this->currentlyBuilding[$id]);
 					$expGain = $this->getConstructionExp($building['ConstructionID']);
 					$player = SmrPlayer::getPlayer($building['ConstructorID'], $this->getGameID());
-					$player->increaseHOF(1, array('Planet','Buildings','Built'), HOF_ALLIANCE);
+					$player->increaseHOF(1, array('Planet', 'Buildings', 'Built'), HOF_ALLIANCE);
 					$player->increaseExperience($expGain);
-					$player->increaseHOF($expGain, array('Planet','Buildings','Experience'), HOF_ALLIANCE);
+					$player->increaseHOF($expGain, array('Planet', 'Buildings', 'Experience'), HOF_ALLIANCE);
 					$this->hasStoppedBuilding[] = $building['BuildingSlotID'];
 					$this->increaseBuilding($building['ConstructionID'], 1);
 
@@ -700,8 +700,8 @@ 
 		return $this->currentlyBuilding;
 	}
 
-	public function getMaxBuildings($buildingTypeID=false) {
-		if($buildingTypeID===false) {
+	public function getMaxBuildings($buildingTypeID = false) {
+		if ($buildingTypeID === false) {
 			$structs = $this->typeInfo::STRUCTURES;
 			return array_combine(array_keys($structs),
 			                     array_column($structs, 'max_amount'));
@@ -718,13 +718,13 @@ 
 			return;
 		}
 		$this->typeID = $num;
-		$this->db->query('UPDATE planet SET planet_type_id = '.$this->db->escapeNumber($num).' WHERE '.$this->SQL);
+		$this->db->query('UPDATE planet SET planet_type_id = ' . $this->db->escapeNumber($num) . ' WHERE ' . $this->SQL);
 		$this->typeInfo = SmrPlanetType::getTypeInfo($this->getTypeID());
 		
 		//trim buildings first
 		foreach ($this->getBuildings() as $id => $amt) {
 			if ($this->getMaxBuildings($id) < $amt) {
-				$this->destroyBuilding($id,$amt - $this->getMaxBuildings($id));
+				$this->destroyBuilding($id, $amt - $this->getMaxBuildings($id));
 			}
 		}
 		
@@ -755,7 +755,7 @@ 
 		return $this->typeInfo->maxLanded();
 	}
 
-	public function getStructureTypes($structureID=false) {
+	public function getStructureTypes($structureID = false) {
 		return $this->typeInfo->structureTypes($structureID);
 	}
 
@@ -781,14 +781,14 @@ 
 	}
 	
 	public function update() {
-		if(!$this->exists()) {
+		if (!$this->exists()) {
 			return;
 		}
 		$this->doDelayedUpdates();
-		if($this->hasChanged) {
+		if ($this->hasChanged) {
 			$this->db->query('UPDATE planet SET
 									owner_id = ' . $this->db->escapeNumber($this->ownerID) . ',
-									password = '.$this->db->escapeString($this->password) .',
+									password = '.$this->db->escapeString($this->password) . ',
 									planet_name = ' . $this->db->escapeString($this->planetName) . ',
 									shields = ' . $this->db->escapeNumber($this->shields) . ',
 									armour = ' . $this->db->escapeNumber($this->armour) . ',
@@ -809,7 +809,7 @@ 
 			$this->hasChangedFinancial = false;
 		}
 
-		if($this->hasChangedStockpile) {
+		if ($this->hasChangedStockpile) {
 			// write stockpile info
 			foreach ($this->getStockpile() as $id => $amount) {
 				if ($amount != 0) {
@@ -826,21 +826,21 @@ 
 		if ($this->hasChangedWeapons) {
 			foreach (array_keys($this->hasChangedWeapons) as $orderID) {
 				if (isset($this->mountedWeapons[$orderID])) {
-					$this->db->query('REPLACE INTO planet_has_weapon (game_id, sector_id, order_id, weapon_type_id) VALUES ('.$this->db->escapeNumber($this->getGameID()).','.$this->db->escapeNumber($this->getSectorID()).','.$this->db->escapeNumber($orderID).','.$this->db->escapeNumber($this->mountedWeapons[$orderID]->getWeaponTypeID()).')');
+					$this->db->query('REPLACE INTO planet_has_weapon (game_id, sector_id, order_id, weapon_type_id) VALUES (' . $this->db->escapeNumber($this->getGameID()) . ',' . $this->db->escapeNumber($this->getSectorID()) . ',' . $this->db->escapeNumber($orderID) . ',' . $this->db->escapeNumber($this->mountedWeapons[$orderID]->getWeaponTypeID()) . ')');
 				} else {
-					$this->db->query('DELETE FROM planet_has_weapon WHERE '.$this->SQL.' AND order_id='.$this->db->escapeNumber($orderID));
+					$this->db->query('DELETE FROM planet_has_weapon WHERE ' . $this->SQL . ' AND order_id=' . $this->db->escapeNumber($orderID));
 				}
 			}
 		}
 
-		if(count($this->hasStoppedBuilding)>0) {
+		if (count($this->hasStoppedBuilding) > 0) {
 			$this->db->query('DELETE FROM planet_is_building WHERE ' . $this->SQL . '
 								AND building_slot_id IN (' . $this->db->escapeArray($this->hasStoppedBuilding) . ') LIMIT ' . count($this->hasStoppedBuilding));
 			$this->hasStoppedBuilding = array();
 		}
 		// write building info
 		foreach ($this->hasChangedBuildings as $id => $hasChanged) {
-			if($hasChanged===true) {
+			if ($hasChanged === true) {
 				if ($this->hasBuilding($id)) {
 					$this->db->query('REPLACE INTO planet_has_building (game_id, sector_id, construction_id, amount) ' .
 										'VALUES(' . $this->db->escapeNumber($this->gameID) . ', ' . $this->db->escapeNumber($this->sectorID) . ', ' . $this->db->escapeNumber($id) . ', ' . $this->db->escapeNumber($this->getBuilding($id)) . ')');
@@ -855,15 +855,15 @@ 
 	}
 
 	function getLevel() {
-		return array_sum($this->getBuildings())/3;
+		return array_sum($this->getBuildings()) / 3;
 	}
 	
 	function getMaxLevel() {
-		return array_sum($this->getMaxBuildings())/3;
+		return array_sum($this->getMaxBuildings()) / 3;
 	}
 
 	function accuracy() {
-		if($this->hasWeapons()) {
+		if ($this->hasWeapons()) {
 			$weapons = $this->getWeapons();
 			return $weapons[0]->getModifiedPlanetAccuracy($this);
 		}
@@ -889,10 +889,10 @@ 
 	}
 
 	function canBuild(AbstractSmrPlayer $constructor, $constructionID) {
-		if($this->hasCurrentlyBuilding()) {
+		if ($this->hasCurrentlyBuilding()) {
 			return 'There is already a building in progress!';
 		}
-		if($this->getBuilding($constructionID) >= $this->getMaxBuildings($constructionID)) {
+		if ($this->getBuilding($constructionID) >= $this->getMaxBuildings($constructionID)) {
 			return 'This planet has reached the maximum buildings of that type.';
 		}
 		$cost = $this->getStructureTypes($constructionID)->creditCost();
@@ -918,7 +918,7 @@ 
 	private function getCompletionModifier($constructionID) {
 		$currentBuildings = $this->getBuilding($constructionID);
 		$maxBuildings = $this->getMaxBuildings($constructionID);
-		return 0.01 + 2.97 * pow($currentBuildings/$maxBuildings, 2);
+		return 0.01 + 2.97 * pow($currentBuildings / $maxBuildings, 2);
 	}
 
 	// Amount of exp gained to build the next building of this type
@@ -935,13 +935,13 @@ 
 	}
 	
 	function startBuilding(AbstractSmrPlayer $constructor, $constructionID) {
-		if(($message = $this->canBuild($constructor, $constructionID)) !== true) {
-			throw new Exception('Unable to start building: '.$message);
+		if (($message = $this->canBuild($constructor, $constructionID)) !== true) {
+			throw new Exception('Unable to start building: ' . $message);
 		}
 		$constructor->decreaseCredits($this->getStructureTypes($constructionID)->creditCost());
 		// take the goods that are needed
 		foreach ($this->getStructureTypes($constructionID)->goods() as $goodID => $amount) {
-			$this->decreaseStockpile($goodID,$amount);
+			$this->decreaseStockpile($goodID, $amount);
 		}
 		foreach ($this->getStructureTypes($constructionID)->hardwareCost() as $hardwareID) {
 			$constructor->getShip()->setHardware($hardwareID, 0);
@@ -964,13 +964,13 @@ 
 	function stopBuilding($constructionID) {
 		$matchingBuilding = false;
 		$latestFinish = 0;
-		foreach($this->getCurrentlyBuilding() as $key => $building) {
-			if($building['ConstructionID'] == $constructionID && $building['Finishes'] > $latestFinish) {
+		foreach ($this->getCurrentlyBuilding() as $key => $building) {
+			if ($building['ConstructionID'] == $constructionID && $building['Finishes'] > $latestFinish) {
 				$latestFinish = $building['Finishes'];
 				$matchingBuilding = $building;
 			}
 		}
-		if($matchingBuilding) {
+		if ($matchingBuilding) {
 			$this->hasStoppedBuilding[] = $matchingBuilding['BuildingSlotID'];
 			unset($this->currentlyBuilding[$matchingBuilding['BuildingSlotID']]);
 			return true;
@@ -983,7 +983,7 @@ 
 	}
 
 	public function setName($name) {
-		if($this->planetName == $name) {
+		if ($this->planetName == $name) {
 			return;
 		}
 		$this->planetName = $name;
@@ -991,15 +991,15 @@ 
 	}
 
 	public function getDisplayName() {
-		return '<span style="color:yellow;font-variant:small-caps">' . $this->getName() . '(#'.$this->getSectorID().')</span>';;
+		return '<span style="color:yellow;font-variant:small-caps">' . $this->getName() . '(#' . $this->getSectorID() . ')</span>'; ;
 	}
 
 	public function isInhabitable() {
-		return $this->inhabitableTime<= TIME;
+		return $this->inhabitableTime <= TIME;
 	}
 
 	public function isClaimed() {
-		return $this->ownerID>0;
+		return $this->ownerID > 0;
 	}
 
 	public function removeClaimed() {
@@ -1041,9 +1041,9 @@ 
 	}
 
 	public function attackedBy(AbstractSmrPlayer $trigger, array $attackers) {
-		$trigger->increaseHOF(1,array('Combat','Planet','Number Of Triggers'), HOF_PUBLIC);
+		$trigger->increaseHOF(1, array('Combat', 'Planet', 'Number Of Triggers'), HOF_PUBLIC);
 		foreach ($attackers as $attacker) {
-			$attacker->increaseHOF(1,array('Combat','Planet','Number Of Attacks'), HOF_PUBLIC);
+			$attacker->increaseHOF(1, array('Combat', 'Planet', 'Number Of Attacks'), HOF_PUBLIC);
 			$this->db->query('REPLACE INTO player_attacks_planet (game_id, account_id, sector_id, time, level) VALUES ' .
 					'(' . $this->db->escapeNumber($this->getGameID()) . ', ' . $this->db->escapeNumber($attacker->getAccountID()) . ', ' . $this->db->escapeNumber($this->getSectorID()) . ', ' . $this->db->escapeNumber(TIME) . ', ' . $this->db->escapeNumber($this->getLevel()) . ')');
 		}
@@ -1052,9 +1052,9 @@ 
 		// Note: Attack uniqueness determined by planet owner.
 		$owner = $this->getOwner();
 		$this->db->query('SELECT 1 FROM news WHERE type = \'BREAKING\' AND game_id = ' . $this->db->escapeNumber($trigger->getGameID()) . ' AND dead_id=' . $this->db->escapeNumber($owner->getAccountID()) . ' AND time > ' . $this->db->escapeNumber(TIME - self::TIME_ATTACK_NEWS_COOLDOWN) . ' LIMIT 1');
-		if ($this->db->getNumRows()==0) {
+		if ($this->db->getNumRows() == 0) {
 			if (count($attackers) >= 5) {
-				$text = count($attackers) . ' members of '.$trigger->getAllianceBBLink().' have been spotted attacking ' .
+				$text = count($attackers) . ' members of ' . $trigger->getAllianceBBLink() . ' have been spotted attacking ' .
 					$this->getDisplayName() . ' in sector ' . Globals::getSectorBBLink($this->getSectorID()) . '. The planet is owned by ' . $owner->getBBLink();
 				if ($owner->hasAlliance()) {
 					$text .= ', a member of ' . $owner->getAllianceBBLink();
@@ -1068,7 +1068,7 @@ 
 	
 	
 	public function &getPlayers() {
-		return SmrPlayer::getPlanetPlayers($this->getGameID(),$this->getSectorID());
+		return SmrPlayer::getPlanetPlayers($this->getGameID(), $this->getSectorID());
 	}
 
 	public function countPlayers() {
@@ -1080,7 +1080,7 @@ 
 	}
 
 	public function &getOtherTraders(AbstractSmrPlayer $player) {
-		$players = SmrPlayer::getPlanetPlayers($this->getGameID(),$this->getSectorID()); //Do not use & because we unset something and only want that in what we return
+		$players = SmrPlayer::getPlanetPlayers($this->getGameID(), $this->getSectorID()); //Do not use & because we unset something and only want that in what we return
 		unset($players[$player->getAccountID()]);
 		return $players;
 	}
@@ -1090,22 +1090,22 @@ 
 	}
 
 	public function hasEnemyTraders(AbstractSmrPlayer $player) {
-		if(!$this->hasOtherTraders($player))
+		if (!$this->hasOtherTraders($player))
 			return false;
 		$otherPlayers = $this->getOtherTraders($player);
-		foreach($otherPlayers as $otherPlayer) {
-			if(!$player->traderNAPAlliance($otherPlayer))
+		foreach ($otherPlayers as $otherPlayer) {
+			if (!$player->traderNAPAlliance($otherPlayer))
 				return true;
 		}
 		return false;
 	}
 
 	public function hasFriendlyTraders(AbstractSmrPlayer $player) {
-		if(!$this->hasOtherTraders($player))
+		if (!$this->hasOtherTraders($player))
 			return false;
 		$otherPlayers = $this->getOtherTraders($player);
-		foreach($otherPlayers as $otherPlayer) {
-			if($player->traderNAPAlliance($otherPlayer))
+		foreach ($otherPlayers as $otherPlayer) {
+			if ($player->traderNAPAlliance($otherPlayer))
 				return true;
 		}
 		return false;
@@ -1113,14 +1113,14 @@ 
 
 	public function &getWeapons() {
 		$weapons = $this->getMountedWeapons();
-		for($i=0; $i<$this->getBuilding(PLANET_TURRET); ++$i) {
+		for ($i = 0; $i < $this->getBuilding(PLANET_TURRET); ++$i) {
 			$weapons[] = SmrWeapon::getWeapon(WEAPON_PLANET_TURRET);
 		}
 		return $weapons;
 	}
 
 	public function hasWeapons() {
-		return count($this->getWeapons())>0;
+		return count($this->getWeapons()) > 0;
 	}
 
 	public function &shootPlayer(AbstractSmrPlayer $targetPlayer) {
@@ -1129,25 +1129,25 @@ 
 
 	public function &shootPlayers(array $targetPlayers) {
 		$results = array('Planet' => $this, 'TotalDamage' => 0, 'TotalDamagePerTargetPlayer' => array());
-		foreach($targetPlayers as $targetPlayer) {
+		foreach ($targetPlayers as $targetPlayer) {
 			$results['TotalDamagePerTargetPlayer'][$targetPlayer->getAccountID()] = 0;
 		}
-		if($this->isDestroyed()) {
+		if ($this->isDestroyed()) {
 			$results['DeadBeforeShot'] = true;
 			return $results;
 		}
 		$results['DeadBeforeShot'] = false;
 		$weapons = $this->getWeapons();
-		foreach($weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPlayerAsPlanet($this, $targetPlayers[array_rand($targetPlayers)]);
-			if($results['Weapons'][$orderID]['Hit']) {
+		foreach ($weapons as $orderID => $weapon) {
+			$results['Weapons'][$orderID] = & $weapon->shootPlayerAsPlanet($this, $targetPlayers[array_rand($targetPlayers)]);
+			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 				$results['TotalDamagePerTargetPlayer'][$results['Weapons'][$orderID]['TargetPlayer']->getAccountID()] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 			}
 		}
-		if($this->hasCDs()) {
-			$thisCDs = new SmrCombatDrones($this->getGameID(),$this->getCDs(),true);
-			$results['Drones'] =& $thisCDs->shootPlayerAsPlanet($this, $targetPlayers[array_rand($targetPlayers)]);
+		if ($this->hasCDs()) {
+			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs(), true);
+			$results['Drones'] = & $thisCDs->shootPlayerAsPlanet($this, $targetPlayers[array_rand($targetPlayers)]);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 			$results['TotalDamagePerTargetPlayer'][$results['Drones']['TargetPlayer']->getAccountID()] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
@@ -1159,7 +1159,7 @@ 
 		// For every 70 damage there is a 15% chance of destroying a structure.
 		// Which structure is destroyed depends on the ratio of buildings and
 		// the time it takes to build them.
-		for ($i = 0; $damage > self::DAMAGE_NEEDED_FOR_DOWNGRADE_CHANCE; $damage-=self::DAMAGE_NEEDED_FOR_DOWNGRADE_CHANCE) {
+		for ($i = 0; $damage > self::DAMAGE_NEEDED_FOR_DOWNGRADE_CHANCE; $damage -= self::DAMAGE_NEEDED_FOR_DOWNGRADE_CHANCE) {
 			// Stop if the planet has no more buildlings
 			if ($this->getLevel() == 0) {
 				break;
@@ -1173,7 +1173,7 @@ 
 				$destroyID = getWeightedRandom($chanceFactors);
 				$this->destroyBuilding($destroyID, 1);
 				$this->checkForExcessDefense();
-				$results .= 'This team destroys <span class="red">1</span> '.$this->getStructureTypes($destroyID)->name().'.<br />';
+				$results .= 'This team destroys <span class="red">1</span> ' . $this->getStructureTypes($destroyID)->name() . '.<br />';
 			}
 		}
 		return $results;
@@ -1184,20 +1184,20 @@ 
 		$shieldDamage = 0;
 		$cdDamage = 0;
 		$armourDamage = 0;
-		if(!$alreadyDead) {
-			if($damage['Shield'] || !$this->hasShields(true)) {
-				$shieldDamage = $this->doShieldDamage(min($damage['MaxDamage'],$damage['Shield']),$delayed);
+		if (!$alreadyDead) {
+			if ($damage['Shield'] || !$this->hasShields(true)) {
+				$shieldDamage = $this->doShieldDamage(min($damage['MaxDamage'], $damage['Shield']), $delayed);
 				$damage['Shield'] -= $shieldDamage;
 				$damage['MaxDamage'] -= $shieldDamage;
 
-				if(!$this->hasShields(true) && ($shieldDamage == 0 || $damage['Rollover'])) {
+				if (!$this->hasShields(true) && ($shieldDamage == 0 || $damage['Rollover'])) {
 					if ($this->hasCDs(true)) {
-						$cdDamage = $this->doCDDamage(min($damage['MaxDamage'],$damage['Armour']),$delayed);
+						$cdDamage = $this->doCDDamage(min($damage['MaxDamage'], $damage['Armour']), $delayed);
 						$damage['Armour'] -= $cdDamage;
 						$damage['MaxDamage'] -= $cdDamage;
 					}
 					if ($this->hasArmour(true) && ($cdDamage == 0 || $damage['Rollover'])) {
-						$armourDamage = $this->doArmourDamage(min($damage['MaxDamage'],$damage['Armour']),$delayed);
+						$armourDamage = $this->doArmourDamage(min($damage['MaxDamage'], $damage['Armour']), $delayed);
 						$damage['Armour'] -= $armourDamage;
 						$damage['MaxDamage'] -= $armourDamage;
 					}
@@ -1205,7 +1205,7 @@ 
 
 			}
 			else { // hit drones behind shields - we should only use this reduced damage branch if we cannot hit shields.
-				$cdDamage = $this->doCDDamage(floor(min($damage['MaxDamage'],$damage['Armour'])*DRONES_BEHIND_SHIELDS_DAMAGE_PERCENT),$delayed);
+				$cdDamage = $this->doCDDamage(floor(min($damage['MaxDamage'], $damage['Armour']) * DRONES_BEHIND_SHIELDS_DAMAGE_PERCENT), $delayed);
 			}
 		}
 
@@ -1217,27 +1217,27 @@ 
 			'HasShields' => $this->hasShields(true),
 			'HasArmour' => $this->hasArmour(true),
 			'CDs' => $cdDamage,
-			'NumCDs' => $cdDamage/CD_ARMOUR,
+			'NumCDs' => $cdDamage / CD_ARMOUR,
 			'HasCDs' => $this->hasCDs(true),
-			'TotalDamage' => $shieldDamage+$cdDamage+$armourDamage
+			'TotalDamage' => $shieldDamage + $cdDamage + $armourDamage
 		);
 		return $return;
 	}
 
 	protected function doShieldDamage($damage, $delayed) {
-		$actualDamage = min($this->getShields(true),$damage);
+		$actualDamage = min($this->getShields(true), $damage);
 		$this->decreaseShields($actualDamage, $delayed);
 		return $actualDamage;
 	}
 
 	protected function doCDDamage($damage, $delayed) {
-		$actualDamage = min($this->getCDs(true),floor($damage/CD_ARMOUR));
+		$actualDamage = min($this->getCDs(true), floor($damage / CD_ARMOUR));
 		$this->decreaseCDs($actualDamage, $delayed);
-		return $actualDamage*CD_ARMOUR;
+		return $actualDamage * CD_ARMOUR;
 	}
 	
 	protected function doArmourDamage($damage, $delayed) {
-		$actualDamage = min($this->getArmour(true),$damage);;
+		$actualDamage = min($this->getArmour(true), $damage); ;
 		$this->decreaseArmour($actualDamage, $delayed);
 		return $actualDamage;
 	}
@@ -1246,9 +1246,9 @@ 
 		//get all players involved for HoF
 		$this->db->query('SELECT account_id,level FROM player_attacks_planet WHERE ' . $this->SQL . ' AND time > ' . $this->db->escapeNumber(TIME - self::TIME_TO_CREDIT_BUST));
 		while ($this->db->nextRecord()) {
-			$currPlayer = SmrPlayer::getPlayer($this->db->getInt('account_id'),$this->getGameID());
-			$currPlayer->increaseHOF($this->db->getInt('level'),array('Combat','Planet','Levels'), HOF_PUBLIC);
-			$currPlayer->increaseHOF(1,array('Combat','Planet','Completed'), HOF_PUBLIC);
+			$currPlayer = SmrPlayer::getPlayer($this->db->getInt('account_id'), $this->getGameID());
+			$currPlayer->increaseHOF($this->db->getInt('level'), array('Combat', 'Planet', 'Levels'), HOF_PUBLIC);
+			$currPlayer->increaseHOF(1, array('Combat', 'Planet', 'Completed'), HOF_PUBLIC);
 		}
 		$this->db->query('DELETE FROM player_attacks_planet WHERE ' . $this->SQL);
 	}

lib/Default/SmrMines.class.inc

Spacing +22 added lines, -22 removed lines

@@ -6,7 +6,7 @@ 
 	const DCS_DAMAGE_MODIFIER = .75;
 	protected $numberOfMines;
 	
-	public function __construct($gameTypeID,$numberOfMines) {
+	public function __construct($gameTypeID, $numberOfMines) {
 		$this->gameTypeID = $gameTypeID;
 		$this->numberOfMines = $numberOfMines;
 		$this->name = 'Mines';
@@ -28,30 +28,30 @@ 
 		return $modifiedAccuracy;
 	}
 	
-	public function getModifiedForceAccuracyAgainstPlayer(SmrForce $forces,AbstractSmrPlayer $targetPlayer,$minesAreAttacker) {
-		return $this->getModifiedForceAccuracyAgainstPlayerUsingRandom($forces,$targetPlayer,mt_rand(1,7) * mt_rand(1,7),$minesAreAttacker);
+	public function getModifiedForceAccuracyAgainstPlayer(SmrForce $forces, AbstractSmrPlayer $targetPlayer, $minesAreAttacker) {
+		return $this->getModifiedForceAccuracyAgainstPlayerUsingRandom($forces, $targetPlayer, mt_rand(1, 7) * mt_rand(1, 7), $minesAreAttacker);
 	}
 	
-	protected function getModifiedForceAccuracyAgainstPlayerUsingRandom(SmrForce $forces,AbstractSmrPlayer $targetPlayer, $random,$minesAreAttacker) {
+	protected function getModifiedForceAccuracyAgainstPlayerUsingRandom(SmrForce $forces, AbstractSmrPlayer $targetPlayer, $random, $minesAreAttacker) {
 		$modifiedAccuracy = $this->getModifiedAccuracy();
 		$modifiedAccuracy -= $targetPlayer->getLevelID() + $random;
-		if($minesAreAttacker) {
-			$modifiedAccuracy /= pow(SmrSector::getSector($forces->getGameID(),$forces->getSectorID())->getNumberOfConnections(), 0.6);
+		if ($minesAreAttacker) {
+			$modifiedAccuracy /= pow(SmrSector::getSector($forces->getGameID(), $forces->getSectorID())->getNumberOfConnections(), 0.6);
 		}
 	
-		if(self::TOTAL_ENEMY_MINES_MODIFIER > 0) {
+		if (self::TOTAL_ENEMY_MINES_MODIFIER > 0) {
 			$enemyMines = 0;
 			$enemyForces = $forces->getSector()->getEnemyForces($targetPlayer);
-			foreach($enemyForces as $enemyForce) {
+			foreach ($enemyForces as $enemyForce) {
 				$enemyMines += $enemyForce->getMines();
 			}
 			$modifiedAccuracy += $enemyMines / self::TOTAL_ENEMY_MINES_MODIFIER;
 		}
-		return max(0,min(100,$modifiedAccuracy));
+		return max(0, min(100, $modifiedAccuracy));
 	}
 	
-	public function getMaxModifiedForceAccuracyAgainstPlayer(SmrForce $forces,AbstractSmrPlayer $targetPlayer,$minesAreAttacker) {
-		return $this->getModifiedForceAccuracyAgainstPlayerUsingRandom($forces,$targetPlayer,49,$minesAreAttacker);
+	public function getMaxModifiedForceAccuracyAgainstPlayer(SmrForce $forces, AbstractSmrPlayer $targetPlayer, $minesAreAttacker) {
+		return $this->getModifiedForceAccuracyAgainstPlayerUsingRandom($forces, $targetPlayer, 49, $minesAreAttacker);
 	}
 	
 	public function &getModifiedDamage() {
@@ -89,13 +89,13 @@ 
 		return $return;
 	}
 	
-	public function &getModifiedForceDamageAgainstPlayer(SmrForce $forces, AbstractSmrPlayer $targetPlayer,$minesAreAttacker=false) {
-		if(!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculated any damage mods.
+	public function &getModifiedForceDamageAgainstPlayer(SmrForce $forces, AbstractSmrPlayer $targetPlayer, $minesAreAttacker = false) {
+		if (!$this->canShootTraders()) { // If we can't shoot traders 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());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
-		if($targetPlayer->getShip()->isFederal()) { // do less damage to fed ships 
+		$damage = & $this->getModifiedDamage();
+		if ($targetPlayer->getShip()->isFederal()) { // do less damage to fed ships 
 			$damage['MaxDamage'] = round($damage['MaxDamage'] * self::FED_SHIP_DAMAGE_MODIFIER);
 			$damage['Shield'] = round($damage['Shield'] * self::FED_SHIP_DAMAGE_MODIFIER);
 			$damage['Armour'] = round($damage['Armour'] * self::FED_SHIP_DAMAGE_MODIFIER);
@@ -106,7 +106,7 @@ 
 			$damage['Shield'] = round($damage['Shield'] * self::DCS_DAMAGE_MODIFIER);
 			$damage['Armour'] = round($damage['Armour'] * self::DCS_DAMAGE_MODIFIER);		
 		}
-		$damage['Launched'] = ceil($this->getNumberOfMines() * $this->getModifiedForceAccuracyAgainstPlayer($forces,$targetPlayer,$minesAreAttacker) / 100);
+		$damage['Launched'] = ceil($this->getNumberOfMines() * $this->getModifiedForceAccuracyAgainstPlayer($forces, $targetPlayer, $minesAreAttacker) / 100);
 		$damage['MaxDamage'] = ceil($damage['Launched'] * $damage['MaxDamage']);
 		$damage['Shield'] = ceil($damage['Launched'] * $damage['Shield']);
 		$damage['Armour'] = ceil($damage['Launched'] * $damage['Armour']);
@@ -123,20 +123,20 @@ 
 		return $return;
 	}
 	
-	public function &shootPlayerAsForce(SmrForce $forces, AbstractSmrPlayer $targetPlayer,$minesAreAttacker=false) {
+	public function &shootPlayerAsForce(SmrForce $forces, AbstractSmrPlayer $targetPlayer, $minesAreAttacker = false) {
 		$return = array('Weapon' => $this, 'TargetPlayer' => $targetPlayer, 'Hit' => true);
 		$this->doForceDamageToPlayer($return, $forces, $targetPlayer, $minesAreAttacker);
 		$forces->takeMines($return['ActualDamage']['Launched']);
 		return $return;
 	}
 	
-	protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer,$minesAreAttacker=false) {
-		$return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces,$targetPlayer,$minesAreAttacker);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']);
+	protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer, $minesAreAttacker = false) {
+		$return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']);
 		$return['ActualDamage']['Launched'] = ceil($return['WeaponDamage']['Launched'] * $return['ActualDamage']['TotalDamage'] / $return['WeaponDamage']['MaxDamage']);
 
-		if($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+		if ($return['ActualDamage']['KillingShot']) {
+			$return['KillResults'] = & $targetPlayer->killPlayerByForces($forces);
 		}
 		return $return;
 	}

lib/Default/Sorter.class.inc

Spacing +3 added lines, -3 removed lines

@@ -4,7 +4,7 @@ 
 	private static $reverseOrder;
 
 	private static function cmpStrProp($a, $b) {
-		return (self::$reverseOrder?-1:1)*strcasecmp($a->{self::$sortKey}, $b->{self::$sortKey});
+		return (self::$reverseOrder ?-1 : 1) * strcasecmp($a->{self::$sortKey}, $b->{self::$sortKey});
 	}
 
 	private static function cmpNumElement($a, $b) {
@@ -20,8 +20,8 @@ 
 	}
 
 	public static function cmpNum($a, $b) {
-		if($a == $b) return 0;
-		return (self::$reverseOrder?-1:1)*($a < $b ? -1 : 1);
+		if ($a == $b) return 0;
+		return (self::$reverseOrder ?-1 : 1) * ($a < $b ? -1 : 1);
 	}
 
 	public static function sortByStrProp(array &$array, $property, $reverseOrder = false) {

lib/Default/AbstractSmrCombatWeapon.class.inc

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

lib/Default/missions.inc

Spacing +10 added lines, -10 removed lines

@@ -115,13 +115,13 @@ 
 );
 
 function checkMissionRequirements(&$values, array &$mission, AbstractSmrPlayer &$player, array &$requirements = null) {
-	if($requirements == null) {
+	if ($requirements == null) {
 		return checkMissionRequirements($values, $mission, $player, $mission['Task']['Detail']);
 	}
-	foreach($requirements as $reqName => $req) {
-		if(is_string($req)) {
+	foreach ($requirements as $reqName => $req) {
+		if (is_string($req)) {
 			// Handle aliases
-			switch($reqName) {
+			switch ($reqName) {
 				case 'SectorID':
 					$reqName = 'Sector';
 					$req = array(
@@ -129,23 +129,23 @@ 
 					);
 					break;
 				default:
-					$req = str_replace(array('<Race>','<Sector>','<Starting Sector>','<trader>'),array($player->getRaceID(),$mission['Sector'],$mission['Starting Sector'],$player->getPlayerName()),$req);
+					$req = str_replace(array('<Race>', '<Sector>', '<Starting Sector>', '<trader>'), array($player->getRaceID(), $mission['Sector'], $mission['Starting Sector'], $player->getPlayerName()), $req);
 
 			}
 		}
-		if(is_array($values)) {
+		if (is_array($values)) {
 			$value = $values[$reqName];
 		}
-		else if(is_object($values)) {
+		else if (is_object($values)) {
 			$value = $values->$reqName();
 		}
-		if(is_array($req)) {
-			if(checkMissionRequirements($value, $mission, $player, $req) === false) {
+		if (is_array($req)) {
+			if (checkMissionRequirements($value, $mission, $player, $req) === false) {
 				return false;
 			}
 		}
 		else {
-			if($value != $req) {
+			if ($value != $req) {
 				return false;
 			}
 		}

lib/Default/SmrSector.class.inc

Spacing +198 added lines, -198 removed lines

@@ -35,12 +35,12 @@ 
 		}
 	}
 
-	public static function &getGalaxySectors($gameID,$galaxyID,$forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_GALAXY_SECTORS[$gameID][$galaxyID])) {
+	public static function &getGalaxySectors($gameID, $galaxyID, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_GALAXY_SECTORS[$gameID][$galaxyID])) {
 			$db = new SmrMySqlDatabase();
-			$db->query('SELECT * FROM sector WHERE game_id = ' . $db->escapeNumber($gameID) .' AND galaxy_id=' . $db->escapeNumber($galaxyID) . ' ORDER BY sector_id ASC');
+			$db->query('SELECT * FROM sector WHERE game_id = ' . $db->escapeNumber($gameID) . ' AND galaxy_id=' . $db->escapeNumber($galaxyID) . ' ORDER BY sector_id ASC');
 			$sectors = array();
-			while($db->nextRecord()) {
+			while ($db->nextRecord()) {
 				$sectorID = $db->getInt('sector_id');
 				$sectors[$sectorID] = self::getSector($gameID, $sectorID, $forceUpdate, $db);
 			}
@@ -49,12 +49,12 @@ 
 		return self::$CACHE_GALAXY_SECTORS[$gameID][$galaxyID];
 	}
 
-	public static function &getLocationSectors($gameID,$locationTypeID,$forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_LOCATION_SECTORS[$gameID][$locationTypeID])) {
+	public static function &getLocationSectors($gameID, $locationTypeID, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_LOCATION_SECTORS[$gameID][$locationTypeID])) {
 			$db = new SmrMySqlDatabase();
 			$db->query('SELECT * FROM location JOIN sector USING (game_id, sector_id) WHERE location_type_id = ' . $db->escapeNumber($locationTypeID) . ' AND game_id=' . $db->escapeNumber($gameID) . ' ORDER BY sector_id ASC');
 			$sectors = array();
-			while($db->nextRecord()) {
+			while ($db->nextRecord()) {
 				$sectorID = $db->getInt('sector_id');
 				$sectors[$sectorID] = self::getSector($gameID, $sectorID, $forceUpdate, $db);
 			}
@@ -63,8 +63,8 @@ 
 		return self::$CACHE_LOCATION_SECTORS[$gameID][$locationTypeID];
 	}
 
-	public static function &getSector($gameID, $sectorID, $forceUpdate=false, $db=null) {
-		if(!isset(self::$CACHE_SECTORS[$gameID][$sectorID]) || $forceUpdate) {
+	public static function &getSector($gameID, $sectorID, $forceUpdate = false, $db = null) {
+		if (!isset(self::$CACHE_SECTORS[$gameID][$sectorID]) || $forceUpdate) {
 			self::$CACHE_SECTORS[$gameID][$sectorID] = new SmrSector($gameID, $sectorID, false, $db);
 		}
 		return self::$CACHE_SECTORS[$gameID][$sectorID];
@@ -77,22 +77,22 @@ 
 	}
 
 	public static function saveSectors() {
-		foreach(self::$CACHE_SECTORS as $gameSectors) {
-			foreach($gameSectors as $sector) {
+		foreach (self::$CACHE_SECTORS as $gameSectors) {
+			foreach ($gameSectors as $sector) {
 				$sector->update();
 			}
 		}
 	}
 
-	public static function &createSector($gameID,$sectorID) {
-		if(!isset(self::$CACHE_SECTORS[$gameID][$sectorID])) {
-			$s = new SmrSector($gameID,$sectorID,true);
+	public static function &createSector($gameID, $sectorID) {
+		if (!isset(self::$CACHE_SECTORS[$gameID][$sectorID])) {
+			$s = new SmrSector($gameID, $sectorID, true);
 			self::$CACHE_SECTORS[$gameID][$sectorID] = $s;
 		}
 		return self::$CACHE_SECTORS[$gameID][$sectorID];
 	}
 
-	protected function __construct($gameID, $sectorID, $create=false, $db=null) {
+	protected function __construct($gameID, $sectorID, $create = false, $db = null) {
 		$this->db = new SmrMySqlDatabase();
 		$this->SQL = 'game_id = ' . $this->db->escapeNumber($gameID) . ' AND sector_id = ' . $this->db->escapeNumber($sectorID);
 
@@ -105,8 +105,8 @@ 
 			$sectorExists = $db->nextRecord();
 		}
 
-		$this->gameID = (int) $gameID;
-		$this->sectorID = (int) $sectorID;
+		$this->gameID = (int)$gameID;
+		$this->sectorID = (int)$sectorID;
 
 		if ($sectorExists) {
 			$this->galaxyID = $db->getInt('galaxy_id');
@@ -127,21 +127,21 @@ 
 			}
 			$this->warp = $db->getInt('warp');
 		}
-		else if($create) {
-			$this->battles		= 0;
+		else if ($create) {
+			$this->battles = 0;
 			$this->links = array();
 			$this->warp = 0;
-			$this->isNew		= true;
+			$this->isNew = true;
 			return;
 		}
 		else {
-			throw new SectorNotFoundException('No such sector: '.$gameID.'-'.$sectorID);
+			throw new SectorNotFoundException('No such sector: ' . $gameID . '-' . $sectorID);
 		}
 	}
 
 	function update() {
-		if($this->hasChanged) {
-			if($this->isNew===false) {
+		if ($this->hasChanged) {
+			if ($this->isNew === false) {
 				$this->db->query('UPDATE sector SET battles = ' . $this->db->escapeNumber($this->getBattles()) .
 									', galaxy_id=' . $this->db->escapeNumber($this->getGalaxyID()) .
 									', link_up=' . $this->db->escapeNumber($this->getLinkUp()) .
@@ -163,26 +163,26 @@ 
 								',' . $this->db->escapeNumber($this->getLinkRight()) .
 								',' . $this->db->escapeNumber($this->getWarp()) .
 								')');
-				$this->isNew=false;
+				$this->isNew = false;
 			}
 		}
 	}
 
 	function markVisited(AbstractSmrPlayer $player) {
-		if($this->hasPort())
+		if ($this->hasPort())
 			$this->getPort()->addCachePort($player->getAccountID());
 
 		//now delete the entry from visited
-		if(!$this->isVisited($player))
+		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;
+		$this->visited[$player->getAccountID()] = true;
 	}
 
 	function hasWeaponShop() {
 		$locations = $this->getLocations();
-		foreach($locations as $location) {
-			if($location->isWeaponSold())
+		foreach ($locations as $location) {
+			if ($location->isWeaponSold())
 				return true;
 		}
 		return false;
@@ -190,8 +190,8 @@ 
 
 	function hasHQ() {
 		$locations = $this->getLocations();
-		foreach($locations as $location) {
-			if($location->isHQ())
+		foreach ($locations as $location) {
+			if ($location->isHQ())
 				return true;
 		}
 		return false;
@@ -199,8 +199,8 @@ 
 
 	function hasUG() {
 		$locations = $this->getLocations();
-		foreach($locations as $location) {
-			if($location->isUG())
+		foreach ($locations as $location) {
+			if ($location->isUG())
 				return true;
 		}
 		return false;
@@ -208,8 +208,8 @@ 
 
 	function hasShipShop() {
 		$locations = $this->getLocations();
-		foreach($locations as $location) {
-			if($location->isShipSold())
+		foreach ($locations as $location) {
+			if ($location->isShipSold())
 				return true;
 		}
 		return false;
@@ -217,8 +217,8 @@ 
 
 	function offersFederalProtection() {
 		$locations = $this->getLocations();
-		foreach($locations as $location) {
-			if($location->isFed())
+		foreach ($locations as $location) {
+			if ($location->isFed())
 				return true;
 		}
 		return false;
@@ -227,8 +227,8 @@ 
 	public function getFedRaceIDs() {
 		$raceIDs = array();
 		$locations = $this->getLocations();
-		foreach($locations as $location) {
-			if($location->isFed())
+		foreach ($locations as $location) {
+			if ($location->isFed())
 				$raceIDs[$location->getRaceID()] = $location->getRaceID();
 		}
 		return $raceIDs;
@@ -236,8 +236,8 @@ 
 
 	function hasBar() {
 		$locations = $this->getLocations();
-		foreach($locations as $location) {
-			if($location->isBar())
+		foreach ($locations as $location) {
+			if ($location->isBar())
 				return true;
 		}
 		return false;
@@ -245,8 +245,8 @@ 
 
 	function hasHardwareShop() {
 		$locations = $this->getLocations();
-		foreach($locations as $location) {
-			if($location->isHardwareSold())
+		foreach ($locations as $location) {
+			if ($location->isHardwareSold())
 				return true;
 		}
 		return false;
@@ -254,8 +254,8 @@ 
 
 	function hasBank() {
 		$locations = $this->getLocations();
-		foreach($locations as $location) {
-			if($location->isBank())
+		foreach ($locations as $location) {
+			if ($location->isBank())
 				return true;
 		}
 		return false;
@@ -264,7 +264,7 @@ 
 	function enteringSector(AbstractSmrPlayer $player, $movementType) {
 		// send scout messages to user
 		$message = 'Your forces have spotted ' . $player->getBBLink() . ' ';
-		switch($movementType) {
+		switch ($movementType) {
 			case MOVEMENT_JUMP:
 				$message .= 'jumping into';
 			break;
@@ -278,15 +278,15 @@ 
 		$message .= ' sector ' . Globals::getSectorBBLink($this->getSectorID());
 
 		$forces = $this->getForces();
-		foreach($forces as $force) {
-			$force->ping($message,$player);
+		foreach ($forces as $force) {
+			$force->ping($message, $player);
 		}
 	}
 
 	function leavingSector(AbstractSmrPlayer $player, $movementType) {
 		// send scout messages to user
 		$message = 'Your forces have spotted ' . $player->getBBLink() . ' ';
-		switch($movementType) {
+		switch ($movementType) {
 			case MOVEMENT_JUMP:
 				$message .= 'jumping from';
 			break;
@@ -301,8 +301,8 @@ 
 
 		// iterate over all scout drones in sector
 		$forces = $this->getForces();
-		foreach($forces as $force) {
-			$force->ping($message,$player);
+		foreach ($forces as $force) {
+			$force->ping($message, $player);
 		}
 		$this->db->query('UPDATE sector_has_forces SET refresher = 0 WHERE ' . $this->SQL . '
 								AND refresher = ' . $this->db->escapeNumber($player->getAccountID()));
@@ -311,10 +311,10 @@ 
 	function diedHere(AbstractSmrPlayer $player) {
 		// iterate over all scout drones in sector
 		$forces = $this->getForces();
-		foreach($forces as $force) {
+		foreach ($forces as $force) {
 			// send scout messages to user
 			$message = 'Your forces have spotted that ' . $player->getBBLink() . ' has been <span class="red">DESTROYED</span> in sector ' . Globals::getSectorBBLink($this->sectorID);
-			$force->ping($message,$player);
+			$force->ping($message, $player);
 		}
 	}
 
@@ -331,10 +331,10 @@ 
 	}
 
 	public function setGalaxyID($galaxyID) {
-		if($this->galaxyID==$galaxyID)
+		if ($this->galaxyID == $galaxyID)
 			return;
-		$this->galaxyID=$galaxyID;
-		$this->hasChanged=true;
+		$this->galaxyID = $galaxyID;
+		$this->hasChanged = true;
 	}
 
 	public function getGalaxyName() {
@@ -342,71 +342,71 @@ 
 	}
 
 	public function getNumberOfLinks() {
-		$num=0;
-		if(!is_array($this->getLinks()))
+		$num = 0;
+		if (!is_array($this->getLinks()))
 			return $num;
-		foreach($this->getLinks() as $link)
-			if($link!==0)
+		foreach ($this->getLinks() as $link)
+			if ($link !== 0)
 				$num++;
 		return $num;
 	}
 
 	public function getNumberOfConnections() {
 		$links = $this->getNumberOfLinks();
-		if($this->hasWarp())
+		if ($this->hasWarp())
 			$links++;
 		return $links;
 	}
 
 	public function &getGalaxy() {
-		return SmrGalaxy::getGalaxy($this->getGameID(),$this->getGalaxyID());
+		return SmrGalaxy::getGalaxy($this->getGameID(), $this->getGalaxyID());
 	}
 
 	public function getNeighbourID($dir) {
-		if($this->hasLink($dir))
+		if ($this->hasLink($dir))
 			return $this->getLink($dir);
 		$galaxy = $this->getGalaxy();
 		$neighbour = $this->getSectorID();
-		switch($dir) {
+		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');
+				throw new Exception($dir . ': is not a valid direction');
 		}
 		return $neighbour;
 	}
 
 	public function getSectorDirection($sectorID) {
-		if($sectorID == $this->getSectorID())
+		if ($sectorID == $this->getSectorID())
 			return 'Current';
 		$dir = array_search($sectorID, $this->getLinks());
-		if($dir !== false)
+		if ($dir !== false)
 			return $dir;
-		if($sectorID == $this->getWarp())
+		if ($sectorID == $this->getWarp())
 			return 'Warp';
 		return 'None';
 	}
 
 	public function &getNeighbourSector($dir) {
-		return SmrSector::getSector($this->getGameID(),$this->getNeighbourID($dir));
+		return SmrSector::getSector($this->getGameID(), $this->getNeighbourID($dir));
 	}
 
 	public function getLinks() {
@@ -414,7 +414,7 @@ 
 	}
 
 	public function isLinked($sectorID) {
-		return in_array($sectorID,$this->links)||$sectorID==$this->getWarp();
+		return in_array($sectorID, $this->links) || $sectorID == $this->getWarp();
 	}
 
 	public function getLink($name) {
@@ -422,56 +422,56 @@ 
 	}
 
 	public function hasLink($name) {
-		return $this->getLink($name)!=0;
+		return $this->getLink($name) != 0;
 	}
 
 	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;
 	}
 
 	/**
 	 * Cannot be used for Warps
 	 */
-	public function setLink($name,$linkID) {
-		if($this->getLink($name)==$linkID)
+	public function setLink($name, $linkID) {
+		if ($this->getLink($name) == $linkID)
 			return;
-		if($linkID==0)
+		if ($linkID == 0)
 			unset($this->links[$name]);
 		else
 			$this->links[$name] = $linkID;
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 	}
 
 	/**
 	 * Cannot be used for Warps
 	 */
-	public function setLinkSector($dir,SmrSector $linkSector) {
-		if($this->getLink($dir)==$linkSector->getSectorID()||$linkSector->equals($this))
+	public function setLinkSector($dir, SmrSector $linkSector) {
+		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;
+		$this->setLink($dir, $linkSector->getSectorID());
+		$linkSector->setLink(self::oppositeDir($dir), $this->getSectorID());
+		$this->hasChanged = true;
 	}
 	/**
 	 * Cannot be used for Warps
 	 */
 	public function enableLink($dir) {
-		$this->setLinkSector($dir,$this->getNeighbourSector($dir));
+		$this->setLinkSector($dir, $this->getNeighbourSector($dir));
 	}
 	/**
 	 * Cannot be used for Warps
 	 */
 	public function disableLink($dir) {
-		$this->setLink($dir,0);
-		$this->getNeighbourSector($dir)->setLink(self::oppositeDir($dir),0);
+		$this->setLink($dir, 0);
+		$this->getNeighbourSector($dir)->setLink(self::oppositeDir($dir), 0);
 	}
 	/**
 	 * Cannot be used for Warps
 	 */
 	public function toggleLink($dir) {
-		if($this->hasLink($dir)) {
+		if ($this->hasLink($dir)) {
 			$this->disableLink($dir);
 		}
 		else {
@@ -480,7 +480,7 @@ 
 	}
 
 	protected static function oppositeDir($dir) {
-		switch($dir) {
+		switch ($dir) {
 			case 'Up': return 'Down';
 			case 'Down': return 'Up';
 			case 'Left': return 'Right';
@@ -494,7 +494,7 @@ 
 	}
 
 	public function setLinkUp($linkID) {
-		$this->setLink('Up',$linkID);
+		$this->setLink('Up', $linkID);
 	}
 
 	public function hasLinkUp() {
@@ -506,7 +506,7 @@ 
 	}
 
 	public function setLinkDown($linkID) {
-		$this->setLink('Down',$linkID);
+		$this->setLink('Down', $linkID);
 	}
 
 	public function hasLinkDown() {
@@ -522,7 +522,7 @@ 
 	}
 
 	public function setLinkLeft($linkID) {
-		$this->setLink('Left',$linkID);
+		$this->setLink('Left', $linkID);
 	}
 
 	public function getLinkRight() {
@@ -534,7 +534,7 @@ 
 	}
 
 	public function setLinkRight($linkID) {
-		$this->setLink('Right',$linkID);
+		$this->setLink('Right', $linkID);
 	}
 
 	/**
@@ -545,11 +545,11 @@ 
 	}
 
 	public function &getWarpSector() {
-		return SmrSector::getSector($this->getGameID(),$this->getWarp());
+		return SmrSector::getSector($this->getGameID(), $this->getWarp());
 	}
 
 	public function hasWarp() {
-		return $this->getWarp()!=0;
+		return $this->getWarp() != 0;
 	}
 
 	/**
@@ -607,65 +607,65 @@ 
 	}
 
 	public function &getPort() {
-		return SmrPort::getPort($this->getGameID(),$this->getSectorID());
+		return SmrPort::getPort($this->getGameID(), $this->getSectorID());
 	}
 
 	public function &createPort() {
-		return SmrPort::createPort($this->getGameID(),$this->getSectorID());
+		return SmrPort::createPort($this->getGameID(), $this->getSectorID());
 	}
 
 	public function removePort() {
-		SmrPort::removePort($this->getGameID(),$this->getSectorID());
+		SmrPort::removePort($this->getGameID(), $this->getSectorID());
 	}
 
-	public function hasCachedPort(AbstractSmrPlayer $player=null) {
-		return $this->getCachedPort($player)!==false;
+	public function hasCachedPort(AbstractSmrPlayer $player = null) {
+		return $this->getCachedPort($player) !== false;
 	}
 
-	public function &getCachedPort(AbstractSmrPlayer $player=null) {
-		if($player == null) {
+	public function &getCachedPort(AbstractSmrPlayer $player = null) {
+		if ($player == null) {
 			$return = false;
 			return $return;
 		}
-		return SmrPort::getCachedPort($this->getGameID(),$this->getSectorID(),$player->getAccountID());
+		return SmrPort::getCachedPort($this->getGameID(), $this->getSectorID(), $player->getAccountID());
 	}
 
 	public function hasAnyLocationsWithAction() {
-		$locations = SmrLocation::getSectorLocations($this->getGameID(),$this->getSectorID());
+		$locations = SmrLocation::getSectorLocations($this->getGameID(), $this->getSectorID());
 		$hasAction = false;
-		foreach($locations as $location) {
-			if($location->hasAction())
+		foreach ($locations as $location) {
+			if ($location->hasAction())
 				$hasAction = true;
 		}
 		return $hasAction;
 	}
 
-	public function hasLocation($locationTypeID=false) {
+	public function hasLocation($locationTypeID = false) {
 		$locations = $this->getLocations();
-		if(count($locations) == 0)
+		if (count($locations) == 0)
 			return false;
-		if($locationTypeID==false)
+		if ($locationTypeID == false)
 			return true;
-		foreach($locations as $location) {
-			if($location->getTypeID()==$locationTypeID)
+		foreach ($locations as $location) {
+			if ($location->getTypeID() == $locationTypeID)
 				return true;
 		}
 		return false;
 	}
 
 	public function &getLocations() {
-		return SmrLocation::getSectorLocations($this->getGameID(),$this->getSectorID());
+		return SmrLocation::getSectorLocations($this->getGameID(), $this->getSectorID());
 	}
 
 	public function addLocation(SmrLocation $location) {
 		$this->db->query('INSERT INTO location (game_id,sector_id,location_type_id)
 						values(' . $this->db->escapeNumber($this->getGameID()) . ',' . $this->db->escapeNumber($this->getSectorID()) . ',' . $this->db->escapeNumber($location->getTypeID()) . ')');
-		SmrLocation::getSectorLocations($this->getGameID(),$this->getSectorID(),true);
+		SmrLocation::getSectorLocations($this->getGameID(), $this->getSectorID(), true);
 	}
 
 	public function removeAllLocations() {
 		$this->db->query('DELETE FROM location WHERE ' . $this->SQL);
-		SmrLocation::getSectorLocations($this->getGameID(),$this->getSectorID(),true);
+		SmrLocation::getSectorLocations($this->getGameID(), $this->getSectorID(), true);
 	}
 
 	public function hasPlanet() {
@@ -673,27 +673,27 @@ 
 	}
 
 	public function &getPlanet() {
-		return SmrPlanet::getPlanet($this->getGameID(),$this->getSectorID());
+		return SmrPlanet::getPlanet($this->getGameID(), $this->getSectorID());
 	}
 
-	public function &createPlanet($type=1) {
-		return SmrPlanet::createPlanet($this->getGameID(),$this->getSectorID(), $type);
+	public function &createPlanet($type = 1) {
+		return SmrPlanet::createPlanet($this->getGameID(), $this->getSectorID(), $type);
 	}
 
 	public function removePlanet() {
-		SmrPlanet::removePlanet($this->getGameID(),$this->getSectorID());
+		SmrPlanet::removePlanet($this->getGameID(), $this->getSectorID());
 	}
 
 	public function hasForces() {
 		return count($this->getForces()) > 0;
 	}
 
-	public function hasEnemyForces(AbstractSmrPlayer $player=null) {
-		if($player == null || !$this->hasForces())
+	public function hasEnemyForces(AbstractSmrPlayer $player = null) {
+		if ($player == null || !$this->hasForces())
 			return false;
 		$forces = $this->getForces();
-		foreach($forces as $force) {
-			if(!$player->forceNAPAlliance($force->getOwner()))
+		foreach ($forces as $force) {
+			if (!$player->forceNAPAlliance($force->getOwner()))
 				return true;
 		}
 		return false;
@@ -701,11 +701,11 @@ 
 
 	public function &getEnemyForces(AbstractSmrPlayer $player) {
 		$enemyForces = array();
-		if(!$this->hasForces())
+		if (!$this->hasForces())
 			return $enemyForces;
 		$forces = $this->getForces();
-		foreach($forces as $force) {
-			if(!$player->forceNAPAlliance($force->getOwner()))
+		foreach ($forces as $force) {
+			if (!$player->forceNAPAlliance($force->getOwner()))
 				$enemyForces[] = $force;
 		}
 		return $enemyForces;
@@ -723,12 +723,12 @@ 
 		return false;
 	}
 
-	public function hasFriendlyForces(AbstractSmrPlayer $player=null) {
-		if($player == null || !$this->hasForces())
+	public function hasFriendlyForces(AbstractSmrPlayer $player = null) {
+		if ($player == null || !$this->hasForces())
 			return false;
 		$forces = $this->getForces();
-		foreach($forces as $force) {
-			if($player->forceNAPAlliance($force->getOwner()))
+		foreach ($forces as $force) {
+			if ($player->forceNAPAlliance($force->getOwner()))
 				return true;
 		}
 		return false;
@@ -736,22 +736,22 @@ 
 
 	public function &getFriendlyForces(AbstractSmrPlayer $player) {
 		$friendlyForces = array();
-		if(!$this->hasForces())
+		if (!$this->hasForces())
 			return $friendlyForces;
 		$forces = $this->getForces();
-		foreach($forces as $force) {
-			if($player->forceNAPAlliance($force->getOwner()))
+		foreach ($forces as $force) {
+			if ($player->forceNAPAlliance($force->getOwner()))
 				$friendlyForces[] = $force;
 		}
 		return $friendlyForces;
 	}
 
 	public function &getForces() {
-		return SmrForce::getSectorForces($this->getGameID(),$this->getSectorID());
+		return SmrForce::getSectorForces($this->getGameID(), $this->getSectorID());
 	}
 
 	public function &getPlayers() {
-		return SmrPlayer::getSectorPlayers($this->getGameID(),$this->getSectorID());
+		return SmrPlayer::getSectorPlayers($this->getGameID(), $this->getSectorID());
 	}
 
 	public function hasPlayers() {
@@ -759,7 +759,7 @@ 
 	}
 
 	public function &getOtherTraders(AbstractSmrPlayer $player) {
-		$players = SmrPlayer::getSectorPlayers($this->getGameID(),$this->getSectorID()); //Do not use & because we unset something and only want that in what we return
+		$players = SmrPlayer::getSectorPlayers($this->getGameID(), $this->getSectorID()); //Do not use & because we unset something and only want that in what we return
 		unset($players[$player->getAccountID()]);
 		return $players;
 	}
@@ -768,12 +768,12 @@ 
 		return count($this->getOtherTraders($player)) > 0;
 	}
 
-	public function hasEnemyTraders(AbstractSmrPlayer $player=null) {
-		if($player == null || !$this->hasOtherTraders($player))
+	public function hasEnemyTraders(AbstractSmrPlayer $player = null) {
+		if ($player == null || !$this->hasOtherTraders($player))
 			return false;
 		$otherPlayers = $this->getOtherTraders($player);
-		foreach($otherPlayers as $otherPlayer) {
-			if(!$player->traderNAPAlliance($otherPlayer) 
+		foreach ($otherPlayers as $otherPlayer) {
+			if (!$player->traderNAPAlliance($otherPlayer) 
 				&& !$otherPlayer->hasNewbieTurns()
 				&& !$otherPlayer->hasFederalProtection()) {
 				return true;
@@ -782,12 +782,12 @@ 
 		return false;
 	}
 
-	public function hasFriendlyTraders(AbstractSmrPlayer $player=null) {
-		if($player == null || !$this->hasOtherTraders($player))
+	public function hasFriendlyTraders(AbstractSmrPlayer $player = null) {
+		if ($player == null || !$this->hasOtherTraders($player))
 			return false;
 		$otherPlayers = $this->getOtherTraders($player);
-		foreach($otherPlayers as $otherPlayer) {
-			if($player->traderNAPAlliance($otherPlayer))
+		foreach ($otherPlayers as $otherPlayer) {
+			if ($player->traderNAPAlliance($otherPlayer))
 				return true;
 		}
 		return false;
@@ -796,7 +796,7 @@ 
 	/**
 	 * Is the $player's alliance flagship in this sector?
 	 */
-	public function hasAllianceFlagship(AbstractSmrPlayer $player=null) {
+	public function hasAllianceFlagship(AbstractSmrPlayer $player = null) {
 		if (is_null($player) || !$player->hasAlliance() || !$player->getAlliance()->hasFlagship()) {
 			return false;
 		}
@@ -809,12 +809,12 @@ 
 		return false;
 	}
 
-	public function hasProtectedTraders(AbstractSmrPlayer $player=null) {
-		if($player == null || !$this->hasOtherTraders($player))
+	public function hasProtectedTraders(AbstractSmrPlayer $player = null) {
+		if ($player == null || !$this->hasOtherTraders($player))
 			return false;
 		$otherPlayers = $this->getOtherTraders($player);
-		foreach($otherPlayers as $otherPlayer) {
-			if(!$player->traderNAPAlliance($otherPlayer) 
+		foreach ($otherPlayers as $otherPlayer) {
+			if (!$player->traderNAPAlliance($otherPlayer) 
 				&& ($otherPlayer->hasNewbieTurns() || $otherPlayer->hasFederalProtection())) {
 				return true;
 			}
@@ -829,11 +829,11 @@ 
 
 	public function &getFightingTradersAgainstPort(AbstractSmrPlayer $attackingPlayer, SmrPort $defendingPort) {
 		$fightingPlayers = array();
-		$alliancePlayers = SmrPlayer::getSectorPlayersByAlliances($this->getGameID(),$this->getSectorID(), array($attackingPlayer->getAllianceID()));
-		if(count($alliancePlayers) > 0)
-			foreach($alliancePlayers as $accountID => $player) {
-				if($player->canFight()) {
-					if($attackingPlayer->traderAttackPortAlliance($player))
+		$alliancePlayers = SmrPlayer::getSectorPlayersByAlliances($this->getGameID(), $this->getSectorID(), array($attackingPlayer->getAllianceID()));
+		if (count($alliancePlayers) > 0)
+			foreach ($alliancePlayers as $accountID => $player) {
+				if ($player->canFight()) {
+					if ($attackingPlayer->traderAttackPortAlliance($player))
 						$fightingPlayers[$accountID] = $alliancePlayers[$accountID];
 				}
 			}
@@ -842,43 +842,43 @@ 
 
 	public function &getFightingTradersAgainstPlanet(AbstractSmrPlayer $attackingPlayer, SmrPlanet $defendingPlanet) {
 		$fightingPlayers = array();
-		$alliancePlayers = SmrPlayer::getSectorPlayersByAlliances($this->getGameID(),$this->getSectorID(), array($attackingPlayer->getAllianceID()));
-		if(count($alliancePlayers) > 0) {
+		$alliancePlayers = SmrPlayer::getSectorPlayersByAlliances($this->getGameID(), $this->getSectorID(), array($attackingPlayer->getAllianceID()));
+		if (count($alliancePlayers) > 0) {
 			$planetOwner = $defendingPlanet->getOwner();
-			foreach($alliancePlayers as $accountID => $player) {
-				if($player->canFight()) {
-					if($attackingPlayer->traderAttackPlanetAlliance($player) && !$planetOwner->planetNAPAlliance($player))
+			foreach ($alliancePlayers as $accountID => $player) {
+				if ($player->canFight()) {
+					if ($attackingPlayer->traderAttackPlanetAlliance($player) && !$planetOwner->planetNAPAlliance($player))
 						$fightingPlayers[$accountID] = $alliancePlayers[$accountID];
 				}
 			}
 		}
-		return self::limitFightingTraders($fightingPlayers, $attackingPlayer, min($defendingPlanet->getMaxAttackers(),MAXIMUM_PLANET_FLEET_SIZE));
+		return self::limitFightingTraders($fightingPlayers, $attackingPlayer, min($defendingPlanet->getMaxAttackers(), MAXIMUM_PLANET_FLEET_SIZE));
 	}
 
-	public function &getFightingTraders(AbstractSmrPlayer $attackingPlayer, AbstractSmrPlayer $defendingPlayer, $checkForCloak=false) {
-		if($attackingPlayer->traderNAPAlliance($defendingPlayer))
+	public function &getFightingTraders(AbstractSmrPlayer $attackingPlayer, AbstractSmrPlayer $defendingPlayer, $checkForCloak = false) {
+		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()));
+		$alliancePlayers = SmrPlayer::getSectorPlayersByAlliances($this->getGameID(), $this->getSectorID(), array($attackingPlayer->getAllianceID(), $defendingPlayer->getAllianceID()));
 		$attackers = array();
 		$defenders = array();
-		if(count($alliancePlayers) > 0)
-			foreach($alliancePlayers as $accountID => $player) {
-				if($player->canFight()) {
-					if($attackingPlayer->traderAttackTraderAlliance($player) && !$defendingPlayer->traderDefendTraderAlliance($player) && !$defendingPlayer->traderNAPAlliance($player))
+		if (count($alliancePlayers) > 0)
+			foreach ($alliancePlayers as $accountID => $player) {
+				if ($player->canFight()) {
+					if ($attackingPlayer->traderAttackTraderAlliance($player) && !$defendingPlayer->traderDefendTraderAlliance($player) && !$defendingPlayer->traderNAPAlliance($player))
 						$attackers[] = $alliancePlayers[$accountID];
-					else if($defendingPlayer->traderDefendTraderAlliance($player) && !$attackingPlayer->traderAttackTraderAlliance($player) && !$attackingPlayer->traderNAPAlliance($player) && ($checkForCloak===false || $attackingPlayer->canSee($player)))
+					else if ($defendingPlayer->traderDefendTraderAlliance($player) && !$attackingPlayer->traderAttackTraderAlliance($player) && !$attackingPlayer->traderNAPAlliance($player) && ($checkForCloak === false || $attackingPlayer->canSee($player)))
 						$defenders[] = $alliancePlayers[$accountID];
 				}
 			}
 		$attackers = self::limitFightingTraders($attackers, $attackingPlayer, MAXIMUM_PVP_FLEET_SIZE);
 		shuffle($attackers);
-		foreach($attackers as $attacker) {
+		foreach ($attackers as $attacker) {
 			$fightingPlayers['Attackers'][$attacker->getAccountID()] = $attacker;
 		}
-		$defenders = self::limitFightingTraders($defenders,$defendingPlayer, MAXIMUM_PVP_FLEET_SIZE);
+		$defenders = self::limitFightingTraders($defenders, $defendingPlayer, MAXIMUM_PVP_FLEET_SIZE);
 		shuffle($defenders);
-		foreach($defenders as $defender) {
+		foreach ($defenders as $defender) {
 			$fightingPlayers['Defenders'][$defender->getAccountID()] = $defender;
 		}
 		return $fightingPlayers;
@@ -887,12 +887,12 @@ 
 	public static function &limitFightingTraders(array &$fightingPlayers, AbstractSmrPlayer $keepPlayer, $maximumFleetSize) {
 		// Cap fleets to the required size
 		$fleet_size = count($fightingPlayers);
-		if($fleet_size > $maximumFleetSize) {
+		if ($fleet_size > $maximumFleetSize) {
 			// We use random key to stop the same people being capped all the time
-			for($j=0;$j<$fleet_size-$maximumFleetSize;++$j) {
+			for ($j = 0; $j < $fleet_size - $maximumFleetSize; ++$j) {
 				do {
 					$key = array_rand($fightingPlayers);
-				} while($keepPlayer->equals($fightingPlayers[$key]));
+				} while ($keepPlayer->equals($fightingPlayers[$key]));
 				unset($fightingPlayers[$key]);
 			}
 		}
@@ -901,11 +901,11 @@ 
 
 	public function &getPotentialFightingTraders(AbstractSmrPlayer $attackingPlayer) {
 		$fightingPlayers = array();
-		$alliancePlayers = SmrPlayer::getSectorPlayersByAlliances($this->getGameID(),$this->getSectorID(), array($attackingPlayer->getAllianceID()));
-		if(count($alliancePlayers) > 0)
-			foreach($alliancePlayers as $accountID => $player) {
-				if($player->canFight()) {
-					if($attackingPlayer->traderAttackTraderAlliance($player))
+		$alliancePlayers = SmrPlayer::getSectorPlayersByAlliances($this->getGameID(), $this->getSectorID(), array($attackingPlayer->getAllianceID()));
+		if (count($alliancePlayers) > 0)
+			foreach ($alliancePlayers as $accountID => $player) {
+				if ($player->canFight()) {
+					if ($attackingPlayer->traderAttackTraderAlliance($player))
 						$fightingPlayers['Attackers'][$accountID] = $player;
 				}
 			}
@@ -917,32 +917,32 @@ 
 	}
 
 	public function setBattles($amount) {
-		if($this->battles == $amount)
+		if ($this->battles == $amount)
 			return;
 		$this->battles = $amount;
 		$this->hasChanged = true;
 	}
 
 	public function decreaseBattles($amount) {
-		$this->setBattles($this->battles-$amount);
+		$this->setBattles($this->battles - $amount);
 	}
 
 	public function increaseBattles($amount) {
-		$this->setBattles($this->battles+$amount);
+		$this->setBattles($this->battles + $amount);
 	}
 
 	function equals(SmrSector $otherSector) {
-		return $otherSector->getSectorID()==$this->getSectorID() && $otherSector->getGameID()==$this->getGameID();
+		return $otherSector->getSectorID() == $this->getSectorID() && $otherSector->getGameID() == $this->getGameID();
 	}
 
 	function isLinkedSector(SmrSector $otherSector) {
-		return $otherSector->getGameID()==$this->getGameID() && $this->isLinked($otherSector->getSectorID());
+		return $otherSector->getGameID() == $this->getGameID() && $this->isLinked($otherSector->getSectorID());
 	}
 
-	public function isVisited(AbstractSmrPlayer $player=null) {
-		if($player===null)
+	public function isVisited(AbstractSmrPlayer $player = null) {
+		if ($player === null)
 			return true;
-		if(!isset($this->visited[$player->getAccountID()])) {
+		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();
 		}
@@ -958,15 +958,15 @@ 
 	}
 
 	public function getGalaxyMapHREF() {
-		return '?sector_id='.$this->getSectorID();
+		return '?sector_id=' . $this->getSectorID();
 	}
 
 	public function getScanSectorHREF() {
 		return Globals::getSectorScanHREF($this->getSectorID());
 	}
 
-	public function hasX(/*Object*/ $x, AbstractSmrPlayer $player=null) {
-		if($x instanceof SmrSector) {
+	public function hasX(/*Object*/ $x, AbstractSmrPlayer $player = null) {
+		if ($x instanceof SmrSector) {
 			return $this->equals($x);
 		}
 		if ($x == 'Port') {
@@ -982,16 +982,16 @@ 
 			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;
 
-		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'))) //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'))) //Check if it's possible for location to have X, hacky but nice performance gains
 			if ($this->hasLocation()) {
 				$locations = $this->getLocations();
 				foreach ($locations as $l) {
-					if ($l->hasX($x,$player))
+					if ($l->hasX($x, $player))
 						return true;
 				}
 			}

lib/Default/SmrForce.class.inc

Spacing +114 added lines, -114 removed lines

@@ -20,19 +20,19 @@ 
 	protected $ownerID;
 	protected $sectorID;
 	protected $gameID;
-	protected $combatDrones=0;
-	protected $scoutDrones=0;
-	protected $mines=0;
-	protected $expire=0;
+	protected $combatDrones = 0;
+	protected $scoutDrones = 0;
+	protected $mines = 0;
+	protected $expire = 0;
 
 	protected $isNew;
 	protected $hasChanged = false;
 
 	public static function refreshCache() {
-		foreach(self::$CACHE_FORCES as $gameID => &$gameForces) {
-			foreach($gameForces as $sectorID => &$gameSectorForces) {
-				foreach($gameSectorForces as $ownerID => &$forces) {
-					$forces = self::getForce($gameID,$sectorID,$ownerID,true);
+		foreach (self::$CACHE_FORCES as $gameID => &$gameForces) {
+			foreach ($gameForces as $sectorID => &$gameSectorForces) {
+				foreach ($gameSectorForces as $ownerID => &$forces) {
+					$forces = self::getForce($gameID, $sectorID, $ownerID, true);
 				}
 			}
 		}
@@ -44,22 +44,22 @@ 
 	}
 
 	public static function saveForces() {
-		foreach(self::$CACHE_FORCES as $gameForces) {
-			foreach($gameForces as $gameSectorForces) {
-				foreach($gameSectorForces as $forces) {
+		foreach (self::$CACHE_FORCES as $gameForces) {
+			foreach ($gameForces as $gameSectorForces) {
+				foreach ($gameSectorForces as $forces) {
 					$forces->update();
 				}
 			}
 		}
 	}
 
-	public static function &getSectorForces($gameID,$sectorID,$forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_SECTOR_FORCES[$gameID][$sectorID])) {
-			self::tidyUpForces(SmrGalaxy::getGalaxyContaining($gameID,$sectorID));
+	public static function &getSectorForces($gameID, $sectorID, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_SECTOR_FORCES[$gameID][$sectorID])) {
+			self::tidyUpForces(SmrGalaxy::getGalaxyContaining($gameID, $sectorID));
 			$db = new SmrMySqlDatabase();
 			$db->query('SELECT * FROM sector_has_forces WHERE sector_id = ' . $db->escapeNumber($sectorID) . ' AND game_id=' . $db->escapeNumber($gameID) . ' ORDER BY expire_time ASC');
 			$forces = array();
-			while($db->nextRecord()) {
+			while ($db->nextRecord()) {
 				$ownerID = $db->getInt('owner_id');
 				$forces[$ownerID] = self::getForce($gameID, $sectorID, $ownerID, $forceUpdate, $db);
 			}
@@ -68,9 +68,9 @@ 
 		return self::$CACHE_SECTOR_FORCES[$gameID][$sectorID];
 	}
 
-	public static function &getForce($gameID, $sectorID, $ownerID, $forceUpdate=false, $db=null) {
-		if($forceUpdate || !isset(self::$CACHE_FORCES[$gameID][$sectorID][$ownerID])) {
-			self::tidyUpForces(SmrGalaxy::getGalaxyContaining($gameID,$sectorID));
+	public static function &getForce($gameID, $sectorID, $ownerID, $forceUpdate = false, $db = null) {
+		if ($forceUpdate || !isset(self::$CACHE_FORCES[$gameID][$sectorID][$ownerID])) {
+			self::tidyUpForces(SmrGalaxy::getGalaxyContaining($gameID, $sectorID));
 			$p = new SmrForce($gameID, $sectorID, $ownerID, $db);
 			self::$CACHE_FORCES[$gameID][$sectorID][$ownerID] = $p;
 		}
@@ -78,24 +78,24 @@ 
 	}
 
 	public static function tidyUpForces(SmrGalaxy $galaxyToTidy) {
-		if(!isset(self::$TIDIED_UP[$galaxyToTidy->getGameID()][$galaxyToTidy->getGalaxyID()])) {
+		if (!isset(self::$TIDIED_UP[$galaxyToTidy->getGameID()][$galaxyToTidy->getGalaxyID()])) {
 			self::$TIDIED_UP[$galaxyToTidy->getGameID()][$galaxyToTidy->getGalaxyID()] = true;
 			$db = new SmrMySqlDatabase();
 			$db->query('UPDATE sector_has_forces
 						SET refresher=0,
 							expire_time = (refresh_at + if(combat_drones+mines=0,
-															LEAST('.$db->escapeNumber(self::LOWEST_MAX_EXPIRE_SCOUTS_ONLY).', scout_drones*'.$db->escapeNumber(self::TIME_PER_SCOUT_ONLY).'),
-															LEAST('.$db->escapeNumber($galaxyToTidy->getMaxForceTime()).', (combat_drones*'.$db->escapeNumber(self::TIME_PERCENT_PER_COMBAT).'+scout_drones*'.$db->escapeNumber(self::TIME_PERCENT_PER_SCOUT).'+mines*'.$db->escapeNumber(self::TIME_PERCENT_PER_MINE).')*'.$db->escapeNumber($galaxyToTidy->getMaxForceTime()).')
+															LEAST('.$db->escapeNumber(self::LOWEST_MAX_EXPIRE_SCOUTS_ONLY) . ', scout_drones*' . $db->escapeNumber(self::TIME_PER_SCOUT_ONLY) . '),
+															LEAST('.$db->escapeNumber($galaxyToTidy->getMaxForceTime()) . ', (combat_drones*' . $db->escapeNumber(self::TIME_PERCENT_PER_COMBAT) . '+scout_drones*' . $db->escapeNumber(self::TIME_PERCENT_PER_SCOUT) . '+mines*' . $db->escapeNumber(self::TIME_PERCENT_PER_MINE) . ')*' . $db->escapeNumber($galaxyToTidy->getMaxForceTime()) . ')
 														))
-						WHERE game_id = '.$db->escapeNumber($galaxyToTidy->getGameID()).' AND sector_id >= '.$db->escapeNumber($galaxyToTidy->getStartSector()).' AND sector_id <= '.$db->escapeNumber($galaxyToTidy->getEndSector()).' AND refresher != 0 AND refresh_at <= '.$db->escapeNumber(TIME));
+						WHERE game_id = '.$db->escapeNumber($galaxyToTidy->getGameID()) . ' AND sector_id >= ' . $db->escapeNumber($galaxyToTidy->getStartSector()) . ' AND sector_id <= ' . $db->escapeNumber($galaxyToTidy->getEndSector()) . ' AND refresher != 0 AND refresh_at <= ' . $db->escapeNumber(TIME));
 			$db->query('DELETE FROM sector_has_forces WHERE expire_time < ' . $db->escapeNumber(TIME));
 		}
 	}
 
-	protected function __construct($gameID, $sectorID, $ownerID, $db=null) {
+	protected function __construct($gameID, $sectorID, $ownerID, $db = null) {
 		$this->db = new SmrMySqlDatabase();
-		$this->SQL = 'game_id = '.$this->db->escapeNumber($gameID).'
-		              AND sector_id = '.$this->db->escapeNumber($sectorID).'
+		$this->SQL = 'game_id = ' . $this->db->escapeNumber($gameID) . '
+		              AND sector_id = '.$this->db->escapeNumber($sectorID) . '
 		              AND owner_id = '.$this->db->escapeNumber($ownerID);
 
 		if (isset($db)) {
@@ -118,7 +118,7 @@ 
 	}
 
 	public function exists() {
-		return ($this->hasCDs()||$this->hasSDs()||$this->hasMines())&&!$this->hasExpired();
+		return ($this->hasCDs() || $this->hasSDs() || $this->hasMines()) && !$this->hasExpired();
 	}
 	public function getTypeID() {
 		return $this->typeID;
@@ -137,34 +137,34 @@ 
 	}
 
 	public function getHREF() {
-		if(!isset($this->HREF)) {
+		if (!isset($this->HREF)) {
 			$this->HREF = SmrSession::getNewHREF(create_container('skeleton.php', $this->getProcessor()));
 		}
 		return $this->HREF;
 	}
 
 	public function canAcceptCDs() {
-		return $this->getCDs()<50;
+		return $this->getCDs() < 50;
 	}
 
 	public function canAcceptSDs() {
-		return $this->getSDs()<5;
+		return $this->getSDs() < 5;
 	}
 
 	public function canAcceptMines() {
-		return $this->getMines()<50;
+		return $this->getMines() < 50;
 	}
 
 	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() {
@@ -180,52 +180,52 @@ 
 	}
 
 	public function addMines($amount) {
-		if($amount<0) {
+		if ($amount < 0) {
 			throw new Exception('Cannot add negative mines.');
 		}
 		$this->setMines($this->getMines() + $amount);
 	}
 
 	public function addCDs($amount) {
-		if($amount<0) {
+		if ($amount < 0) {
 			throw new Exception('Cannot add negative CDs.');
 		}
 		$this->setCDs($this->getCDs() + $amount);
 	}
 
 	public function addSDs($amount) {
-		if($amount<0) {
+		if ($amount < 0) {
 			throw new Exception('Cannot add negative SDs.');
 		}
 		$this->setSDs($this->getSDs() + $amount);
 	}
 
 	public function takeMines($amount) {
-		if($amount<0) {
+		if ($amount < 0) {
 			throw new Exception('Cannot take negative mines.');
 		}
 		$this->setMines($this->getMines() - $amount);
 	}
 
 	public function takeCDs($amount) {
-		if($amount<0) {
+		if ($amount < 0) {
 			throw new Exception('Cannot take negative CDs.');
 		}
 		$this->setCDs($this->getCDs() - $amount);
 	}
 
 	public function takeSDs($amount) {
-		if($amount<0) {
+		if ($amount < 0) {
 			throw new Exception('Cannot take negative SDs.');
 		}
 		$this->setSDs($this->getSDs() - $amount);
 	}
 
 	public function setMines($amount) {
-		if($amount<0) {
+		if ($amount < 0) {
 			throw new Exception('Cannot set negative mines.');
 		}
-		if($amount==$this->getMines()) {
+		if ($amount == $this->getMines()) {
 			return;
 		}
 		$this->hasChanged = true;
@@ -233,10 +233,10 @@ 
 	}
 
 	public function setCDs($amount) {
-		if($amount<0) {
+		if ($amount < 0) {
 			throw new Exception('Cannot set negative CDs.');
 		}
-		if($amount==$this->getCDs()) {
+		if ($amount == $this->getCDs()) {
 			return;
 		}
 		$this->hasChanged = true;
@@ -244,10 +244,10 @@ 
 	}
 
 	public function setSDs($amount) {
-		if($amount<0) {
+		if ($amount < 0) {
 			throw new Exception('Cannot set negative SDs.');
 		}
-		if($amount==$this->getSDs()) {
+		if ($amount == $this->getSDs()) {
 			return;
 		}
 		$this->hasChanged = true;
@@ -255,7 +255,7 @@ 
 	}
 
 	public function hasExpired() {
-		return $this->expire<TIME;
+		return $this->expire < TIME;
 	}
 
 	public function getExpire() {
@@ -263,38 +263,38 @@ 
 	}
 
 	public function setExpire($time) {
-		if($time<0) {
+		if ($time < 0) {
 			throw new Exception('Cannot set negative expiry.');
 		}
-		if($time==$this->getExpire()) {
+		if ($time == $this->getExpire()) {
 			return;
 		}
-		if($time > TIME + $this->getMaxExpireTime()) {
+		if ($time > TIME + $this->getMaxExpireTime()) {
 			$time = TIME + $this->getMaxExpireTime();
 		}
 		$this->hasChanged = true;
 		$this->expire = $time;
-		if(!$this->isNew)
+		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();
+		if ($this->getCDs() == 0 && $this->getMines() == 0 && $this->getSDs() > 0) {
+			$time = self::TIME_PER_SCOUT_ONLY * $this->getSDs();
 		}
 		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();
+			$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);
 	}
 
 	public function getMaxExpireTime() {
-		if($this->hasCDs()||$this->hasMines()) {
+		if ($this->hasCDs() || $this->hasMines()) {
 			return $this->getMaxGalaxyExpireTime();
 		}
-		if(!$this->hasCDs() && !$this->hasMines() && $this->hasSDs()) {
-			return max(self::LOWEST_MAX_EXPIRE_SCOUTS_ONLY,$this->getMaxGalaxyExpireTime());
+		if (!$this->hasCDs() && !$this->hasMines() && $this->hasSDs()) {
+			return max(self::LOWEST_MAX_EXPIRE_SCOUTS_ONLY, $this->getMaxGalaxyExpireTime());
 		}
 		return 0;
 	}
@@ -305,26 +305,26 @@ 
 
 	public function getBumpTurnCost(AbstractSmrShip $ship) {
 		$mines = $this->getMines();
-		if($mines <= 1) {
+		if ($mines <= 1) {
 			return 0;
 		}
-		if($mines < 10) {
+		if ($mines < 10) {
 			$turns = 1;
 		}
-		else if($mines < 25) {
+		else if ($mines < 25) {
 			$turns = 2;
 		}
 		else {
 			$turns = 3;
 		}
-		if($ship->isFederal() || $ship->hasDCS()) {
+		if ($ship->isFederal() || $ship->hasDCS()) {
 			$turns -= 1;
 		}
 		return $turns;
 	}
 
 	public function getAttackTurnCost(AbstractSmrShip $ship) {
-		if($ship->isFederal() || $ship->hasDCS()) {
+		if ($ship->isFederal() || $ship->hasDCS()) {
 			return 2;
 		}
 		return 3;
@@ -339,45 +339,45 @@ 
 	}
 
 	public function &getSector() {
-		return SmrSector::getSector($this->getGameID(),$this->getSectorID());
+		return SmrSector::getSector($this->getGameID(), $this->getSectorID());
 	}
 
 	public function getSectorID() {
 		return $this->sectorID;
 	}
 
-	public function ping($pingMessage, AbstractSmrPlayer $playerPinging, $skipCheck=false) {
-		if(!$this->hasSDs() && !$skipCheck) {
+	public function ping($pingMessage, AbstractSmrPlayer $playerPinging, $skipCheck = false) {
+		if (!$this->hasSDs() && !$skipCheck) {
 			return;
 		}
 		$owner = $this->getOwner();
-		if(!$playerPinging->sameAlliance($owner)) {
-			$playerPinging->sendMessage($owner->getAccountID(), MSG_SCOUT, $pingMessage,false);
+		if (!$playerPinging->sameAlliance($owner)) {
+			$playerPinging->sendMessage($owner->getAccountID(), MSG_SCOUT, $pingMessage, false);
 		}
 	}
 
 	function &getGalaxy() {
-		return SmrGalaxy::getGalaxyContaining($this->getGameID(),$this->getSectorID());
+		return SmrGalaxy::getGalaxyContaining($this->getGameID(), $this->getSectorID());
 	}
 
 	function &getOwner() {
-		return SmrPlayer::getPlayer($this->getOwnerID(),$this->getGameID());
+		return SmrPlayer::getPlayer($this->getOwnerID(), $this->getGameID());
 	}
 
 	public function update() {
-		if(!$this->isNew) {
+		if (!$this->isNew) {
 			if (!$this->exists()) {
 				$this->db->query('DELETE FROM sector_has_forces WHERE ' . $this->SQL);
-				$this->isNew=true;
+				$this->isNew = true;
 			}
 			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);
+				$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;
+								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;
 		}
 		// This instance is now in sync with the database
 		$this->hasChanged = false;
@@ -392,20 +392,20 @@ 
 
 	public function getExamineDropForcesHREF() {
 		$container = create_container('skeleton.php', 'forces_drop.php');
-		$container['owner_id']	= $this->getOwnerID();
+		$container['owner_id'] = $this->getOwnerID();
 		return SmrSession::getNewHREF($container);
 	}
 
 	public function getAttackForcesHREF() {
 		$container = create_container('forces_attack_processing.php');
 		$container['action'] = 'attack';
-		$container['owner_id']	= $this->getOwnerID();
+		$container['owner_id'] = $this->getOwnerID();
 		return SmrSession::getNewHREF($container);
 	}
 
 	public function getRefreshHREF() {
 		$container = create_container('forces_refresh_processing.php');
-		$container['owner_id']	= $this->getOwnerID();
+		$container['owner_id'] = $this->getOwnerID();
 		return SmrSession::getNewHREF($container);
 	}
 
@@ -415,74 +415,74 @@ 
 
 	public function getDropSDHREF() {
 		$container = $this->getDropContainer();
-		$container['drop_scout_drones']	= 1;
+		$container['drop_scout_drones'] = 1;
 		return SmrSession::getNewHREF($container);
 	}
 
 	public function getTakeSDHREF() {
 		$container = $this->getDropContainer();
-		$container['take_scout_drones']	= 1;
+		$container['take_scout_drones'] = 1;
 		return SmrSession::getNewHREF($container);
 	}
 
 	public function getDropCDHREF() {
 		$container = $this->getDropContainer();
-		$container['drop_combat_drones']	= 1;
+		$container['drop_combat_drones'] = 1;
 		return SmrSession::getNewHREF($container);
 	}
 
 	public function getTakeCDHREF() {
 		$container = $this->getDropContainer();
-		$container['take_combat_drones']	= 1;
+		$container['take_combat_drones'] = 1;
 		return SmrSession::getNewHREF($container);
 	}
 
 	public function getDropMineHREF() {
 		$container = $this->getDropContainer();
-		$container['drop_mines']	= 1;
+		$container['drop_mines'] = 1;
 		return SmrSession::getNewHREF($container);
 	}
 
 	public function getTakeMineHREF() {
 		$container = $this->getDropContainer();
-		$container['take_mines']	= 1;
+		$container['take_mines'] = 1;
 		return SmrSession::getNewHREF($container);
 	}
 
 	public static function getRefreshAllHREF() {
 		$container = array();
-		$container['url']		= 'forces_mass_refresh.php';
+		$container['url'] = 'forces_mass_refresh.php';
 		return SmrSession::getNewHREF($container);
 	}
 
-	public function &shootPlayer(AbstractSmrPlayer $targetPlayer,$minesAreAttacker) {
-		return $this->shootPlayers(array($targetPlayer),$minesAreAttacker);
+	public function &shootPlayer(AbstractSmrPlayer $targetPlayer, $minesAreAttacker) {
+		return $this->shootPlayers(array($targetPlayer), $minesAreAttacker);
 	}
 
-	public function &shootPlayers(array $targetPlayers,$minesAreAttacker) {
+	public function &shootPlayers(array $targetPlayers, $minesAreAttacker) {
 		$results = array('TotalDamage' => 0);
-		if(!$this->exists()) {
+		if (!$this->exists()) {
 			$results['DeadBeforeShot'] = true;
 			return $results;
 		}
 		$results['DeadBeforeShot'] = false;
 
-		if($this->hasMines()) {
-			$thisMines = new SmrMines($this->getGameID(),$this->getMines());
-			$results['Results']['Mines'] =& $thisMines->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)],$minesAreAttacker);
+		if ($this->hasMines()) {
+			$thisMines = new SmrMines($this->getGameID(), $this->getMines());
+			$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)]);
+		if ($this->hasCDs()) {
+			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
+			$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)]);
+		if (!$minesAreAttacker) {
+			if ($this->hasSDs()) {
+				$thisSDs = new SmrScoutDrones($this->getGameID(), $this->getSDs());
+				$results['Results']['Scouts'] = & $thisSDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
 				$results['TotalDamage'] += $results['Results']['Scouts']['ActualDamage']['TotalDamage'];
 			}
 		}
@@ -496,16 +496,16 @@ 
 		$minesDamage = 0;
 		$cdDamage = 0;
 		$sdDamage = 0;
-		if(!$alreadyDead) {
-			$minesDamage = $this->doMinesDamage(min($damage['MaxDamage'],$damage['Armour']));
+		if (!$alreadyDead) {
+			$minesDamage = $this->doMinesDamage(min($damage['MaxDamage'], $damage['Armour']));
 			$damage['Armour'] -= $minesDamage;
 			$damage['MaxDamage'] -= $minesDamage;
-			if(!$this->hasMines() && ($minesDamage == 0 || $damage['Rollover'])) {
-				$cdDamage = $this->doCDDamage(min($damage['MaxDamage'],$damage['Armour']));
+			if (!$this->hasMines() && ($minesDamage == 0 || $damage['Rollover'])) {
+				$cdDamage = $this->doCDDamage(min($damage['MaxDamage'], $damage['Armour']));
 				$damage['Armour'] -= $cdDamage;
 				$damage['MaxDamage'] -= $cdDamage;
-				if(!$this->hasCDs() && ($cdDamage == 0 || $damage['Rollover'])) {
-					$sdDamage = $this->doSDDamage(min($damage['MaxDamage'],$damage['Armour']));
+				if (!$this->hasCDs() && ($cdDamage == 0 || $damage['Rollover'])) {
+					$sdDamage = $this->doSDDamage(min($damage['MaxDamage'], $damage['Armour']));
 				}
 			}
 		}
@@ -513,35 +513,35 @@ 
 						'KillingShot' => !$alreadyDead && !$this->exists(),
 						'TargetAlreadyDead' => $alreadyDead,
 						'Mines' => $minesDamage,
-						'NumMines' => $minesDamage/MINE_ARMOUR,
+						'NumMines' => $minesDamage / MINE_ARMOUR,
 						'HasMines' => $this->hasMines(),
 						'CDs' => $cdDamage,
-						'NumCDs' => $cdDamage/CD_ARMOUR,
+						'NumCDs' => $cdDamage / CD_ARMOUR,
 						'HasCDs' => $this->hasCDs(),
 						'SDs' => $sdDamage,
-						'NumSDs' => $sdDamage/SD_ARMOUR,
+						'NumSDs' => $sdDamage / SD_ARMOUR,
 						'HasSDs' => $this->hasSDs(),
-						'TotalDamage' => $minesDamage+$cdDamage+$sdDamage
+						'TotalDamage' => $minesDamage + $cdDamage + $sdDamage
 		);
 		return $return;
 	}
 
 	protected function doMinesDamage($damage) {
-		$actualDamage = min($this->getMines(),floor($damage/MINE_ARMOUR));
+		$actualDamage = min($this->getMines(), floor($damage / MINE_ARMOUR));
 		$this->takeMines($actualDamage);
-		return $actualDamage*MINE_ARMOUR;
+		return $actualDamage * MINE_ARMOUR;
 	}
 
 	protected function doCDDamage($damage) {
-		$actualDamage = min($this->getCDs(),floor($damage/CD_ARMOUR));
+		$actualDamage = min($this->getCDs(), floor($damage / CD_ARMOUR));
 		$this->takeCDs($actualDamage);
-		return $actualDamage*CD_ARMOUR;
+		return $actualDamage * CD_ARMOUR;
 	}
 
 	protected function doSDDamage($damage) {
-		$actualDamage = min($this->getSDs(),floor($damage/SD_ARMOUR));
+		$actualDamage = min($this->getSDs(), floor($damage / SD_ARMOUR));
 		$this->takeSDs($actualDamage);
-		return $actualDamage*SD_ARMOUR;
+		return $actualDamage * SD_ARMOUR;
 	}
 
 	public function &killForcesByPlayer(AbstractSmrPlayer $killer) {