smrealms / smr

lib/Default/gov.functions.inc

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  */
 function getBounties($type) {
 	$db = new SmrMySqlDatabase();
-	$db->query('SELECT * FROM bounty WHERE game_id = '.$db->escapeNumber(SmrSession::getGameID()).' AND type ='.$db->escapeString($type).' AND claimer_id = 0 ORDER BY amount DESC');
+	$db->query('SELECT * FROM bounty WHERE game_id = ' . $db->escapeNumber(SmrSession::getGameID()) . ' AND type =' . $db->escapeString($type) . ' AND claimer_id = 0 ORDER BY amount DESC');
 	$bounties = [];
 	while ($db->nextRecord()) {
 		$bounties[] = [

lib/Default/SmrWeapon.class.inc

Spacing +39 added lines, -39 removed lines

@@ -12,12 +12,12 @@ 
 
 	
 	protected static function initialiseDatabase() {
-		if(self::$db==null)
+		if (self::$db == null)
 			self::$db = new SmrMySqlDatabase();
 	}
 
-	public static function &getWeapon($weaponTypeID, $forceUpdate=false, $db=null) {
-		if($forceUpdate || !isset(self::$CACHE_WEAPONS[$weaponTypeID])) {
+	public static function &getWeapon($weaponTypeID, $forceUpdate = false, $db = null) {
+		if ($forceUpdate || !isset(self::$CACHE_WEAPONS[$weaponTypeID])) {
 			$w = new SmrWeapon($weaponTypeID, $db);
 			if ($w->exists())
 				self::$CACHE_WEAPONS[$weaponTypeID] = $w;
@@ -27,17 +27,17 @@ 
 		return self::$CACHE_WEAPONS[$weaponTypeID];
 	}
 
-	public static function &getAllWeapons($forceUpdate=false) {
+	public static function &getAllWeapons($forceUpdate = false) {
 		$db = new SmrMySqlDatabase();
 		$db->query('SELECT * FROM weapon_type');
-		$weapons=array();
-		while($db->nextRecord()) {
+		$weapons = array();
+		while ($db->nextRecord()) {
 			$weapons[] = self::getWeapon($db->getInt('weapon_type_id'), $forceUpdate, $db);
 		}
 		return $weapons;
 	}
 	
-	protected function __construct($weaponTypeID, $db=null) {
+	protected function __construct($weaponTypeID, $db = null) {
 		
 		$this->weaponTypeID = $weaponTypeID;
 		
@@ -61,7 +61,7 @@ 
 			$this->buyerRestriction = $db->getInt('buyer_restriction');
 			$this->damageRollover = false;
 			$this->raidWeapon = false;
-			$this->maxDamage = max($this->shieldDamage,$this->armourDamage);
+			$this->maxDamage = max($this->shieldDamage, $this->armourDamage);
 		}
 	}
 
@@ -101,7 +101,7 @@ 
 	}
 	
 	protected function &getWeightedRandomForPlayer(AbstractSmrPlayer $player) {
-		return WeightedRandom::getWeightedRandomForPlayer($player,'Weapon',$this->getWeaponTypeID());
+		return WeightedRandom::getWeightedRandomForPlayer($player, 'Weapon', $this->getWeaponTypeID());
 	}
 	
 	protected function checkMiss(AbstractSmrPlayer $player, $percent) {
@@ -109,14 +109,14 @@ 
 	}
 	
 	public static function getPlayerLevelAccuracyMod(AbstractSmrPlayer $player) {
-		return ($player->getLevelID()*$player->getLevelID()/60+$player->getLevelID()/2+2) / 100;
+		return ($player->getLevelID() * $player->getLevelID() / 60 + $player->getLevelID() / 2 + 2) / 100;
 	}
 	
 	public function getModifiedAccuracy(AbstractSmrPlayer $weaponPlayer) {
 		$modifiedAccuracy = $this->getBaseAccuracy();
 		$modifiedAccuracy += $this->getBaseAccuracy() * self::getPlayerLevelAccuracyMod($weaponPlayer);
 		if ($weaponPlayer->isGadgetEquipped('Increased Accuracy'))
-			$modifiedAccuracy += $this->getBaseAccuracy() * INCREASED_ACC_GADGET_FACTOR/100;
+			$modifiedAccuracy += $this->getBaseAccuracy() * INCREASED_ACC_GADGET_FACTOR / 100;
 		return $modifiedAccuracy;
 	}
 	
@@ -127,13 +127,13 @@ 
 	
 	public function getModifiedAccuracyAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
 		$modifiedAccuracy = $this->getModifiedAccuracy($weaponPlayer);
-		$modifiedAccuracy -= $this->getBaseAccuracy() * $port->getLevel()/50;
+		$modifiedAccuracy -= $this->getBaseAccuracy() * $port->getLevel() / 50;
 		return $modifiedAccuracy;
 	}
 	
 	public function getModifiedAccuracyAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) {
 		$modifiedAccuracy = $this->getModifiedAccuracy($weaponPlayer);
-		$modifiedAccuracy -= $this->getBaseAccuracy() * $planet->getLevel()/350;
+		$modifiedAccuracy -= $this->getBaseAccuracy() * $planet->getLevel() / 350;
 		return $modifiedAccuracy;
 	}
 	
@@ -141,13 +141,13 @@ 
 		$modifiedAccuracy = $this->getModifiedAccuracy($weaponPlayer);
 		$modifiedAccuracy -= $this->getBaseAccuracy() * self::getPlayerLevelAccuracyMod($targetPlayer) / 2;
 		if ($targetPlayer->isGadgetEquipped('Increased Maneuverability'))
-			$modifiedAccuracy -= $this->getBaseAccuracy() * INCREASED_MAN_GADGET_FACTOR/100;
+			$modifiedAccuracy -= $this->getBaseAccuracy() * INCREASED_MAN_GADGET_FACTOR / 100;
 		
 		$weaponShip = $weaponPlayer->getShip();
 		$targetShip = $targetPlayer->getShip();
 		$mrDiff = $targetShip->getMR() - $weaponShip->getMR();
-		if($mrDiff > 0)
-			$modifiedAccuracy -= $this->getBaseAccuracy() * ($mrDiff/MR_FACTOR)/100;
+		if ($mrDiff > 0)
+			$modifiedAccuracy -= $this->getBaseAccuracy() * ($mrDiff / MR_FACTOR) / 100;
 	
 		return $modifiedAccuracy;
 	}
@@ -182,7 +182,7 @@ 
 	public function &getModifiedDamage(AbstractSmrPlayer $weaponPlayer) {
 		$damage = $this->getDamage();
 		//do they have the weapon damage gadget?
-		if($weaponPlayer->isGadgetEquipped('Increased Weapon Damage')) {
+		if ($weaponPlayer->isGadgetEquipped('Increased Weapon Damage')) {
 			$damage['MaxDamage'] += $this->getMaxDamage() * INCREASED_DAMAGE_GADGET_FACTOR;
 			$damage['Shield'] += $this->getShieldDamage() * INCREASED_DAMAGE_GADGET_FACTOR;
 			$damage['Armour'] += $this->getArmourDamage() * INCREASED_DAMAGE_GADGET_FACTOR;
@@ -191,23 +191,23 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		if(!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage($weaponPlayer);
+		$damage = & $this->getModifiedDamage($weaponPlayer);
 		return $damage;
 	}
 	
 	public function &getModifiedDamageAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		if(!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage($weaponPlayer);
+		$damage = & $this->getModifiedDamage($weaponPlayer);
 		return $damage;
 	}
 	
 	public function &getModifiedDamageAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) {
-		if(!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
-		$damage =& $this->getModifiedDamage($weaponPlayer);
+		$damage = & $this->getModifiedDamage($weaponPlayer);
 		
 		$planetMod = self::PLANET_DAMAGE_MOD;
 		$damage['MaxDamage'] = ceil($damage['MaxDamage'] * $planetMod);
@@ -223,16 +223,16 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstPlayer(AbstractSmrPlayer $weaponPlayer, AbstractSmrPlayer $targetPlayer) {
-		if(!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculating any damage mods.
+		if (!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculating any damage mods.
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage($weaponPlayer);
+		$damage = & $this->getModifiedDamage($weaponPlayer);
 		return $damage;
 	}
 	
 	public function &getModifiedPortDamageAgainstPlayer(SmrPort $port, AbstractSmrPlayer $targetPlayer) {
-		if(!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculating any damage mods.
+		if (!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculating any damage mods.
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
@@ -241,7 +241,7 @@ 
 	}
 	
 	public function &getModifiedPlanetDamageAgainstPlayer(SmrPlanet $planet, AbstractSmrPlayer $targetPlayer) {
-		if(!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculating any damage mods.
+		if (!$this->canShootTraders()) { // If we can't shoot traders then just return a damageless array and don't waste resources calculating any damage mods.
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
@@ -251,42 +251,42 @@ 
 	
 	public function &shootForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
 		$return = array('Weapon' => $this, 'TargetForces' => $forces);
-		if($this->checkMiss($weaponPlayer, $this->getModifiedAccuracyAgainstForces($weaponPlayer,$forces))) { //Check if we miss
+		if ($this->checkMiss($weaponPlayer, $this->getModifiedAccuracyAgainstForces($weaponPlayer, $forces))) { //Check if we miss
 			$return['Hit'] = false;
 			return $return;
 		}
 		$return['Hit'] = true;
-		return $this->doPlayerDamageToForce($return,$weaponPlayer, $forces);
+		return $this->doPlayerDamageToForce($return, $weaponPlayer, $forces);
 	}
 	
 	public function &shootPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
 		$return = array('Weapon' => $this, 'TargetPort' => $port);
-		if($this->checkMiss($weaponPlayer, $this->getModifiedAccuracyAgainstPort($weaponPlayer,$port))) { //Check if we miss
+		if ($this->checkMiss($weaponPlayer, $this->getModifiedAccuracyAgainstPort($weaponPlayer, $port))) { //Check if we miss
 			$return['Hit'] = false;
 			return $return;
 		}
 		$return['Hit'] = true;
-		return $this->doPlayerDamageToPort($return,$weaponPlayer, $port);
+		return $this->doPlayerDamageToPort($return, $weaponPlayer, $port);
 	}
 	
 	public function &shootPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet, $delayed) {
 		$return = array('Weapon' => $this, 'TargetPlanet' => $planet);
-		if($this->checkMiss($weaponPlayer, $this->getModifiedAccuracyAgainstPlanet($weaponPlayer,$planet))) { //Check if we miss
+		if ($this->checkMiss($weaponPlayer, $this->getModifiedAccuracyAgainstPlanet($weaponPlayer, $planet))) { //Check if we miss
 			$return['Hit'] = false;
 			return $return;
 		}
 		$return['Hit'] = true;
-		return $this->doPlayerDamageToPlanet($return,$weaponPlayer, $planet, $delayed);
+		return $this->doPlayerDamageToPlanet($return, $weaponPlayer, $planet, $delayed);
 	}
 	
 	public function &shootPlayer(AbstractSmrPlayer $weaponPlayer, AbstractSmrPlayer $targetPlayer) {
 		$return = array('Weapon' => $this, 'TargetPlayer' => $targetPlayer);
-		if($this->checkMiss($weaponPlayer, $this->getModifiedAccuracyAgainstPlayer($weaponPlayer,$targetPlayer))) { //Check if we miss
+		if ($this->checkMiss($weaponPlayer, $this->getModifiedAccuracyAgainstPlayer($weaponPlayer, $targetPlayer))) { //Check if we miss
 			$return['Hit'] = false;
 			return $return;
 		}
 		$return['Hit'] = true;
-		return $this->doPlayerDamageToPlayer($return,$weaponPlayer, $targetPlayer);
+		return $this->doPlayerDamageToPlayer($return, $weaponPlayer, $targetPlayer);
 	}
 	
 	public function &shootPlayerAsForce(SmrForce $forces, AbstractSmrPlayer $targetPlayer) {
@@ -296,22 +296,22 @@ 
 	
 	public function &shootPlayerAsPort(SmrPort $port, AbstractSmrPlayer $targetPlayer) {
 		$return = array('Weapon' => $this, 'TargetPlayer' => $targetPlayer);
-		if($this->checkMiss($targetPlayer, $this->getModifiedPortAccuracyAgainstPlayer($port,$targetPlayer))) { //Check if the port misses, weight based upon the player being shot at.
+		if ($this->checkMiss($targetPlayer, $this->getModifiedPortAccuracyAgainstPlayer($port, $targetPlayer))) { //Check if the port misses, weight based upon the player being shot at.
 			$return['Hit'] = false;
 			return $return;
 		}
 		$return['Hit'] = true;
-		return $this->doPortDamageToPlayer($return,$port, $targetPlayer);
+		return $this->doPortDamageToPlayer($return, $port, $targetPlayer);
 	}
 	
 	public function &shootPlayerAsPlanet(SmrPlanet $planet, AbstractSmrPlayer $targetPlayer) {
 		$return = array('Weapon' => $this, 'TargetPlayer' => $targetPlayer);
-		if($this->checkMiss($targetPlayer, $this->getModifiedPlanetAccuracyAgainstPlayer($planet,$targetPlayer))) { //Check if the planet misses, weight based upon the player being shot at.
+		if ($this->checkMiss($targetPlayer, $this->getModifiedPlanetAccuracyAgainstPlayer($planet, $targetPlayer))) { //Check if the planet misses, weight based upon the player being shot at.
 			$return['Hit'] = false;
 			return $return;
 		}
 		$return['Hit'] = true;
-		return $this->doPlanetDamageToPlayer($return,$planet, $targetPlayer);
+		return $this->doPlanetDamageToPlayer($return, $planet, $targetPlayer);
 	}
 	
 }

lib/Default/AbstractSmrPort.class.inc

Spacing +214 added lines, -214 removed lines

@@ -52,13 +52,13 @@ 
 	
 	protected $SQL;
 	
-	protected $hasChanged=false;
-	protected $isNew=false;
+	protected $hasChanged = false;
+	protected $isNew = false;
 	
 	public static function refreshCache() {
-		foreach(self::$CACHE_PORTS as $gameID => &$gamePorts) {
-			foreach($gamePorts as $sectorID => &$port) {
-				$port = self::getPort($gameID,$sectorID,true);
+		foreach (self::$CACHE_PORTS as $gameID => &$gamePorts) {
+			foreach ($gamePorts as $sectorID => &$port) {
+				$port = self::getPort($gameID, $sectorID, true);
 			}
 		}
 	}
@@ -68,14 +68,14 @@ 
 		self::$CACHE_CACHED_PORTS = array();
 	}
 
-	public static function &getPort($gameID, $sectorID, $forceUpdate=false, $db=null) {
-		if($forceUpdate || !isset(self::$CACHE_PORTS[$gameID][$sectorID])) {
+	public static function &getPort($gameID, $sectorID, $forceUpdate = false, $db = null) {
+		if ($forceUpdate || !isset(self::$CACHE_PORTS[$gameID][$sectorID])) {
 			self::$CACHE_PORTS[$gameID][$sectorID] = new SmrPort($gameID, $sectorID, $db);
 		}
 		return self::$CACHE_PORTS[$gameID][$sectorID];
 	}
 
-	public static function removePort($gameID,$sectorID) {
+	public static function removePort($gameID, $sectorID) {
 		$db = new SmrMySqlDatabase();
 		$SQL = 'game_id = ' . $db->escapeNumber($gameID) . '
 		        AND sector_id = ' . $db->escapeNumber($sectorID);
@@ -87,17 +87,17 @@ 
 		unset(self::$CACHE_PORTS[$gameID][$sectorID]);
 	}
 
-	public static function &createPort($gameID,$sectorID) {
-		if(!isset(self::$CACHE_PORTS[$gameID][$sectorID])) {
-			$p = new SmrPort($gameID,$sectorID);
+	public static function &createPort($gameID, $sectorID) {
+		if (!isset(self::$CACHE_PORTS[$gameID][$sectorID])) {
+			$p = new SmrPort($gameID, $sectorID);
 			self::$CACHE_PORTS[$gameID][$sectorID] = $p;
 		}
 		return self::$CACHE_PORTS[$gameID][$sectorID];
 	}
 	
 	public static function savePorts() {
-		foreach(self::$CACHE_PORTS as $gamePorts) {
-			foreach($gamePorts as $port) {
+		foreach (self::$CACHE_PORTS as $gamePorts) {
+			foreach ($gamePorts as $port) {
 				$port->update();
 			}
 		}
@@ -107,7 +107,7 @@ 
 		return ($cargo / 13) * $distance;
 	}
 	
-	protected function __construct($gameID, $sectorID, $db=null) {
+	protected function __construct($gameID, $sectorID, $db = null) {
 		$this->db = new SmrMySqlDatabase();
 		$this->SQL = 'sector_id = ' . $this->db->escapeNumber($sectorID) . ' AND game_id = ' . $this->db->escapeNumber($gameID);
 
@@ -119,8 +119,8 @@ 
 			$this->isNew = !$db->nextRecord();
 		}
 
-		$this->gameID = (int) $gameID;
-		$this->sectorID = (int) $sectorID;
+		$this->gameID = (int)$gameID;
+		$this->sectorID = (int)$sectorID;
 		if (!$this->isNew) {
 			$this->shields = $db->getInt('shields');
 			$this->combatDrones = $db->getInt('combat_drones');
@@ -152,7 +152,7 @@ 
 	}
 	
 	public function checkDefenses() {
-		if(!$this->isUnderAttack()) {
+		if (!$this->isUnderAttack()) {
 			$defences = self::BASE_DEFENCES + $this->getLevel() * self::DEFENCES_PER_LEVEL;
 			$cds = self::BASE_CDS + $this->getLevel() * self::CDS_PER_LEVEL;
 			// Upgrade modifier
@@ -162,7 +162,7 @@ 
 			$defences += max(0, round(self::DEFENCES_PER_TEN_MIL_CREDITS * $this->getCredits() / 10000000));
 			$cds += max(0, round(self::CDS_PER_TEN_MIL_CREDITS * $this->getCredits() / 10000000));
 			// Defences restock (check for fed arrival)
-			if(TIME < $this->getReinforceTime() + self::TIME_FEDS_STAY) {
+			if (TIME < $this->getReinforceTime() + self::TIME_FEDS_STAY) {
 				$federalMod = (self::TIME_FEDS_STAY - (TIME - $this->getReinforceTime())) / self::TIME_FEDS_STAY;
 				$federalMod = max(0, round($federalMod * self::MAX_FEDS_BONUS));
 				$defences += $federalMod;
@@ -171,10 +171,10 @@ 
 			$this->setShields($defences);
 			$this->setArmour($defences);
 			$this->setCDs($cds);
-			if($this->getCredits() == 0) {
+			if ($this->getCredits() == 0) {
 				$this->setCreditsToDefault();
 			}
-			$this->db->query('DELETE FROM player_attacks_port WHERE '.$this->SQL);
+			$this->db->query('DELETE FROM player_attacks_port WHERE ' . $this->SQL);
 		}
 	}
 	
@@ -197,7 +197,7 @@ 
 		// that affect the stock. This avoids many unnecessary db queries.
 		$doUpdateDB = false;
 		$amount = $this->getGoodAmount($goodID);
-		$this->setGoodAmount($goodID, $amount+$amountToAdd, $doUpdateDB);
+		$this->setGoodAmount($goodID, $amount + $amountToAdd, $doUpdateDB);
 	}
 	
 	// Sets the class members that identify port trade goods
@@ -220,7 +220,7 @@ 
 		}
 	}
 
-	private function getVisibleGoods($transaction, AbstractSmrPlayer $player=null) {
+	private function getVisibleGoods($transaction, AbstractSmrPlayer $player = null) {
 		$goodIDs = $this->goodIDs[$transaction];
 		if ($player == null) {
 			return $goodIDs;
@@ -236,14 +236,14 @@ 
 	/**
 	 * Get IDs of goods that can be sold by $player to the port
 	 */
-	public function getVisibleGoodsSold(AbstractSmrPlayer $player=null) {
+	public function getVisibleGoodsSold(AbstractSmrPlayer $player = null) {
 		return $this->getVisibleGoods('Sell', $player);
 	}
 
 	/**
 	 * Get IDs of goods that can be bought by $player from the port
 	 */
-	public function getVisibleGoodsBought(AbstractSmrPlayer $player=null) {
+	public function getVisibleGoodsBought(AbstractSmrPlayer $player = null) {
 		return $this->getVisibleGoods('Buy', $player);
 	}
 	
@@ -286,7 +286,7 @@ 
 				$x['TransactionType'] = 'Buy';
 			}
 			$di = Plotter::findDistanceToX($x, $this->getSector(), true);
-			if(is_object($di))
+			if (is_object($di))
 				$di = $di->getRelativeDistance();
 			$this->goodDistances[$goodID] = max(1, $di);
 		}
@@ -305,19 +305,19 @@ 
 		}
 	}
 	
-	public function hasGood($goodID,$type=false) {
+	public function hasGood($goodID, $type = false) {
 		if ($type === false) {
 			$type = 'All';
 		}
 		return in_array($goodID, $this->goodIDs[$type]);
 	}
 	
-	private function setGoodAmount($goodID, $amount, $doUpdate=true) {
-		if($this->isCachedVersion())
+	private function setGoodAmount($goodID, $amount, $doUpdate = true) {
+		if ($this->isCachedVersion())
 			throw new Exception('Cannot update a cached port!');
 		// The new amount must be between 0 and the max for this good
 		$amount = max(0, min($amount, $this->getGood($goodID)['Max']));
-		if($this->getGoodAmount($goodID) == $amount)
+		if ($this->getGoodAmount($goodID) == $amount)
 			return;
 		$this->goodAmounts[$goodID] = $amount;
 
@@ -331,29 +331,29 @@ 
 		return $this->goodAmounts[$goodID];
 	}
 	
-	public function decreaseGood(array $good,$amount,$doRefresh) {
-		$this->setGoodAmount($good['ID'],$this->getGoodAmount($good['ID']) - $amount);
-		if($doRefresh===true) {
+	public function decreaseGood(array $good, $amount, $doRefresh) {
+		$this->setGoodAmount($good['ID'], $this->getGoodAmount($good['ID']) - $amount);
+		if ($doRefresh === true) {
 			//get id of goods to replenish
-			$this->refreshGoods($good['Class'],$amount);
+			$this->refreshGoods($good['Class'], $amount);
 		}
 	}
 	
-	public function increaseGoodAmount($goodID,$amount) {
-		$this->setGoodAmount($goodID,$this->getGoodAmount($goodID) + $amount);
+	public function increaseGoodAmount($goodID, $amount) {
+		$this->setGoodAmount($goodID, $this->getGoodAmount($goodID) + $amount);
 	}
 	
-	public function decreaseGoodAmount($goodID,$amount) {
-		$this->setGoodAmount($goodID,$this->getGoodAmount($goodID) - $amount);
+	public function decreaseGoodAmount($goodID, $amount) {
+		$this->setGoodAmount($goodID, $this->getGoodAmount($goodID) - $amount);
 	}
 	
 	/**
 	 * Adds extra stock to goods in the tier above a good that was traded
 	 */
-	protected function refreshGoods($classTraded,$amountTraded) {
+	protected function refreshGoods($classTraded, $amountTraded) {
 		$refreshAmount = round($amountTraded * self::REFRESH_PER_GOOD);
 		//refresh goods that need it
-		$refreshClass = $classTraded+1;
+		$refreshClass = $classTraded + 1;
 		foreach ($this->getAllGoodIDs() as $goodID) {
 			$goodClass = Globals::getGood($goodID)['Class'];
 			if ($goodClass == $refreshClass) {
@@ -367,7 +367,7 @@ 
 		$this->increaseUpgrade($goodsTradedMoney);
 		$this->increaseCredits($goodsTradedMoney);
 		$this->increaseExperience($exp);
-		$this->decreaseGood($good,$goodsTraded,true);
+		$this->decreaseGood($good, $goodsTraded, true);
 	}
 	
 	public function buyGoods(array $good, $goodsTraded, $idealPrice, $bargainPrice, $exp) {
@@ -381,10 +381,10 @@ 
 	}
 	
 	public function checkForUpgrade() {
-		if($this->isCachedVersion())
+		if ($this->isCachedVersion())
 			throw new Exception('Cannot upgrade a cached port!');
 		$upgrades = 0;
-		while($this->upgrade >= $this->getUpgradeRequirement() && $this->level < 9) {
+		while ($this->upgrade >= $this->getUpgradeRequirement() && $this->level < 9) {
 			++$upgrades;
 			$this->decreaseUpgrade($this->getUpgradeRequirement());
 			$this->decreaseCredits($this->getUpgradeRequirement());
@@ -398,12 +398,12 @@ 
 	 * ports to a specific level.
 	 */
 	public function upgradeToLevel($level) {
-		if($this->isCachedVersion())
+		if ($this->isCachedVersion())
 			throw new Exception('Cannot upgrade a cached port!');
-		while($this->getLevel()<$level) {
+		while ($this->getLevel() < $level) {
 			$this->doUpgrade();
 		}
-		while($this->getLevel()>$level) {
+		while ($this->getLevel() > $level) {
 			$this->doDowngrade();
 		}
 	}
@@ -412,20 +412,20 @@ 
 		$GOODS = Globals::getGoods();
 		shuffle($GOODS);
 		do {
-			if(count($GOODS) == 0) return false;
+			if (count($GOODS) == 0) return false;
 			$newGood = array_shift($GOODS);
-		} while( $this->hasGood($newGood['ID']) || $newGood['Class'] != $goodClass );
+		} while ($this->hasGood($newGood['ID']) || $newGood['Class'] != $goodClass);
 		
-		$transactionType = mt_rand(1,2) == 1 ? 'Buy' : 'Sell';
-		$this->addPortGood($newGood['ID'],$transactionType);
+		$transactionType = mt_rand(1, 2) == 1 ? 'Buy' : 'Sell';
+		$this->addPortGood($newGood['ID'], $transactionType);
 		return $newGood;
 	}
 	
 	protected function doUpgrade() {
-		switch($this->getLevel()) {
+		switch ($this->getLevel()) {
 			case 0:
-				for($i=0;$i<3;++$i) { // Add 3 goods for upgrading to level 1
-					if( $this->selectAndAddGood(1) === false ) break;
+				for ($i = 0; $i < 3; ++$i) { // Add 3 goods for upgrading to level 1
+					if ($this->selectAndAddGood(1) === false) break;
 				}
 			break;
 			
@@ -463,10 +463,10 @@ 
 	 * NOTE: make sure to adjust the port level appropriately if
 	 * calling this function directly.
 	 */
-	public function addPortGood($goodID,$type) {
-		if($this->isCachedVersion())
+	public function addPortGood($goodID, $type) {
+		if ($this->isCachedVersion())
 			throw new Exception('Cannot update a cached port!');
-		if(!is_numeric($goodID))
+		if (!is_numeric($goodID))
 			return false;
 		$this->goodIDs['All'][] = $goodID;
 		$this->goodIDs[$type][] = $goodID;
@@ -477,7 +477,7 @@ 
 		$this->goodAmounts[$goodID] = Globals::getGood($goodID)['Max'];
 		$this->cacheIsValid = false;
 		$this->db->query('REPLACE INTO port_has_goods (game_id, sector_id, good_id, transaction_type, amount, last_update) VALUES (' . $this->db->escapeNumber($this->getGameID()) . ',' . $this->db->escapeNumber($this->getSectorID()) . ',' . $this->db->escapeNumber($goodID) . ',' . $this->db->escapeString($type) . ',' . $this->db->escapeNumber($this->getGoodAmount($goodID)) . ',' . $this->db->escapeNumber(TIME) . ')');
-		$this->db->query('DELETE FROM route_cache WHERE game_id='.$this->db->escapeNumber($this->getGameID()));
+		$this->db->query('DELETE FROM route_cache WHERE game_id=' . $this->db->escapeNumber($this->getGameID()));
 	}
 
 	/**
@@ -486,7 +486,7 @@ 
 	 * calling this function directly.
 	 */
 	public function removePortGood($goodID) {
-		if($this->isCachedVersion())
+		if ($this->isCachedVersion())
 			throw new Exception('Cannot update a cached port!');
 		if (($key = array_search($goodID, $this->goodIDs['All'])) !== false) {
 			array_splice($this->goodIDs['All'], $key, 1);
@@ -499,14 +499,14 @@ 
 		}
 		
 		$this->cacheIsValid = false;
-		$this->db->query('DELETE FROM port_has_goods WHERE '.$this->SQL.' AND good_id=' . $this->db->escapeNumber($goodID) . ';');
-		$this->db->query('DELETE FROM route_cache WHERE game_id='.$this->db->escapeNumber($this->getGameID()));
+		$this->db->query('DELETE FROM port_has_goods WHERE ' . $this->SQL . ' AND good_id=' . $this->db->escapeNumber($goodID) . ';');
+		$this->db->query('DELETE FROM route_cache WHERE game_id=' . $this->db->escapeNumber($this->getGameID()));
 	}
 	
 	public function checkForDowngrade($damageDone) {
 		$downgrades = 0;
-		for(;$damageDone>self::DAMAGE_NEEDED_FOR_DOWNGRADE_CHANCE;$damageDone-=self::DAMAGE_NEEDED_FOR_DOWNGRADE_CHANCE) {
-			if (mt_rand(1,100) <= self::CHANCE_TO_DOWNGRADE && $this->level > 1) {
+		for (;$damageDone > self::DAMAGE_NEEDED_FOR_DOWNGRADE_CHANCE; $damageDone -= self::DAMAGE_NEEDED_FOR_DOWNGRADE_CHANCE) {
+			if (mt_rand(1, 100) <= self::CHANCE_TO_DOWNGRADE && $this->level > 1) {
 				++$downgrades;
 				$this->doDowngrade();
 			}
@@ -530,10 +530,10 @@ 
 	}
 
 	protected function doDowngrade() {
-		if($this->isCachedVersion())
+		if ($this->isCachedVersion())
 			throw new Exception('Cannot downgrade a cached port!');
 
-		switch($this->level) {
+		switch ($this->level) {
 			case 1:
 				// Replace one class 1 good with another
 				$this->selectAndRemoveGood(1);
@@ -572,12 +572,12 @@ 
 	}
 	
 	public function attackedBy(AbstractSmrPlayer $trigger, array $attackers) {
-		if($this->isCachedVersion())
+		if ($this->isCachedVersion())
 			throw new Exception('Cannot attack a cached port!');
 			
-		$trigger->increaseHOF(1,array('Combat','Port','Number Of Triggers'), HOF_PUBLIC);
+		$trigger->increaseHOF(1, array('Combat', 'Port', 'Number Of Triggers'), HOF_PUBLIC);
 		foreach ($attackers as $attacker) {
-			$attacker->increaseHOF(1,array('Combat','Port','Number Of Attacks'), HOF_PUBLIC);
+			$attacker->increaseHOF(1, array('Combat', 'Port', 'Number Of Attacks'), HOF_PUBLIC);
 			$this->db->query('REPLACE INTO player_attacks_port (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()) . ')');
 		}
@@ -590,8 +590,8 @@ 
 			$this->updateAttackStarted();
 			//add news
 			$newsMessage = '<span class="red bold">*MAYDAY* *MAYDAY*</span> A distress beacon has been activated by the port in sector ' . Globals::getSectorBBLink($this->getSectorID()) . '. It is under attack by ';
-			if($trigger->hasAlliance()) {
-				$newsMessage .= 'members of '.$trigger->getAllianceBBLink();
+			if ($trigger->hasAlliance()) {
+				$newsMessage .= 'members of ' . $trigger->getAllianceBBLink();
 			}
 			else {
 				$newsMessage .= $trigger->getBBLink();
@@ -600,11 +600,11 @@ 
 			$newsMessage .= '. The Federal Government is offering ';
 			$bounty = number_format(round($trigger->getLevelID() * DEFEND_PORT_BOUNTY_PER_LEVEL));
 
-			if($trigger->hasAlliance()) {
-				$newsMessage .= 'bounties of <span class="creds">' . $bounty . '</span> credits for the deaths of any raiding members of '.$trigger->getAllianceBBLink();
+			if ($trigger->hasAlliance()) {
+				$newsMessage .= 'bounties of <span class="creds">' . $bounty . '</span> credits for the deaths of any raiding members of ' . $trigger->getAllianceBBLink();
 			}
 			else {
-				$newsMessage .= 'a bounty of <span class="creds">' . $bounty . '</span> credits for the death of '.$trigger->getBBLink();
+				$newsMessage .= 'a bounty of <span class="creds">' . $bounty . '</span> credits for the death of ' . $trigger->getBBLink();
 			}
 			$newsMessage .= ' prior to the destruction of the port, or until federal forces arrive to defend the port.';
 //			$irc_message = '[k00,01]The port in sector [k11]'.$this->sectorID.'[k00] is under attack![/k]';
@@ -617,122 +617,122 @@ 
 	}
 	
 	public function setShields($shields) {
-		if($this->isCachedVersion())
+		if ($this->isCachedVersion())
 			throw new Exception('Cannot update a cached port!');
-		if($shields<0)
-			$shields=0;
-		if($this->shields == $shields)
+		if ($shields < 0)
+			$shields = 0;
+		if ($this->shields == $shields)
 			return;
-		$this->shields=$shields;
-		$this->hasChanged=true;
+		$this->shields = $shields;
+		$this->hasChanged = true;
 	}
 	
 	public function setArmour($armour) {
-		if($this->isCachedVersion())
+		if ($this->isCachedVersion())
 			throw new Exception('Cannot update a cached port!');
-		if($armour<0)
-			$armour=0;
-		if($this->armour == $armour)
+		if ($armour < 0)
+			$armour = 0;
+		if ($this->armour == $armour)
 			return;
-		$this->armour=$armour;
-		$this->hasChanged=true;
+		$this->armour = $armour;
+		$this->hasChanged = true;
 	}
 	
 	public function setCDs($combatDrones) {
-		if($this->isCachedVersion())
+		if ($this->isCachedVersion())
 			throw new Exception('Cannot update a cached port!');
-		if($combatDrones<0)
-			$combatDrones=0;
-		if($this->combatDrones == $combatDrones)
+		if ($combatDrones < 0)
+			$combatDrones = 0;
+		if ($this->combatDrones == $combatDrones)
 			return;
-		$this->combatDrones=$combatDrones;
-		$this->hasChanged=true;
+		$this->combatDrones = $combatDrones;
+		$this->hasChanged = true;
 	}
 
 	public function setCreditsToDefault() {
-		$this->setCredits(2700000 + $this->getLevel()*1500000 + pow($this->getLevel(), 2) * 300000);
+		$this->setCredits(2700000 + $this->getLevel() * 1500000 + pow($this->getLevel(), 2) * 300000);
 	}
 
 	public function setCredits($credits) {
-		if($this->isCachedVersion())
+		if ($this->isCachedVersion())
 			throw new Exception('Cannot update a cached port!');
-		if($this->credits == $credits)
+		if ($this->credits == $credits)
 			return;
 		$this->credits = $credits;
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 	}
 	
 	public function decreaseCredits($credits) {
-		if($credits<0)
+		if ($credits < 0)
 			throw new Exception('Cannot decrease negative credits.');
-		$this->setCredits($this->getCredits()-$credits);
+		$this->setCredits($this->getCredits() - $credits);
 	}
 	
 	public function increaseCredits($credits) {
-		if($credits<0)
+		if ($credits < 0)
 			throw new Exception('Cannot increase negative credits.');
-		$this->setCredits($this->getCredits()+$credits);
+		$this->setCredits($this->getCredits() + $credits);
 	}
 	
 	public function setUpgrade($upgrade) {
-		if($this->isCachedVersion())
+		if ($this->isCachedVersion())
 			throw new Exception('Cannot update a cached port!');
-		if($this->getLevel() == $this->getMaxLevel()) {
+		if ($this->getLevel() == $this->getMaxLevel()) {
 			$upgrade = 0;
 		}
-		if($this->upgrade == $upgrade)
+		if ($this->upgrade == $upgrade)
 			return;
 		$this->upgrade = $upgrade;
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 		$this->checkForUpgrade();
 	}
 	
 	public function decreaseUpgrade($upgrade) {
-		if($upgrade<0)
+		if ($upgrade < 0)
 			throw new Exception('Cannot decrease negative upgrade.');
-		$this->setUpgrade($this->getUpgrade()-$upgrade);
+		$this->setUpgrade($this->getUpgrade() - $upgrade);
 	}
 	
 	public function increaseUpgrade($upgrade) {
-		if($upgrade<0)
+		if ($upgrade < 0)
 			throw new Exception('Cannot increase negative upgrade.');
-		$this->setUpgrade($this->getUpgrade()+$upgrade);
+		$this->setUpgrade($this->getUpgrade() + $upgrade);
 	}
 	
 	public function setLevel($level) {
-		if($this->isCachedVersion())
+		if ($this->isCachedVersion())
 			throw new Exception('Cannot update a cached port!');
-		if($this->level == $level)
+		if ($this->level == $level)
 			return;
 		$this->level = $level;
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 	}
 	
 	public function increaseLevel($level) {
-		if($level<0)
+		if ($level < 0)
 			throw new Exception('Cannot increase negative level.');
-		$this->setLevel($this->getLevel()+$level);
+		$this->setLevel($this->getLevel() + $level);
 	}
 	
 	public function decreaseLevel($level) {
-		if($level<0)
+		if ($level < 0)
 			throw new Exception('Cannot increase negative level.');
-		$this->setLevel($this->getLevel()-$level);
+		$this->setLevel($this->getLevel() - $level);
 	}
 	
 	public function setExperience($experience) {
-		if($this->isCachedVersion())
+		if ($this->isCachedVersion())
 			throw new Exception('Cannot update a cached port!');
-		if($this->experience == $experience)
+		if ($this->experience == $experience)
 			return;
 		$this->experience = $experience;
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 	}
 	
 	public function increaseExperience($experience) {
-		if($experience<0)
+		if ($experience < 0)
 			throw new Exception('Cannot increase negative experience.');
-		$this->setExperience($this->getExperience()+$experience);
+		$this->setExperience($this->getExperience() + $experience);
 	}
 	
 	public function getGameID() {
@@ -744,7 +744,7 @@ 
 	}
 	
 	public function &getSector() {
-		return SmrSector::getSector($this->getGameID(),$this->getSectorID());
+		return SmrSector::getSector($this->getGameID(), $this->getSectorID());
 	}
 	
 	public function getRaceID() {
@@ -752,13 +752,13 @@ 
 	}
 	
 	public function setRaceID($raceID) {
-		if($this->raceID == $raceID)
+		if ($this->raceID == $raceID)
 			return;
 		$this->raceID = $raceID;
 		$this->hasChanged = true;
 		$this->cacheIsValid = false;
 		// route_cache tells NPC's where they can trade
-		$this->db->query('DELETE FROM route_cache WHERE game_id='.$this->db->escapeNumber($this->getGameID()));
+		$this->db->query('DELETE FROM route_cache WHERE game_id=' . $this->db->escapeNumber($this->getGameID()));
 	}
 	
 	public function getRaceName() {
@@ -816,24 +816,24 @@ 
 
 	public function &getWeapons() {
 		$weapons = array();
-		for ($i=0; $i<$this->getNumWeapons(); ++$i) {
+		for ($i = 0; $i < $this->getNumWeapons(); ++$i) {
 			$weapons[$i] = SmrWeapon::getWeapon(WEAPON_PORT_TURRET);
 		}
 		return $weapons;
 	}
 
 	public function getUpgradePercent() {
-		return min(1,max(0,$this->upgrade / $this->getUpgradeRequirement()));
+		return min(1, max(0, $this->upgrade / $this->getUpgradeRequirement()));
 	}
 	
 	public function getCreditsPercent() {
-		return min(1,max(0,$this->credits / 32000000));
+		return min(1, max(0, $this->credits / 32000000));
 	}
 	
 	public function getReinforcePercent() {
-		if(!$this->isUnderAttack())
+		if (!$this->isUnderAttack())
 			return 0;
-		return min(1,max(0,($this->getReinforceTime() - TIME) / ($this->getReinforceTime() - $this->getAttackStarted())));
+		return min(1, max(0, ($this->getReinforceTime() - TIME) / ($this->getReinforceTime() - $this->getAttackStarted())));
 	}
 	
 	public function getReinforceTime() {
@@ -841,7 +841,7 @@ 
 	}
 	
 	public function setReinforceTime($reinforceTime) {
-		$this->reinforceTime=$reinforceTime;
+		$this->reinforceTime = $reinforceTime;
 	}
 	
 	public function getAttackStarted() {
@@ -853,10 +853,10 @@ 
 	}
 	
 	public function setAttackStarted($time) {
-		if($this->attackStarted==$time)
+		if ($this->attackStarted == $time)
 			return;
-		$this->attackStarted=TIME;
-		$this->hasChanged=true;
+		$this->attackStarted = TIME;
+		$this->hasChanged = true;
 	}
 	
 	public function isUnderAttack() {
@@ -864,11 +864,11 @@ 
 	}
 	
 	public function isDestroyed() {
-		return ($this->getArmour()<1 && $this->isUnderAttack());
+		return ($this->getArmour() < 1 && $this->isUnderAttack());
 	}
 	
 	public function exists() {
-		return $this->isNew===false||$this->hasChanged===true;
+		return $this->isNew === false || $this->hasChanged === true;
 	}
 	
 	public function decreaseShields($number) {
@@ -885,8 +885,8 @@ 
 	
 	public function getIdealPrice($goodID, $transactionType, $numGoods, $relations) {
 //		echo 'Good:'.$goodID.',Dist::'.$dist.',Type:'.$transactionType.',NumGoods:'.$numGoods.',Relations:'.$relations.',';
-		if($relations>1000)
-			$relations=1000;
+		if ($relations > 1000)
+			$relations = 1000;
 		$good = $this->getGood($goodID);
 		$base = $good['BasePrice'];
 		$maxSupply = $good['Max'];
@@ -895,26 +895,26 @@ 
 	
 //		$relations_factor_buy = 2-(($relations + 500) / 1500);
 //		$relations_factor_sell = ($relations + 500) / 1500;
-		if($transactionType == 'Sell')
-			$idealPrice = round($numGoods * $base * 0.6 * (pow($dist + .5, 1.8)) * (2.5-($supply / $maxSupply)) * (($relations + 350) / 8415) );
-		else if($transactionType == 'Buy')
-			$idealPrice = round($numGoods * $base * 0.7 * pow($dist, 1.84) * (2.5-($supply / $maxSupply)) * (2-($relations + 50) / 850) * (($relations + 350) / 1500) / 38.56 * (1 + (10 - $this->getLevel()) / 50));
+		if ($transactionType == 'Sell')
+			$idealPrice = round($numGoods * $base * 0.6 * (pow($dist + .5, 1.8)) * (2.5 - ($supply / $maxSupply)) * (($relations + 350) / 8415));
+		else if ($transactionType == 'Buy')
+			$idealPrice = round($numGoods * $base * 0.7 * pow($dist, 1.84) * (2.5 - ($supply / $maxSupply)) * (2 - ($relations + 50) / 850) * (($relations + 350) / 1500) / 38.56 * (1 + (10 - $this->getLevel()) / 50));
 		return $idealPrice;
 	}
 	
 	public function getOfferPrice($idealPrice, $relations, $transactionType) {
-		$moneyRelations=max(0,min(2000,$relations));
-		$expRelations=max(0,min(1000,$relations));
-		$relationsEffect = pow(1+($expRelations-1000)/10000,1.2-$expRelations/1000);
-		$relationsEffect -= max(0,min(self::BARGAIN_LENIENCY_PERCENT,self::BARGAIN_LENIENCY_PERCENT*(2000-$moneyRelations)/1000)); //Gradual increase getting closer and closer to actual ideal price as relations increase to 2000 (will only be an increase of self::BARGAIN_LENIENCY_PERCENT percent extra cash)
+		$moneyRelations = max(0, min(2000, $relations));
+		$expRelations = max(0, min(1000, $relations));
+		$relationsEffect = pow(1 + ($expRelations - 1000) / 10000, 1.2 - $expRelations / 1000);
+		$relationsEffect -= max(0, min(self::BARGAIN_LENIENCY_PERCENT, self::BARGAIN_LENIENCY_PERCENT * (2000 - $moneyRelations) / 1000)); //Gradual increase getting closer and closer to actual ideal price as relations increase to 2000 (will only be an increase of self::BARGAIN_LENIENCY_PERCENT percent extra cash)
 		 
-		 if($transactionType == 'Buy')
+		 if ($transactionType == 'Buy')
 		 {
-			$relationsEffect = 2-$relationsEffect;
-			return max($idealPrice,floor($idealPrice * $relationsEffect));
+			$relationsEffect = 2 - $relationsEffect;
+			return max($idealPrice, floor($idealPrice * $relationsEffect));
 		 }
 		 else
-			return min($idealPrice,ceil($idealPrice * $relationsEffect));
+			return min($idealPrice, ceil($idealPrice * $relationsEffect));
 //		$range = .11 - .095;
 //		$rand = .095 + $range * mt_rand(0, 32767)/32767;
 //
@@ -925,29 +925,29 @@ 
 //		return $offeredPrice;
 	}
 	
-	public function calculateExperiencePercent($idealPrice,$offerPrice,$bargainPrice,$transactionType) {
-		if(($transactionType == 'Sell' && $bargainPrice < $offerPrice) || ($transactionType == 'Buy' && $bargainPrice > $offerPrice))
+	public function calculateExperiencePercent($idealPrice, $offerPrice, $bargainPrice, $transactionType) {
+		if (($transactionType == 'Sell' && $bargainPrice < $offerPrice) || ($transactionType == 'Buy' && $bargainPrice > $offerPrice))
 			return 0;
 		if ($bargainPrice == $idealPrice)
 			return 1;
-		$bargainLeniency = min($idealPrice*self::BARGAIN_LENIENCY_PERCENT,abs($idealPrice-$bargainPrice));
+		$bargainLeniency = min($idealPrice * self::BARGAIN_LENIENCY_PERCENT, abs($idealPrice - $bargainPrice));
 		if ($transactionType == 'Sell')
 			$bargainLeniency = -$bargainLeniency;
 		$bargainPrice -= $bargainLeniency;
 		
-		$val = ($idealPrice-$bargainPrice)/($idealPrice-$this->getOfferPrice($idealPrice,0,$transactionType));
+		$val = ($idealPrice - $bargainPrice) / ($idealPrice - $this->getOfferPrice($idealPrice, 0, $transactionType));
 //			if ($transactionType == 'Sell' && $val>0)
 //				$val=1;
 //			else if($transactionType == 'Buy' && $val<0)
 //				$val=1;
-		$val=abs($val);
-		if($val>1)
-			$val=1;
-		$expPercent = pow(1-$val,15);
-		if($expPercent>1)
-			$expPercent=1;
-		else if($expPercent<0)
-			$expPercent=0;
+		$val = abs($val);
+		if ($val > 1)
+			$val = 1;
+		$expPercent = pow(1 - $val, 15);
+		if ($expPercent > 1)
+			$expPercent = 1;
+		else if ($expPercent < 0)
+			$expPercent = 0;
 		return $expPercent;
 	}
 	
@@ -968,18 +968,18 @@ 
 	}
 
 	public function getRazeHREF($justContainer = false) {
-		$container = create_container('skeleton.php','port_payout_processing.php');
+		$container = create_container('skeleton.php', 'port_payout_processing.php');
 		$container['PayoutType'] = 'Raze';
 		return $justContainer === false ? SmrSession::getNewHREF($container) : $container;
 	}
 
 	public function getLootHREF($justContainer = false) {
-		if($this->getCredits() > 0) {
-			$container = create_container('skeleton.php','port_payout_processing.php');
+		if ($this->getCredits() > 0) {
+			$container = create_container('skeleton.php', 'port_payout_processing.php');
 			$container['PayoutType'] = 'Loot';
 		}
 		else {
-			$container = create_container('skeleton.php','current_sector.php');
+			$container = create_container('skeleton.php', 'current_sector.php');
 			$container['msg'] = 'This port has already been looted.';
 		}
 		return $justContainer === false ? SmrSession::getNewHREF($container) : $container;
@@ -997,12 +997,12 @@ 
 		return $this->cachedTime;
 	}
 	protected function setCachedTime($cachedTime) {
-		return $this->cachedTime=$cachedTime;
+		return $this->cachedTime = $cachedTime;
 	}
 	public function updateSectorPlayersCache() {
 		$accountIDs = array();
 		$sectorPlayers = $this->getSector()->getPlayers();
-		foreach($sectorPlayers as $sectorPlayer) {
+		foreach ($sectorPlayers as $sectorPlayer) {
 			$accountIDs[] = $sectorPlayer->getAccountID();
 		}
 		$this->addCachePorts($accountIDs);
@@ -1011,22 +1011,22 @@ 
 		$this->addCachePorts(array($accountID));
 	}
 	public function addCachePorts(array $accountIDs) {
-		if (count($accountIDs)>0 && $this->exists()) {
+		if (count($accountIDs) > 0 && $this->exists()) {
 			$cache = $this->db->escapeBinary(gzcompress(serialize($this)));
 			$cacheHash = $this->db->escapeString(md5($cache));
 			//give them the port info
 			$query = 'INSERT IGNORE INTO player_visited_port ' .
 						'(account_id, game_id, sector_id, visited, port_info_hash) ' .
 						'VALUES ';
-			foreach($accountIDs as $accountID) {
-				$query .= '('.$accountID.', '.$this->getGameID().', '.$this->getSectorID().', 0, \'\'),';
+			foreach ($accountIDs as $accountID) {
+				$query .= '(' . $accountID . ', ' . $this->getGameID() . ', ' . $this->getSectorID() . ', 0, \'\'),';
 			}
-			$query = substr($query,0,-1);
+			$query = substr($query, 0, -1);
 			$this->db->query($query);
 			
 			$this->db->query('INSERT IGNORE INTO port_info_cache
 						(game_id, sector_id, port_info_hash, port_info)
-						VALUES (' . $this->db->escapeNumber($this->getGameID()) . ', ' . $this->db->escapeNumber($this->getSectorID()) . ', ' . $cacheHash . ', ' . $cache.')');
+						VALUES (' . $this->db->escapeNumber($this->getGameID()) . ', ' . $this->db->escapeNumber($this->getSectorID()) . ', ' . $cacheHash . ', ' . $cache . ')');
 
 			// We can't use the SQL member here because CachePorts don't have it
 			$this->db->query('UPDATE player_visited_port SET visited=' . $this->db->escapeNumber($this->getCachedTime()) . ', port_info_hash=' . $cacheHash . ' WHERE visited<=' . $this->db->escapeNumber($this->getCachedTime()) . ' AND account_id IN (' . $this->db->escapeArray($accountIDs) . ') AND sector_id=' . $this->db->escapeNumber($this->getSectorID()) . ' AND game_id=' . $this->db->escapeNumber($this->getGameID()) . ' LIMIT ' . count($accountIDs));
@@ -1036,8 +1036,8 @@ 
 		}
 		return false;
 	}
-	public static function &getCachedPort($gameID,$sectorID,$accountID,$forceUpdate=false) {
-		if($forceUpdate || !isset(self::$CACHE_CACHED_PORTS[$gameID][$sectorID][$accountID])) {
+	public static function &getCachedPort($gameID, $sectorID, $accountID, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_CACHED_PORTS[$gameID][$sectorID][$accountID])) {
 			$db = new SmrMySqlDatabase();
 			$db->query('SELECT visited, port_info
 						FROM player_visited_port
@@ -1046,7 +1046,7 @@ 
 							AND game_id = ' . $db->escapeNumber($gameID) . '
 							AND sector_id = ' . $db->escapeNumber($sectorID) . ' LIMIT 1');
 			
-			if($db->nextRecord()) {
+			if ($db->nextRecord()) {
 				self::$CACHE_CACHED_PORTS[$gameID][$sectorID][$accountID] = unserialize(gzuncompress($db->getField('port_info')));
 				self::$CACHE_CACHED_PORTS[$gameID][$sectorID][$accountID]->setCachedTime($db->getInt('visited'));
 			}
@@ -1084,8 +1084,8 @@ 
 		}
 
 		// If any fields in the `port` table have changed, update table
-		if($this->hasChanged) {
-			if($this->isNew===false) {
+		if ($this->hasChanged) {
+			if ($this->isNew === false) {
 				$this->db->query('UPDATE port SET experience = ' . $this->db->escapeNumber($this->getExperience()) .
 								', shields = ' . $this->db->escapeNumber($this->getShields()) .
 								', armour = ' . $this->db->escapeNumber($this->getArmour()) .
@@ -1113,9 +1113,9 @@ 
 								',' . $this->db->escapeNumber($this->getReinforceTime()) .
 								',' . $this->db->escapeNumber($this->getAttackStarted()) .
 								',' . $this->db->escapeNumber($this->getRaceID()) . ')');
-				$this->isNew=false;
+				$this->isNew = false;
 			}
-			$this->hasChanged=false;
+			$this->hasChanged = false;
 		}
 
 		// Update the port good amounts if they have been changed
@@ -1134,30 +1134,30 @@ 
 	
 	public function &shootPlayers(array $targetPlayers) {
 		$results = array('Port' => $this, 'TotalDamage' => 0, 'TotalDamagePerTargetPlayer' => array());
-		foreach($targetPlayers as $targetPlayer) {
+		foreach ($targetPlayers as $targetPlayer) {
 			$results['TotalDamagePerTargetPlayer'][$targetPlayer->getAccountID()] = 0;
 			$results['TotalShotsPerTargetPlayer'][$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) {
+		foreach ($weapons as $orderID => $weapon) {
 			do {
 				$targetPlayer = $targetPlayers[array_rand($targetPlayers)];
-			} while($results['TotalShotsPerTargetPlayer'][$targetPlayer->getAccountID()] > min($results['TotalShotsPerTargetPlayer']));
-			$results['Weapons'][$orderID] =& $weapon->shootPlayerAsPort($this, $targetPlayer);
+			} while ($results['TotalShotsPerTargetPlayer'][$targetPlayer->getAccountID()] > min($results['TotalShotsPerTargetPlayer']));
+			$results['Weapons'][$orderID] = & $weapon->shootPlayerAsPort($this, $targetPlayer);
 			$results['TotalShotsPerTargetPlayer'][$targetPlayer->getAccountID()]++;
-			if($results['Weapons'][$orderID]['Hit']) {
+			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 				$results['TotalDamagePerTargetPlayer'][$targetPlayer->getAccountID()] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 			}
 		}
-		if($this->hasCDs()) {
-			$thisCDs = new SmrCombatDrones($this->getGameID(),$this->getCDs(),true);
-			$results['Drones'] =& $thisCDs->shootPlayerAsPort($this, $targetPlayers[array_rand($targetPlayers)]);
+		if ($this->hasCDs()) {
+			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs(), true);
+			$results['Drones'] = & $thisCDs->shootPlayerAsPort($this, $targetPlayers[array_rand($targetPlayers)]);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 			$results['TotalDamagePerTargetPlayer'][$results['Drones']['TargetPlayer']->getAccountID()] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
@@ -1169,20 +1169,20 @@ 
 		$shieldDamage = 0;
 		$cdDamage = 0;
 		$armourDamage = 0;
-		if(!$alreadyDead) {
-			if($damage['Shield'] || !$this->hasShields()) {
-				$shieldDamage = $this->doShieldDamage(min($damage['MaxDamage'],$damage['Shield']));
+		if (!$alreadyDead) {
+			if ($damage['Shield'] || !$this->hasShields()) {
+				$shieldDamage = $this->doShieldDamage(min($damage['MaxDamage'], $damage['Shield']));
 				$damage['MaxDamage'] -= $shieldDamage;
-				if(!$this->hasShields() && ($shieldDamage == 0 || $damage['Rollover'])) {
-					$cdDamage = $this->doCDDamage(min($damage['MaxDamage'],$damage['Armour']));
+				if (!$this->hasShields() && ($shieldDamage == 0 || $damage['Rollover'])) {
+					$cdDamage = $this->doCDDamage(min($damage['MaxDamage'], $damage['Armour']));
 					$damage['Armour'] -= $cdDamage;
 					$damage['MaxDamage'] -= $cdDamage;
-					if(!$this->hasCDs() && ($cdDamage == 0 || $damage['Rollover']))
-						$armourDamage = $this->doArmourDamage(min($damage['MaxDamage'],$damage['Armour']));
+					if (!$this->hasCDs() && ($cdDamage == 0 || $damage['Rollover']))
+						$armourDamage = $this->doArmourDamage(min($damage['MaxDamage'], $damage['Armour']));
 				}
 			}
 			else { //hit drones behind shields
-				$cdDamage = $this->doCDDamage(floor(min($damage['MaxDamage'],$damage['Armour'])*DRONES_BEHIND_SHIELDS_DAMAGE_PERCENT));
+				$cdDamage = $this->doCDDamage(floor(min($damage['MaxDamage'], $damage['Armour']) * DRONES_BEHIND_SHIELDS_DAMAGE_PERCENT));
 			}
 		}
 
@@ -1192,28 +1192,28 @@ 
 						'Shield' => $shieldDamage,
 						'HasShields' => $this->hasShields(),
 						'CDs' => $cdDamage,
-						'NumCDs' => $cdDamage/CD_ARMOUR,
+						'NumCDs' => $cdDamage / CD_ARMOUR,
 						'HasCDs' => $this->hasCDs(),
 						'Armour' => $armourDamage,
-						'TotalDamage' => $shieldDamage+$cdDamage+$armourDamage
+						'TotalDamage' => $shieldDamage + $cdDamage + $armourDamage
 		);
 		return $return;
 	}
 	
 	protected function doShieldDamage($damage) {
-		$actualDamage = min($this->getShields(),$damage);
+		$actualDamage = min($this->getShields(), $damage);
 		$this->decreaseShields($actualDamage);
 		return $actualDamage;
 	}
 	
 	protected function doCDDamage($damage) {
-		$actualDamage = min($this->getCDs(),floor($damage/CD_ARMOUR));
+		$actualDamage = min($this->getCDs(), floor($damage / CD_ARMOUR));
 		$this->decreaseCDs($actualDamage);
-		return $actualDamage*CD_ARMOUR;
+		return $actualDamage * CD_ARMOUR;
 	}
 	
 	protected function doArmourDamage($damage) {
-		$actualDamage = min($this->getArmour(),floor($damage));
+		$actualDamage = min($this->getArmour(), floor($damage));
 		$this->decreaseArmour($actualDamage);
 		return $actualDamage;
 	}
@@ -1223,7 +1223,7 @@ 
 		$attackers = array();
 		$this->db->query('SELECT account_id,level FROM player_attacks_port WHERE ' . $this->SQL . ' AND time > ' . $this->db->escapeNumber(TIME - self::TIME_TO_CREDIT_RAID));
 		while ($this->db->nextRecord()) {
-			$attackers[] = SmrPlayer::getPlayer($this->db->getField('account_id'),$this->getGameID());
+			$attackers[] = SmrPlayer::getPlayer($this->db->getField('account_id'), $this->getGameID());
 		}
 		return $attackers;
 	}
@@ -1231,21 +1231,21 @@ 
 	protected function creditCurrentAttackersForKill() {
 		//get all players involved for HoF
 		$attackers = $this->getAttackersToCredit();
-		foreach($attackers as $attacker) {
-			$attacker->increaseHOF($this->db->getInt('level'),array('Combat','Port','Levels Raided'), HOF_PUBLIC);
-			$attacker->increaseHOF(1,array('Combat','Port','Total Raided'), HOF_PUBLIC);
+		foreach ($attackers as $attacker) {
+			$attacker->increaseHOF($this->db->getInt('level'), array('Combat', 'Port', 'Levels Raided'), HOF_PUBLIC);
+			$attacker->increaseHOF(1, array('Combat', 'Port', 'Total Raided'), HOF_PUBLIC);
 		}
 	}
 
 	protected function payout(AbstractSmrPlayer $killer, $credits, $payoutType) {
-		if($this->getCredits() == 0) {
+		if ($this->getCredits() == 0) {
 			return false;
 		}
 		$killer->increaseCredits($credits);
-		$killer->increaseHOF($credits, array('Combat','Port','Money','Gained'), HOF_PUBLIC);
+		$killer->increaseHOF($credits, array('Combat', 'Port', 'Money', 'Gained'), HOF_PUBLIC);
 		$attackers = $this->getAttackersToCredit();
-		foreach($attackers as $attacker) {
-			$attacker->increaseHOF(1, array('Combat','Port',$payoutType), HOF_PUBLIC);
+		foreach ($attackers as $attacker) {
+			$attacker->increaseHOF(1, array('Combat', 'Port', $payoutType), HOF_PUBLIC);
 		}
 		$this->setCredits(0);
 		return true;
@@ -1253,7 +1253,7 @@ 
 
 	public function razePort(AbstractSmrPlayer $killer) {
 		$credits = floor($this->getCredits() * self::RAZE_MONEY_PERCENT / 100);
-		if($this->payout($killer, $credits, 'Razed')) {
+		if ($this->payout($killer, $credits, 'Razed')) {
 			$this->doDowngrade();
 		}
 		return $credits;
@@ -1282,22 +1282,22 @@ 
 		$this->db->query('INSERT INTO news (game_id, time, news_message, type,killer_id,killer_alliance,dead_id) VALUES (' . $this->db->escapeNumber($this->getGameID()) . ', ' . $this->db->escapeNumber(TIME) . ', ' . $this->db->escapeString($news) . ', \'REGULAR\',' . $this->db->escapeNumber($killer->getAccountID()) . ',' . $this->db->escapeNumber($killer->getAllianceID()) . ',' . $this->db->escapeNumber(ACCOUNT_ID_PORT) . ')');
 		// Killer gets a relations change and a bounty if port is taken
 		$return['KillerBounty'] = $killer->getExperience() * $this->getLevel();
-		$killer->increaseCurrentBountyAmount('HQ',$return['KillerBounty']);
-		$killer->increaseHOF($return['KillerBounty'],array('Combat','Port','Bounties','Gained'), HOF_PUBLIC);
+		$killer->increaseCurrentBountyAmount('HQ', $return['KillerBounty']);
+		$killer->increaseHOF($return['KillerBounty'], array('Combat', 'Port', 'Bounties', 'Gained'), HOF_PUBLIC);
 		
 		if ($this->getRaceID() != RACE_NEUTRAL) {
 			$return['KillerRelations'] = 45;
-			$killer->decreaseRelations($return['KillerRelations'],$this->getRaceID());
-			$killer->increaseHOF($return['KillerRelations'],array('Combat','Port','Relation','Loss'), HOF_PUBLIC);
+			$killer->decreaseRelations($return['KillerRelations'], $this->getRaceID());
+			$killer->increaseHOF($return['KillerRelations'], array('Combat', 'Port', 'Relation', 'Loss'), HOF_PUBLIC);
 		}
 		
 		return $return;
 	}
 
 	public function hasX(/*Object*/ $x) {
-		if (is_array($x) && $x['Type']=='Good') { // instanceof Good) - No Good class yet, so array is the best we can do
-			if(isset($x['ID']))
-				return $this->hasGood($x['ID'],isset($x['TransactionType'])?$x['TransactionType']:false);
+		if (is_array($x) && $x['Type'] == 'Good') { // instanceof Good) - No Good class yet, so array is the best we can do
+			if (isset($x['ID']))
+				return $this->hasGood($x['ID'], isset($x['TransactionType']) ? $x['TransactionType'] : false);
 		}
 		return false;
 	}

lib/Default/SmrPlanetType.class.inc

Spacing +26 added lines, -26 removed lines

@@ -40,7 +40,7 @@ 
 	/**
 	 * Access properties of structures that this planet type can build.
 	 */
-	function structureTypes($structureID=false) {
+	function structureTypes($structureID = false) {
 		if (!isset($this->structures)) {
 			foreach (static::STRUCTURES as $ID => $Info) {
 				$this->structures[$ID] = new SmrPlanetStructureType($ID, $Info);
@@ -77,12 +77,12 @@ 
 			'exp_gain' => 540,
 		],
 	];
-	function name()         { return "Terran Planet"; }
-	function imageLink()    { return "images/planet1.png"; }
-	function description()  { return "A lush world, with forests, seas, sweeping meadows, and indigenous lifeforms."; }
+	function name() { return "Terran Planet"; }
+	function imageLink() { return "images/planet1.png"; }
+	function description() { return "A lush world, with forests, seas, sweeping meadows, and indigenous lifeforms."; }
 	function maxAttackers() { return 10; }
-	function maxLanded()    { return self::MAX_LANDED_UNLIMITED; }
-	function menuOptions()  { return self::DEFAULT_MENU_OPTIONS; }
+	function maxLanded() { return self::MAX_LANDED_UNLIMITED; }
+	function menuOptions() { return self::DEFAULT_MENU_OPTIONS; }
 }
 
 class AridPlanet extends SmrPlanetType {
@@ -106,12 +106,12 @@ 
 			'exp_gain' => 180,
 		],
 	];
-	function name()         { return "Arid Planet"; }
-	function imageLink()    { return "images/planet2.png"; }
-	function description()  { return "A world mostly devoid of surface water, but capable of supporting life."; }
+	function name() { return "Arid Planet"; }
+	function imageLink() { return "images/planet2.png"; }
+	function description() { return "A world mostly devoid of surface water, but capable of supporting life."; }
 	function maxAttackers() { return 5; }
-	function maxLanded()    { return 5; }
-	function menuOptions()  { return ['CONSTRUCTION', 'DEFENSE', 'STOCKPILE', 'OWNERSHIP']; }
+	function maxLanded() { return 5; }
+	function menuOptions() { return ['CONSTRUCTION', 'DEFENSE', 'STOCKPILE', 'OWNERSHIP']; }
 }
 
 class DwarfPlanet extends SmrPlanetType {
@@ -135,12 +135,12 @@ 
 			'exp_gain' => 540,
 		],
 	];
-	function name()         { return "Dwarf Planet"; }
-	function imageLink()    { return "images/planet3.png"; }
-	function description()  { return "A smaller than usual planet, with no native life present."; }
+	function name() { return "Dwarf Planet"; }
+	function imageLink() { return "images/planet3.png"; }
+	function description() { return "A smaller than usual planet, with no native life present."; }
 	function maxAttackers() { return 5; }
-	function maxLanded()    { return self::MAX_LANDED_UNLIMITED; }
-	function menuOptions()  { return self::DEFAULT_MENU_OPTIONS; }
+	function maxLanded() { return self::MAX_LANDED_UNLIMITED; }
+	function menuOptions() { return self::DEFAULT_MENU_OPTIONS; }
 }
 
 class ProtoPlanet extends SmrPlanetType {
@@ -170,12 +170,12 @@ 
 			'exp_gain' => 540,
 		],
 	];
-	function name()         { return "Protoplanet"; }
-	function imageLink()    { return "images/planet5.png"; }
-	function description()  { return "A developing planet, not yet able to support the infrastructure of advanced technologies."; }
+	function name() { return "Protoplanet"; }
+	function imageLink() { return "images/planet5.png"; }
+	function description() { return "A developing planet, not yet able to support the infrastructure of advanced technologies."; }
 	function maxAttackers() { return 5; }
-	function maxLanded()    { return 5; }
-	function menuOptions()  { return self::DEFAULT_MENU_OPTIONS; }
+	function maxLanded() { return 5; }
+	function menuOptions() { return self::DEFAULT_MENU_OPTIONS; }
 }
 
 class DefenseWorld extends SmrPlanetType {
@@ -205,10 +205,10 @@ 
 			'exp_gain' => 9,
 		],
 	];
-	function name()         { return "Defense World"; }
-	function imageLink()    { return "images/planet4.png"; }
-	function description()  { return "A fully armed and operational battle station loaded with excessive firepower."; }
+	function name() { return "Defense World"; }
+	function imageLink() { return "images/planet4.png"; }
+	function description() { return "A fully armed and operational battle station loaded with excessive firepower."; }
 	function maxAttackers() { return 10; }
-	function maxLanded()    { return self::MAX_LANDED_UNLIMITED; }
-	function menuOptions()  { return self::DEFAULT_MENU_OPTIONS; }
+	function maxLanded() { return self::MAX_LANDED_UNLIMITED; }
+	function menuOptions() { return self::DEFAULT_MENU_OPTIONS; }
 }

lib/Default/Distance.class.inc

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
 	private $path = array();
 	private $warpMap = array();
 
-	public function __construct($gameID,$_startSectorId) {
+	public function __construct($gameID, $_startSectorId) {
 		$this->gameID = $gameID;
 		$this->addToPath($_startSectorId);
 	}
@@ -29,7 +29,7 @@ 
 	}
 
 	public function getTotalSectors() {
-		return $this->getDistance()+$this->getNumWarps();
+		return $this->getDistance() + $this->getNumWarps();
 	}
 
 	public function getNumWarps() {
@@ -48,15 +48,15 @@ 
 	 * @return the endSectorId
 	 */
 	public function getEndSectorID() {
-		return $this->path[count($this->path)-1];
+		return $this->path[count($this->path) - 1];
 	}
 
 	public function &getEndSector() {
-		return SmrSector::getSector($this->gameID,$this->getEndSectorID());
+		return SmrSector::getSector($this->gameID, $this->getEndSectorID());
 	}
 
 	public function compareTo(Distance $d) {
-		if ($this->equals($d)===true)
+		if ($this->equals($d) === true)
 			return 0;
 		else if ($d->getTurns() > $this->getTurns())
 			return -1;
@@ -109,7 +109,7 @@ 
 	}
 
 	public function isInPath($sectorID) {
-		return in_array($sectorID,$this->getPath());
+		return in_array($sectorID, $this->getPath());
 	}
 
 	/**

lib/Default/ChessPiece.class.inc

Spacing +84 added lines, -84 removed lines

@@ -52,10 +52,10 @@ 
 	}
 	
 	public function isAttacking(array &$board, array &$hasMoved, $king, $x = -1, $y = -1) {
-		$moves =& $this->getPossibleMoves($board, $hasMoved, null, true);
-		foreach($moves as &$move) {
-			$p =& $board[$move[1]][$move[0]];
-			if(($move[0] == $x && $move[1] == $y) || ($king === true && $p != null && $p->pieceID == self::KING && $this->colour != $p->colour)) {
+		$moves = & $this->getPossibleMoves($board, $hasMoved, null, true);
+		foreach ($moves as &$move) {
+			$p = & $board[$move[1]][$move[0]];
+			if (($move[0] == $x && $move[1] == $y) || ($king === true && $p != null && $p->pieceID == self::KING && $this->colour != $p->colour)) {
 				return true;
 			}
 		}
@@ -64,130 +64,130 @@ 
 
 	public function &getPossibleMoves(array &$board, array &$hasMoved, $forAccountID = null, $attackingCheck = false) {
 		$moves = array();
-		if($forAccountID == null || $this->accountID == $forAccountID) {
-			if($this->pieceID==self::PAWN) {
-				$dirY = $this->colour==ChessGame::PLAYER_BLACK ? 1 : -1;
-				$moveY = $this->y+$dirY;
+		if ($forAccountID == null || $this->accountID == $forAccountID) {
+			if ($this->pieceID == self::PAWN) {
+				$dirY = $this->colour == ChessGame::PLAYER_BLACK ? 1 : -1;
+				$moveY = $this->y + $dirY;
 				//Pawn forward movement is not attacking - so don't check it if doing an attacking check.
-				if(!$attackingCheck) {
-					if(ChessGame::isValidCoord($this->x, $moveY, $board) && $board[$moveY][$this->x] == null && $this->isSafeMove($board, $hasMoved, $this->x, $moveY)) {
-						$moves[] = array($this->x,$moveY);
+				if (!$attackingCheck) {
+					if (ChessGame::isValidCoord($this->x, $moveY, $board) && $board[$moveY][$this->x] == null && $this->isSafeMove($board, $hasMoved, $this->x, $moveY)) {
+						$moves[] = array($this->x, $moveY);
 					}
 					$doubleMoveY = $moveY + $dirY;
-					if($this->y-$dirY == 0 || $this->y-$dirY*2 == count($board)) { //Double move first move
-						if($board[$moveY][$this->x] == null && $board[$doubleMoveY][$this->x] == null && $this->isSafeMove($board, $hasMoved, $this->x, $doubleMoveY)) {
-							$moves[] = array($this->x,$doubleMoveY);
+					if ($this->y - $dirY == 0 || $this->y - $dirY * 2 == count($board)) { //Double move first move
+						if ($board[$moveY][$this->x] == null && $board[$doubleMoveY][$this->x] == null && $this->isSafeMove($board, $hasMoved, $this->x, $doubleMoveY)) {
+							$moves[] = array($this->x, $doubleMoveY);
 						}
 					}
 				}
-				for($i=-1;$i<2;$i+=2) {
-					$moveX = $this->x+$i;
-					if(ChessGame::isValidCoord($moveX, $moveY, $board)) {
-						if($attackingCheck || 
+				for ($i = -1; $i < 2; $i += 2) {
+					$moveX = $this->x + $i;
+					if (ChessGame::isValidCoord($moveX, $moveY, $board)) {
+						if ($attackingCheck || 
 							((($hasMoved[ChessPiece::PAWN][0] == $moveX && $hasMoved[ChessPiece::PAWN][1] == $this->y) || 
-							($board[$moveY][$moveX] != null && $board[$moveY][$moveX]->colour!=$this->colour))
+							($board[$moveY][$moveX] != null && $board[$moveY][$moveX]->colour != $this->colour))
 							&& $this->isSafeMove($board, $hasMoved, $moveX, $moveY))) {
-							$moves[] = array($moveX,$moveY);
+							$moves[] = array($moveX, $moveY);
 						}
 					}
 				}
 			}
-			else if($this->pieceID==self::KING) {
-				for($i = -1; $i < 2; $i++) {
-					for($j = -1; $j < 2; $j++) {
-						if($i!=0 || $j!=0) {
-							$this->addMove($this->x+$i, $this->y+$j, $board, $moves, $hasMoved, $attackingCheck);
+			else if ($this->pieceID == self::KING) {
+				for ($i = -1; $i < 2; $i++) {
+					for ($j = -1; $j < 2; $j++) {
+						if ($i != 0 || $j != 0) {
+							$this->addMove($this->x + $i, $this->y + $j, $board, $moves, $hasMoved, $attackingCheck);
 						}
 					}
 				}
 				//Castling is not attacking - so don't check it if doing an attacking check.
-				if(!$attackingCheck && !$hasMoved[$this->colour][ChessPiece::KING] && !ChessGame::isPlayerChecked($board, $hasMoved, $this->colour)) {
-					if(!$hasMoved[$this->colour][ChessPiece::ROOK]['Queen'] && 
-							ChessGame::isValidCoord($this->x-1, $this->y, $board) && $board[$this->y][$this->x-1] == null &&
-							ChessGame::isValidCoord($this->x-3, $this->y, $board) && $board[$this->y][$this->x-3] == null &&
-							$this->isSafeMove($board, $hasMoved, $this->x-1, $this->y)) {
-						$this->addMove($this->x-2, $this->y, $board, $moves, $hasMoved, $attackingCheck);
+				if (!$attackingCheck && !$hasMoved[$this->colour][ChessPiece::KING] && !ChessGame::isPlayerChecked($board, $hasMoved, $this->colour)) {
+					if (!$hasMoved[$this->colour][ChessPiece::ROOK]['Queen'] && 
+							ChessGame::isValidCoord($this->x - 1, $this->y, $board) && $board[$this->y][$this->x - 1] == null &&
+							ChessGame::isValidCoord($this->x - 3, $this->y, $board) && $board[$this->y][$this->x - 3] == null &&
+							$this->isSafeMove($board, $hasMoved, $this->x - 1, $this->y)) {
+						$this->addMove($this->x - 2, $this->y, $board, $moves, $hasMoved, $attackingCheck);
 					}
-					if(!$hasMoved[$this->colour][ChessPiece::ROOK]['King'] &&
-							ChessGame::isValidCoord($this->x+1, $this->y, $board) && $board[$this->y][$this->x+1] == null &&
-							$this->isSafeMove($board, $hasMoved, $this->x+1, $this->y)) {
-						$this->addMove($this->x+2, $this->y, $board, $moves, $hasMoved, $attackingCheck);
+					if (!$hasMoved[$this->colour][ChessPiece::ROOK]['King'] &&
+							ChessGame::isValidCoord($this->x + 1, $this->y, $board) && $board[$this->y][$this->x + 1] == null &&
+							$this->isSafeMove($board, $hasMoved, $this->x + 1, $this->y)) {
+						$this->addMove($this->x + 2, $this->y, $board, $moves, $hasMoved, $attackingCheck);
 					}
 				}
 			}
-			else if($this->pieceID==self::QUEEN) {
+			else if ($this->pieceID == self::QUEEN) {
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
+				while ($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Right
+				while ($this->addMove(++$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Right
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove($moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up
+				while ($this->addMove($moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove($moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down
+				while ($this->addMove($moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
+				while ($this->addMove(--$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Right
+				while ($this->addMove(++$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Right
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down-Left
+				while ($this->addMove(--$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down-Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
+				while ($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
 			}
-			else if($this->pieceID==self::ROOK) {
+			else if ($this->pieceID == self::ROOK) {
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
+				while ($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Right
+				while ($this->addMove(++$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Right
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove($moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up
+				while ($this->addMove($moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove($moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down
+				while ($this->addMove($moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down
 			}
-			else if($this->pieceID==self::BISHOP) {
+			else if ($this->pieceID == self::BISHOP) {
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
+				while ($this->addMove(--$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Right
+				while ($this->addMove(++$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Right
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down-Left
+				while ($this->addMove(--$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down-Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
+				while ($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
 			}
-			else if($this->pieceID==self::KNIGHT) {
-				$moveX = $this->x-1;
-				$moveY = $this->y-2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2up-left
+			else if ($this->pieceID == self::KNIGHT) {
+				$moveX = $this->x - 1;
+				$moveY = $this->y - 2;
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2up-left
 				$moveX += 2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2up-right
-				$moveY = $this->y+2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2down-right
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2up-right
+				$moveY = $this->y + 2;
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2down-right
 				$moveX -= 2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2down-left
-				$moveX = $this->x-2;
-				$moveY = $this->y-1;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2left-up
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2down-left
+				$moveX = $this->x - 2;
+				$moveY = $this->y - 1;
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2left-up
 				$moveY += 2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2left-down
-				$moveX = $this->x+2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2right-down
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2left-down
+				$moveX = $this->x + 2;
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2right-down
 				$moveY -= 2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2right-up
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2right-up
 			}
 		}
 		
@@ -195,11 +195,11 @@ 
 	}
 	
 	private function addMove($toX, $toY, array &$board, array &$moves, array &$hasMoved = null, $attackingCheck = true) {
-		if(ChessGame::isValidCoord($toX, $toY, $board)) {
-			if(($board[$toY][$toX] == null || $board[$toY][$toX]->colour!=$this->colour)) {
+		if (ChessGame::isValidCoord($toX, $toY, $board)) {
+			if (($board[$toY][$toX] == null || $board[$toY][$toX]->colour != $this->colour)) {
 				//We can only actually move to this position if it is safe to do so, however we can pass through it looking for a safe move so we still want to return true.
-				if(($attackingCheck == true || $this->isSafeMove($board, $hasMoved, $toX, $toY))) {
-					$moves[] = array($toX,$toY);
+				if (($attackingCheck == true || $this->isSafeMove($board, $hasMoved, $toX, $toY))) {
+					$moves[] = array($toX, $toY);
 				}
 				return true;
 			}
@@ -208,30 +208,30 @@ 
 	}
 	
 	public function promote($pawnPromotionPieceID, array &$board) {
-		if($pawnPromotionPieceID==null) {
+		if ($pawnPromotionPieceID == null) {
 			throw new Exception('Promotion piece cannot be null on a promote.');
 		}
 		$takenNos = array();
-		foreach($board as $row) {
-			foreach($row as $piece) {
-				if($piece != null && $piece->pieceID == $pawnPromotionPieceID && $piece->colour == $this->colour) {
+		foreach ($board as $row) {
+			foreach ($row as $piece) {
+				if ($piece != null && $piece->pieceID == $pawnPromotionPieceID && $piece->colour == $this->colour) {
 					$takenNos[$piece->pieceNo] = true;
 				}
 			}
 		}
-		$i=0;
-		while(isset($takenNos[$i])) {
+		$i = 0;
+		while (isset($takenNos[$i])) {
 			$i++;
 		}
 		return array('PieceID' => $pawnPromotionPieceID, 'PieceNo' => $i);
 	}
 
 	public function getPieceLetter() {
-		return self::getLetterForPiece($this->pieceID,$this->colour);
+		return self::getLetterForPiece($this->pieceID, $this->colour);
 	}
 
 	public function getPieceSymbol() {
-		return self::getSymbolForPiece($this->pieceID,$this->colour);
+		return self::getSymbolForPiece($this->pieceID, $this->colour);
 	}
 
 	public static function getSymbolForPiece($pieceID, $colour) {
@@ -239,7 +239,7 @@ 
 	}
 
 	public static function getLetterForPiece($pieceID, $colour) {
-		switch($pieceID) {
+		switch ($pieceID) {
 			case self::KING:
 				$letter = 'k';
 			break;
@@ -260,14 +260,14 @@ 
 				$letter = 'p';
 			break;
 		}
-		if($colour == ChessGame::PLAYER_WHITE) {
+		if ($colour == ChessGame::PLAYER_WHITE) {
 			$letter = strtoupper($letter);
 		}
 		return $letter;
 	}
 
 	public static function getPieceForLetter($letter) {
-		switch($letter) {
+		switch ($letter) {
 			case 'k':
 			case 'K':
 				return self::KING;

lib/Default/AbstractSmrAccount.class.inc

Spacing +282 added lines, -282 removed lines

@@ -10,23 +10,23 @@ 
 	protected const USER_RANKINGS_SCORE = array(
 		// [Stat, a, b]
 		// Used as: pow(Stat * a, USER_RANKINGS_EACH_STAT_POW) * b
-		array(array('Trade','Experience','Total'),.1,0.5),
-		array(array('Trade','Money','Profit'),0.00005,0.5),
-		array(array('Killing','Kills'),1000,1)
+		array(array('Trade', 'Experience', 'Total'), .1, 0.5),
+		array(array('Trade', 'Money', 'Profit'), 0.00005, 0.5),
+		array(array('Killing', 'Kills'), 1000, 1)
 		);
 
 	protected static $CACHE_ACCOUNTS = array();
 	protected const DEFAULT_HOTKEYS = array(
-		'MoveUp' => array('w','up'),
-		'ScanUp' => array('shift+w','shift+up'),
-		'MoveLeft' => array('a','left'),
-		'ScanLeft' => array('shift+a','shift+left'),
-		'MoveRight' => array('d','right'),
-		'ScanRight' => array('shift+d','shift+right'),
-		'MoveDown' => array('s','down'),
-		'ScanDown' => array('shift+s','shift+down'),
-		'MoveWarp' => array('e','0'),
-		'ScanWarp' => array('shift+e','shift+0'),
+		'MoveUp' => array('w', 'up'),
+		'ScanUp' => array('shift+w', 'shift+up'),
+		'MoveLeft' => array('a', 'left'),
+		'ScanLeft' => array('shift+a', 'shift+left'),
+		'MoveRight' => array('d', 'right'),
+		'ScanRight' => array('shift+d', 'shift+right'),
+		'MoveDown' => array('s', 'down'),
+		'ScanDown' => array('shift+s', 'shift+down'),
+		'MoveWarp' => array('e', '0'),
+		'ScanWarp' => array('shift+e', 'shift+0'),
 		'ScanCurrent' => array('shift+1'),
 		'CurrentSector' => array('1'),
 		'LocalMap' => array('2'),
@@ -85,8 +85,8 @@ 
 		return self::DEFAULT_HOTKEYS;
 	}
 
-	public static function &getAccount($accountID,$forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_ACCOUNTS[$accountID])) {
+	public static function &getAccount($accountID, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_ACCOUNTS[$accountID])) {
 			self::$CACHE_ACCOUNTS[$accountID] = new SmrAccount($accountID);
 		}
 		return self::$CACHE_ACCOUNTS[$accountID];
@@ -95,17 +95,17 @@ 
 	public static function getAccountByName($login, $forceUpdate = false) {
 		if (empty($login)) { return null; }
 		$db = new SmrMySqlDatabase();
-		$db->query('SELECT account_id FROM account WHERE login = '.$db->escapeString($login).' LIMIT 1');
-		if($db->nextRecord())
-			return self::getAccount($db->getField('account_id'),$forceUpdate);
+		$db->query('SELECT account_id FROM account WHERE login = ' . $db->escapeString($login) . ' LIMIT 1');
+		if ($db->nextRecord())
+			return self::getAccount($db->getField('account_id'), $forceUpdate);
 		$return = null;
 		return $return;
 	}
 
-	public static function getAccountByEmail($email, $forceUpdate=false) {
+	public static function getAccountByEmail($email, $forceUpdate = false) {
 		if (empty($email)) { return null; }
 		$db = new SmrMySqlDatabase();
-		$db->query('SELECT account_id FROM account WHERE email = '.$db->escapeString($email).' LIMIT 1');
+		$db->query('SELECT account_id FROM account WHERE email = ' . $db->escapeString($email) . ' LIMIT 1');
 		if ($db->nextRecord()) {
 			return self::getAccount($db->getInt('account_id'), $forceUpdate);
 		} else {
@@ -113,10 +113,10 @@ 
 		}
 	}
 
-	public static function getAccountByDiscordId($id, $forceUpdate=false) {
+	public static function getAccountByDiscordId($id, $forceUpdate = false) {
 		if (empty($id)) { return null; }
 		$db = new SmrMySqlDatabase();
-		$db->query('SELECT account_id FROM account where discord_id = '.$db->escapeString($id).' LIMIT 1');
+		$db->query('SELECT account_id FROM account where discord_id = ' . $db->escapeString($id) . ' LIMIT 1');
 		if ($db->nextRecord()) {
 			return self::getAccount($db->getField('account_id'), $forceUpdate);
 		} else {
@@ -127,7 +127,7 @@ 
 	public static function getAccountByIrcNick($nick, $forceUpdate = false) {
 		if (empty($nick)) { return null; }
 		$db = new SmrMySqlDatabase();
-		$db->query('SELECT account_id FROM account WHERE irc_nick = '.$db->escapeString($nick).' LIMIT 1');
+		$db->query('SELECT account_id FROM account WHERE irc_nick = ' . $db->escapeString($nick) . ' LIMIT 1');
 		if ($db->nextRecord()) {
 			return self::getAccount($db->getField('account_id'), $forceUpdate);
 		} else {
@@ -135,12 +135,12 @@ 
 		}
 	}
 
-	public static function getAccountBySocialLogin(SocialLogin $social, $forceUpdate=false) {
+	public static function getAccountBySocialLogin(SocialLogin $social, $forceUpdate = false) {
 		if (!$social->isValid()) { return null; }
 		$db = new SmrMySqlDatabase();
 		$db->query('SELECT account_id FROM account JOIN account_auth USING(account_id)
-		            WHERE login_type = '.$db->escapeString($social->getLoginType()).'
-		              AND auth_key = '.$db->escapeString($social->getUserID()).' LIMIT 1');
+		            WHERE login_type = '.$db->escapeString($social->getLoginType()) . '
+		              AND auth_key = '.$db->escapeString($social->getUserID()) . ' LIMIT 1');
 		if ($db->nextRecord()) {
 			return self::getAccount($db->getInt('account_id'), $forceUpdate);
 		} else {
@@ -149,7 +149,7 @@ 
 	}
 
 	public static function createAccount($login, $password, $email, $timez, $referral) {
-		if($referral!=0) {
+		if ($referral != 0) {
 			// Will throw if referral account doesn't exist
 			SmrAccount::getAccount($referral);
 		}
@@ -157,60 +157,60 @@ 
 		$passwordHash = password_hash($password, PASSWORD_DEFAULT);
 		$db->query('INSERT INTO account (login, password, email, validation_code, last_login, offset,referral_id,hof_name) VALUES(' .
 			$db->escapeString($login) . ', ' . $db->escapeString($passwordHash) . ', ' . $db->escapeString($email) . ', ' .
-			$db->escapeString(random_string(10)) . ',' . $db->escapeNumber(TIME) . ',' . $db->escapeNumber($timez) . ',' . $db->escapeNumber($referral).','.$db->escapeString($login).')');
+			$db->escapeString(random_string(10)) . ',' . $db->escapeNumber(TIME) . ',' . $db->escapeNumber($timez) . ',' . $db->escapeNumber($referral) . ',' . $db->escapeString($login) . ')');
 		return self::getAccountByName($login);
 	}
 
 	public static function getUserScoreCaseStatement($db) {
 		$userRankingTypes = array();
 		$case = 'FLOOR(SUM(CASE type ';
-		foreach(self::USER_RANKINGS_SCORE as $userRankingScore) {
-			$userRankingType = $db->escapeArray($userRankingScore[0],false,false,':',false);
+		foreach (self::USER_RANKINGS_SCORE as $userRankingScore) {
+			$userRankingType = $db->escapeArray($userRankingScore[0], false, false, ':', false);
 			$userRankingTypes[] = $userRankingType;
-			$case.= ' WHEN '.$db->escapeString($userRankingType).' THEN POW(amount*'.$userRankingScore[1].','.SmrAccount::USER_RANKINGS_EACH_STAT_POW.')*'.$userRankingScore[2];
+			$case .= ' WHEN ' . $db->escapeString($userRankingType) . ' THEN POW(amount*' . $userRankingScore[1] . ',' . SmrAccount::USER_RANKINGS_EACH_STAT_POW . ')*' . $userRankingScore[2];
 		}
 		$case .= ' END))';
-		return array('CASE'=>$case,'IN'=>$db->escapeArray($userRankingTypes));
+		return array('CASE'=>$case, 'IN'=>$db->escapeArray($userRankingTypes));
 	}
 
 	function __construct($accountID) {
 		$this->db = new SmrMySqlDatabase();
 		$this->SQL = 'account_id = ' . $this->db->escapeNumber($accountID);
-		$this->db->query('SELECT * FROM account WHERE '.$this->SQL.' LIMIT 1');
+		$this->db->query('SELECT * FROM account WHERE ' . $this->SQL . ' LIMIT 1');
 
 		if ($this->db->nextRecord()) {
 			$row = $this->db->getRow();
-			$this->account_id		= $row['account_id'];
+			$this->account_id = $row['account_id'];
 
 			$this->login			= $row['login'];
-			$this->passwordHash		= $row['password'];
+			$this->passwordHash = $row['password'];
 			$this->email			= $row['email'];
-			$this->validated		= $this->db->getBoolean('validated');
+			$this->validated = $this->db->getBoolean('validated');
 
-			$this->last_login		= $row['last_login'];
-			$this->validation_code 	= $row['validation_code'];
-			$this->veteranForced	= $this->db->getBoolean('veteran');
-			$this->logging			= $this->db->getBoolean('logging');
+			$this->last_login = $row['last_login'];
+			$this->validation_code = $row['validation_code'];
+			$this->veteranForced = $this->db->getBoolean('veteran');
+			$this->logging = $this->db->getBoolean('logging');
 			$this->offset			= $row['offset'];
 			$this->images			= $row['images'];
-			$this->fontSize			= $row['fontsize'];
+			$this->fontSize = $row['fontsize'];
 
-			$this->passwordReset	= $row['password_reset'];
-			$this->useAJAX			= $this->db->getBoolean('use_ajax');
-			$this->mailBanned		= (int)$row['mail_banned'];
+			$this->passwordReset = $row['password_reset'];
+			$this->useAJAX = $this->db->getBoolean('use_ajax');
+			$this->mailBanned = (int)$row['mail_banned'];
 			
-			$this->friendlyColour 	= $row['friendly_colour'];
-			$this->neutralColour 	= $row['neutral_colour'];
-			$this->enemyColour 		= $row['enemy_colour'];
+			$this->friendlyColour = $row['friendly_colour'];
+			$this->neutralColour = $row['neutral_colour'];
+			$this->enemyColour = $row['enemy_colour'];
 
-			$this->cssLink			= $row['css_link'];
-			$this->defaultCSSEnabled	= $this->db->getBoolean('default_css_enabled');
-			$this->centerGalaxyMapOnPlayer	= $this->db->getBoolean('center_galaxy_map_on_player');
+			$this->cssLink = $row['css_link'];
+			$this->defaultCSSEnabled = $this->db->getBoolean('default_css_enabled');
+			$this->centerGalaxyMapOnPlayer = $this->db->getBoolean('center_galaxy_map_on_player');
 
 			$this->messageNotifications = $this->db->getObject('message_notifications');
 			$this->hotkeys = $this->db->getObject('hotkeys');
-			foreach(self::DEFAULT_HOTKEYS as $hotkey => $binding) {
-				if(!isset($this->hotkeys[$hotkey])) {
+			foreach (self::DEFAULT_HOTKEYS as $hotkey => $binding) {
+				if (!isset($this->hotkeys[$hotkey])) {
 					$this->hotkeys[$hotkey] = $binding;
 				}
 			}
@@ -219,8 +219,8 @@ 
 				$this->oldAccountIDs[$databaseName] = $row[$oldColumn];
 			}
 
-			$this->referrerID		= $row['referral_id'];
-			$this->maxRankAchieved	= $row['max_rank_achieved'];
+			$this->referrerID = $row['referral_id'];
+			$this->maxRankAchieved = $row['max_rank_achieved'];
 
 			$this->hofName			= $row['hof_name'];
 			$this->discordId		= $row['discord_id'];
@@ -230,19 +230,19 @@ 
 			$this->timeShort		= $row['time_short'];
 
 			$this->template			= $row['template'];
-			$this->colourScheme		= $row['colour_scheme'];
+			$this->colourScheme = $row['colour_scheme'];
 
-			if(empty($this->hofName))
-				$this->hofName=$this->login;
+			if (empty($this->hofName))
+				$this->hofName = $this->login;
 		}
 		else {
-			throw new AccountNotFoundException('Account ID '.$accountID.' does not exist!');
+			throw new AccountNotFoundException('Account ID ' . $accountID . ' does not exist!');
 		}
 	}
 
 	public function isDisabled() {
 		$this->db->query('SELECT * FROM account_is_closed JOIN closing_reason USING(reason_id) ' .
-			'WHERE '.$this->SQL.' LIMIT 1');
+			'WHERE ' . $this->SQL . ' LIMIT 1');
 		if ($this->db->nextRecord()) {
 			// get the expire time
 			$expireTime = $this->db->getInt('expires');
@@ -264,64 +264,64 @@ 
 	}
 
 	function update() {
-		$this->db->query('UPDATE account SET email = '.$this->db->escapeString($this->email).
-			', validation_code = '.$this->db->escapeString($this->validation_code).
-			', validated = '.$this->db->escapeBoolean($this->validated).
-			', password = '.$this->db->escapeString($this->passwordHash).
-			', images = '.$this->db->escapeString($this->images).
-			', password_reset = '.$this->db->escapeString($this->passwordReset).
-			', use_ajax='.$this->db->escapeBoolean($this->useAJAX).
-			', mail_banned='.$this->db->escapeNumber($this->mailBanned).
-			', max_rank_achieved='.$this->db->escapeNumber($this->maxRankAchieved).
-			', default_css_enabled='.$this->db->escapeBoolean($this->defaultCSSEnabled).
-			', center_galaxy_map_on_player='.$this->db->escapeBoolean($this->centerGalaxyMapOnPlayer).
-			', message_notifications='.$this->db->escapeObject($this->messageNotifications).
-			', hotkeys='.$this->db->escapeObject($this->hotkeys).
-			', last_login = '.$this->db->escapeNumber($this->last_login).
-			', logging = '.$this->db->escapeBoolean($this->logging).
-			', time_short = ' . $this->db->escapeString($this->timeShort).
-			', date_short = ' . $this->db->escapeString($this->dateShort).
-			', discord_id = ' . $this->db->escapeString($this->discordId, true, true).
-			', irc_nick = ' . $this->db->escapeString($this->ircNick, true, true).
-			', hof_name = ' . $this->db->escapeString($this->hofName).
-			', colour_scheme = ' . $this->db->escapeString($this->colourScheme).
-			', fontsize = ' . $this->db->escapeNumber($this->fontSize).
-			', css_link = ' . $this->db->escapeString($this->cssLink,true,true).
-			', friendly_colour = ' . $this->db->escapeString($this->friendlyColour, true, true).
-			', neutral_colour = ' . $this->db->escapeString($this->neutralColour, true, true).
-			', enemy_colour = ' . $this->db->escapeString($this->enemyColour, true, true).
-			' WHERE '.$this->SQL.' LIMIT 1');
+		$this->db->query('UPDATE account SET email = ' . $this->db->escapeString($this->email) .
+			', validation_code = ' . $this->db->escapeString($this->validation_code) .
+			', validated = ' . $this->db->escapeBoolean($this->validated) .
+			', password = ' . $this->db->escapeString($this->passwordHash) .
+			', images = ' . $this->db->escapeString($this->images) .
+			', password_reset = ' . $this->db->escapeString($this->passwordReset) .
+			', use_ajax=' . $this->db->escapeBoolean($this->useAJAX) .
+			', mail_banned=' . $this->db->escapeNumber($this->mailBanned) .
+			', max_rank_achieved=' . $this->db->escapeNumber($this->maxRankAchieved) .
+			', default_css_enabled=' . $this->db->escapeBoolean($this->defaultCSSEnabled) .
+			', center_galaxy_map_on_player=' . $this->db->escapeBoolean($this->centerGalaxyMapOnPlayer) .
+			', message_notifications=' . $this->db->escapeObject($this->messageNotifications) .
+			', hotkeys=' . $this->db->escapeObject($this->hotkeys) .
+			', last_login = ' . $this->db->escapeNumber($this->last_login) .
+			', logging = ' . $this->db->escapeBoolean($this->logging) .
+			', time_short = ' . $this->db->escapeString($this->timeShort) .
+			', date_short = ' . $this->db->escapeString($this->dateShort) .
+			', discord_id = ' . $this->db->escapeString($this->discordId, true, true) .
+			', irc_nick = ' . $this->db->escapeString($this->ircNick, true, true) .
+			', hof_name = ' . $this->db->escapeString($this->hofName) .
+			', colour_scheme = ' . $this->db->escapeString($this->colourScheme) .
+			', fontsize = ' . $this->db->escapeNumber($this->fontSize) .
+			', css_link = ' . $this->db->escapeString($this->cssLink, true, true) .
+			', friendly_colour = ' . $this->db->escapeString($this->friendlyColour, true, true) .
+			', neutral_colour = ' . $this->db->escapeString($this->neutralColour, true, true) .
+			', enemy_colour = ' . $this->db->escapeString($this->enemyColour, true, true) .
+			' WHERE ' . $this->SQL . ' LIMIT 1');
 		$this->hasChanged = false;
 	}
 
 	function updateIP() {
 		$curr_ip = getIpAddress();
-		$this->log(LOG_TYPE_LOGIN, 'logged in from '.$curr_ip);
+		$this->log(LOG_TYPE_LOGIN, 'logged in from ' . $curr_ip);
 
 		// more than 50 elements in it?
 
-		$this->db->query('SELECT time,ip FROM account_has_ip WHERE '.$this->SQL.' ORDER BY time ASC');
+		$this->db->query('SELECT time,ip FROM account_has_ip WHERE ' . $this->SQL . ' ORDER BY time ASC');
 		if ($this->db->getNumRows() > 50 && $this->db->nextRecord()) {
 			$delete_time = $this->db->getField('time');
 			$delete_ip = $this->db->getField('ip');
 
 			$this->db->query('DELETE FROM account_has_ip
-				WHERE '.$this->SQL.' AND
-				time = '.$this->db->escapeNumber($delete_time).' AND
+				WHERE '.$this->SQL . ' AND
+				time = '.$this->db->escapeNumber($delete_time) . ' AND
 				ip = '.$this->db->escapeString($delete_ip));
 		}
-		list($fi,$se,$th,$fo) = preg_split('/[.\s,]/', $curr_ip, 4);
+		list($fi, $se, $th, $fo) = preg_split('/[.\s,]/', $curr_ip, 4);
 		if ($curr_ip != 'unknown' && $curr_ip != 'unknown...' && $curr_ip != 'unknown, unknown') {
-			$curr_ip = $fi.'.'.$se.'.'.$th.'.'.$fo;
+			$curr_ip = $fi . '.' . $se . '.' . $th . '.' . $fo;
 			$host = gethostbyaddr($curr_ip);
 		} else $host = 'unknown';
 
 		// save...first make sure there isn't one for these keys (someone could double click and get error)
-		$this->db->query('REPLACE INTO account_has_ip (account_id, time, ip, host) VALUES ('.$this->db->escapeNumber($this->account_id).', '.$this->db->escapeNumber(TIME).', '.$this->db->escapeString($curr_ip).', '.$this->db->escapeString($host).')');
+		$this->db->query('REPLACE INTO account_has_ip (account_id, time, ip, host) VALUES (' . $this->db->escapeNumber($this->account_id) . ', ' . $this->db->escapeNumber(TIME) . ', ' . $this->db->escapeString($curr_ip) . ', ' . $this->db->escapeString($host) . ')');
 	}
 
 	public function updateLastLogin() {
-		if($this->last_login == TIME)
+		if ($this->last_login == TIME)
 			return;
 		$this->last_login = TIME;
 		$this->hasChanged = true;
@@ -333,9 +333,9 @@ 
 	}
 
 	public function setLoggingEnabled($bool) {
-		if($this->logging==$bool)
+		if ($this->logging == $bool)
 			return;
-		$this->logging=$bool;
+		$this->logging = $bool;
 		$this->hasChanged = true;
 		$this->update();
 	}
@@ -355,26 +355,26 @@ 
 	}
 
 	public function isNPC() {
-		if(!isset($this->npc)) {
-			$this->db->query('SELECT login FROM npc_logins WHERE login = '.$this->db->escapeString($this->getLogin()).' LIMIT 1;');
+		if (!isset($this->npc)) {
+			$this->db->query('SELECT login FROM npc_logins WHERE login = ' . $this->db->escapeString($this->getLogin()) . ' LIMIT 1;');
 			$this->npc = $this->db->nextRecord();
 		}
 		return $this->npc;
 	}
 
 	protected function getHOFData() {
-		if(!isset($this->HOF)) {
+		if (!isset($this->HOF)) {
 			//Get Player HOF
 			$this->db->query('SELECT type,sum(amount) as amount FROM player_hof WHERE ' . $this->SQL . ' AND game_id IN (SELECT game_id FROM game WHERE ignore_stats = \'FALSE\') GROUP BY type');
 			$this->HOF = array();
-			while($this->db->nextRecord()) {
-				$hof =& $this->HOF;
-				$typeList = explode(':',$this->db->getField('type'));
-				foreach($typeList as $type) {
-					if(!isset($hof[$type])) {
+			while ($this->db->nextRecord()) {
+				$hof = & $this->HOF;
+				$typeList = explode(':', $this->db->getField('type'));
+				foreach ($typeList as $type) {
+					if (!isset($hof[$type])) {
 						$hof[$type] = array();
 					}
-					$hof =& $hof[$type];
+					$hof = & $hof[$type];
 				}
 				$hof = $this->db->getField('amount');
 			}
@@ -383,11 +383,11 @@ 
 
 	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];
 		}
@@ -396,58 +396,58 @@ 
 
 	function getRankName() {
 		$rankings = Globals::getUserRanking();
-		if(isset($rankings[$this->getRank()]))
+		if (isset($rankings[$this->getRank()]))
 			return $rankings[$this->getRank()];
 		else
 			return end($rankings);
 	}
 
 	public function getScore() {
-		if(!isset($this->score)) {
-			$score=0;
-			foreach($this->getIndividualScores() as $each) {
-				$score+=$each['Score'];
+		if (!isset($this->score)) {
+			$score = 0;
+			foreach ($this->getIndividualScores() as $each) {
+				$score += $each['Score'];
 			}
-			$this->score=round($score);
+			$this->score = round($score);
 		}
 		return $this->score;
 	}
 
 	public function &getIndividualScores(SmrPlayer $player = null) {
-		$gameID=0;
-		if($player!=null)
+		$gameID = 0;
+		if ($player != null)
 			$gameID = $player->getGameID();
-		if(!isset($this->individualScores[$gameID])) {
+		if (!isset($this->individualScores[$gameID])) {
 			$this->individualScores[$gameID] = array();
-			foreach(self::USER_RANKINGS_SCORE as $statScore) {
-				if($player==null)
+			foreach (self::USER_RANKINGS_SCORE as $statScore) {
+				if ($player == null)
 					$stat = $this->getHOF($statScore[0]);
 				else
 					$stat = $player->getHOF($statScore[0]);
-				$this->individualScores[$gameID][]=array('Stat'=>$statScore[0],'Score'=>pow($stat*$statScore[1],self::USER_RANKINGS_EACH_STAT_POW)*$statScore[2]);
+				$this->individualScores[$gameID][] = array('Stat'=>$statScore[0], 'Score'=>pow($stat * $statScore[1], self::USER_RANKINGS_EACH_STAT_POW) * $statScore[2]);
 			}
 		}
 		return $this->individualScores[$gameID];
 	}
 
 	public function getRank() {
-		$rank = ceil(pow($this->getScore(),self::USER_RANKINGS_TOTAL_SCORE_POW)/self::USER_RANKINGS_RANK_BOUNDARY);
-		if($rank<1)
-			$rank=1;
-		if($rank > $this->maxRankAchieved)
+		$rank = ceil(pow($this->getScore(), self::USER_RANKINGS_TOTAL_SCORE_POW) / self::USER_RANKINGS_RANK_BOUNDARY);
+		if ($rank < 1)
+			$rank = 1;
+		if ($rank > $this->maxRankAchieved)
 			$this->updateMaxRankAchieved($rank);
 		return $rank;
 	}
 
 	protected function updateMaxRankAchieved($rank) {
-		if($rank <= $this->maxRankAchieved)
+		if ($rank <= $this->maxRankAchieved)
 			throw new Exception('Trying to set max rank achieved to a lower value: ' . $rank);
 		$delta = $rank - $this->maxRankAchieved;
-		if($this->hasReferrer()) {
+		if ($this->hasReferrer()) {
 			$this->getReferrer()->increaseSmrRewardCredits($delta * CREDITS_PER_DOLLAR);
 		}
-		$this->maxRankAchieved+=$delta;
-		$this->hasChanged=true;
+		$this->maxRankAchieved += $delta;
+		$this->hasChanged = true;
 		$this->update();
 	}
 
@@ -456,7 +456,7 @@ 
 	}
 
 	public function hasReferrer() {
-		return $this->referrerID>0;
+		return $this->referrerID > 0;
 	}
 
 	public function &getReferrer() {
@@ -467,15 +467,15 @@ 
 		if ($this->isLoggingEnabled()) {
 			$this->db->query('INSERT INTO account_has_logs ' .
 				'(account_id, microtime, log_type_id, message, sector_id) ' .
-				'VALUES('.$this->db->escapeNumber($this->account_id).', '. $this->db->escapeMicrotime(MICRO_TIME) . ', '.$this->db->escapeNumber($log_type_id).', ' . $this->db->escapeString($msg) . ', '.$this->db->escapeNumber($sector_id).')');
+				'VALUES(' . $this->db->escapeNumber($this->account_id) . ', ' . $this->db->escapeMicrotime(MICRO_TIME) . ', ' . $this->db->escapeNumber($log_type_id) . ', ' . $this->db->escapeString($msg) . ', ' . $this->db->escapeNumber($sector_id) . ')');
 		}
 	}
 
 	protected function getSmrCreditsData() {
-		if(!isset($this->credits)||!isset($this->rewardCredits)) {
+		if (!isset($this->credits) || !isset($this->rewardCredits)) {
 			$this->credits = 0;
 			$this->rewardCredits = 0;
-			$this->db->query('SELECT * FROM account_has_credits WHERE '.$this->SQL.' LIMIT 1');
+			$this->db->query('SELECT * FROM account_has_credits WHERE ' . $this->SQL . ' LIMIT 1');
 			if ($this->db->nextRecord()) {
 				$this->credits = $this->db->getInt('credits_left');
 				$this->rewardCredits = $this->db->getInt('reward_credits');
@@ -488,26 +488,26 @@ 
 	}
 
 	public function decreaseTotalSmrCredits($totalCredits) {
-		if($totalCredits==0)
+		if ($totalCredits == 0)
 			return;
-		if($totalCredits<0)
+		if ($totalCredits < 0)
 			throw new Exception('You cannot use negative total credits');
-		if($totalCredits>$this->getTotalSmrCredits())
+		if ($totalCredits > $this->getTotalSmrCredits())
 			throw new Exception('You do not have that many credits in total to use');
 
-		$rewardCredits=$this->rewardCredits;
-		$credits=$this->credits;
-		$rewardCredits-=$totalCredits;
-		if($rewardCredits<0) {
-			$credits+=$rewardCredits;
-			$rewardCredits=0;
+		$rewardCredits = $this->rewardCredits;
+		$credits = $this->credits;
+		$rewardCredits -= $totalCredits;
+		if ($rewardCredits < 0) {
+			$credits += $rewardCredits;
+			$rewardCredits = 0;
 		}
-		if($this->credits==0 && $this->rewardCredits==0)
-			$this->db->query('REPLACE INTO account_has_credits (account_id, credits_left, reward_credits) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).','.$this->db->escapeNumber($rewardCredits).')');
+		if ($this->credits == 0 && $this->rewardCredits == 0)
+			$this->db->query('REPLACE INTO account_has_credits (account_id, credits_left, reward_credits) VALUES(' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber($credits) . ',' . $this->db->escapeNumber($rewardCredits) . ')');
 		else
-			$this->db->query('UPDATE account_has_credits SET credits_left='.$this->db->escapeNumber($credits).', reward_credits='.$this->db->escapeNumber($rewardCredits).' WHERE '.$this->SQL.' LIMIT 1');
-		$this->credits=$credits;
-		$this->rewardCredits=$rewardCredits;
+			$this->db->query('UPDATE account_has_credits SET credits_left=' . $this->db->escapeNumber($credits) . ', reward_credits=' . $this->db->escapeNumber($rewardCredits) . ' WHERE ' . $this->SQL . ' LIMIT 1');
+		$this->credits = $credits;
+		$this->rewardCredits = $rewardCredits;
 	}
 
 	public function getSmrCredits() {
@@ -521,49 +521,49 @@ 
 	}
 
 	public function setSmrCredits($credits) {
-		if($this->getSmrCredits()==$credits)
+		if ($this->getSmrCredits() == $credits)
 			return;
-		if($this->credits==0 && $this->rewardCredits==0)
-			$this->db->query('REPLACE INTO account_has_credits (account_id, credits_left) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).')');
+		if ($this->credits == 0 && $this->rewardCredits == 0)
+			$this->db->query('REPLACE INTO account_has_credits (account_id, credits_left) VALUES(' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber($credits) . ')');
 		else
-			$this->db->query('UPDATE account_has_credits SET credits_left='.$this->db->escapeNumber($credits).' WHERE '.$this->SQL.' LIMIT 1');
-		$this->credits=$credits;
+			$this->db->query('UPDATE account_has_credits SET credits_left=' . $this->db->escapeNumber($credits) . ' WHERE ' . $this->SQL . ' LIMIT 1');
+		$this->credits = $credits;
 	}
 
 	public function increaseSmrCredits($credits) {
-		if($credits==0)
+		if ($credits == 0)
 			return;
-		if($credits<0)
+		if ($credits < 0)
 			throw new Exception('You cannot gain negative credits');
-		$this->setSmrCredits($this->getSmrCredits()+$credits);
+		$this->setSmrCredits($this->getSmrCredits() + $credits);
 	}
 
 	public function decreaseSmrCredits($credits) {
-		if($credits==0)
+		if ($credits == 0)
 			return;
-		if($credits<0)
+		if ($credits < 0)
 			throw new Exception('You cannot use negative credits');
-		if($credits>$this->getSmrCredits())
+		if ($credits > $this->getSmrCredits())
 			throw new Exception('You cannot use more credits than you have');
-		$this->setSmrCredits($this->getSmrCredits()-$credits);
+		$this->setSmrCredits($this->getSmrCredits() - $credits);
 	}
 
 	public function setSmrRewardCredits($credits) {
-		if($this->getSmrRewardCredits()==$credits)
+		if ($this->getSmrRewardCredits() == $credits)
 			return;
-		if($this->credits==0 && $this->rewardCredits==0)
-			$this->db->query('REPLACE INTO account_has_credits (account_id, reward_credits) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).')');
+		if ($this->credits == 0 && $this->rewardCredits == 0)
+			$this->db->query('REPLACE INTO account_has_credits (account_id, reward_credits) VALUES(' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber($credits) . ')');
 		else
-			$this->db->query('UPDATE account_has_credits SET reward_credits='.$this->db->escapeNumber($credits).' WHERE '.$this->SQL.' LIMIT 1');
-		$this->rewardCredits=$credits;
+			$this->db->query('UPDATE account_has_credits SET reward_credits=' . $this->db->escapeNumber($credits) . ' WHERE ' . $this->SQL . ' LIMIT 1');
+		$this->rewardCredits = $credits;
 	}
 
 	public function increaseSmrRewardCredits($credits) {
-		if($credits==0)
+		if ($credits == 0)
 			return;
-		if($credits<0)
+		if ($credits < 0)
 			throw new Exception('You cannot gain negative reward credits');
-		$this->setSmrRewardCredits($this->getSmrRewardCredits()+$credits);
+		$this->setSmrRewardCredits($this->getSmrRewardCredits() + $credits);
 	}
 
 	public function sendMessageToBox($boxTypeID, $message) {
@@ -571,7 +571,7 @@ 
 		self::doMessageSendingToBox($this->getAccountID(), $boxTypeID, $message);
 	}
 
-	public static function doMessageSendingToBox($senderID, $boxTypeID, $message, $gameID=0) {
+	public static function doMessageSendingToBox($senderID, $boxTypeID, $message, $gameID = 0) {
 		$db = new SmrMySqlDatabase();
 		// send him the message
 		$db->query('INSERT INTO message_boxes
@@ -594,13 +594,13 @@ 
 	}
 
 	public function getOldAccountID($dbName) {
-		return isset($this->oldAccountIDs[$dbName])?$this->oldAccountIDs[$dbName]:0;
+		return isset($this->oldAccountIDs[$dbName]) ? $this->oldAccountIDs[$dbName] : 0;
 	}
 
-	public function hasOldAccountID($dbName=false) {
-		if($dbName===false)
-			return count($this->getOldAccountIDs())!=0;
-		return $this->getOldAccountID($dbName)!=0;
+	public function hasOldAccountID($dbName = false) {
+		if ($dbName === false)
+			return count($this->getOldAccountIDs()) != 0;
+		return $this->getOldAccountID($dbName) != 0;
 	}
 
 	public function getLogin() {
@@ -612,7 +612,7 @@ 
 	}
 
 	public function setEmail($email) {
-		if($this->email==$email) {
+		if ($this->email == $email) {
 			return;
 		}
 		$this->email = $email;
@@ -629,14 +629,14 @@ 
 
 		// check if the host got a MX or at least an A entry
 		if (!checkdnsrr($host, 'MX') && !checkdnsrr($host, 'A')) {
-			create_error('This is not a valid email address! The domain '.$host.' does not exist.');
+			create_error('This is not a valid email address! The domain ' . $host . ' does not exist.');
 		}
 
 		if (strstr($email, ' ')) {
 			create_error('The email is invalid! It cannot contain any spaces.');
 		}
 
-		$this->db->query('SELECT 1 FROM account WHERE email = '.$this->db->escapeString($email).' and account_id != ' . $this->db->escapeNumber($this->getAccountID()) . ' LIMIT 1');
+		$this->db->query('SELECT 1 FROM account WHERE email = ' . $this->db->escapeString($email) . ' and account_id != ' . $this->db->escapeNumber($this->getAccountID()) . ' LIMIT 1');
 		if ($this->db->getNumRows() > 0) {
 			create_error('This email address is already registered.');
 		}
@@ -647,12 +647,12 @@ 
 
 		// remember when we sent validation code
 		$this->db->query('REPLACE INTO notification (notification_type, account_id, time)
-				VALUES(\'validation_code\', '.$this->db->escapeNumber($this->getAccountID()).', ' . $this->db->escapeNumber(TIME) . ')');
+				VALUES(\'validation_code\', '.$this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber(TIME) . ')');
 
 		$emailMessage =
-			'You changed your email address registered with SMR and need to revalidate now!'.EOL.EOL.
-			'   Your new validation code is: '.$this->getValidationCode().EOL.EOL.
-			'The Space Merchant Realms server is on the web at '.URL;
+			'You changed your email address registered with SMR and need to revalidate now!' . EOL . EOL .
+			'   Your new validation code is: ' . $this->getValidationCode() . EOL . EOL .
+			'The Space Merchant Realms server is on the web at ' . URL;
 
 		$mail = setupMailer();
 		$mail->Subject = 'Your validation code!';
@@ -678,7 +678,7 @@ 
 	}
 
 	public function setFontSize($size) {
-		if($this->fontSize==$size)
+		if ($this->fontSize == $size)
 			return;
 		$this->fontSize = $size;
 		$this->hasChanged = true;
@@ -692,7 +692,7 @@ 
 
 	// sets the extra CSS file linked in preferences
 	public function setCssLink($link) {
-		if($this->cssLink==$link)
+		if ($this->cssLink == $link)
 			return;
 		$this->cssLink = $link;
 		$this->hasChanged = true;
@@ -704,11 +704,11 @@ 
 	}
 
 	public function setTemplate($template) {
-		if($this->template==$template)
+		if ($this->template == $template)
 			return;
-		if(!in_array($template,array_keys(Globals::getAvailableTemplates())))
-			throw new Exception('Template not allowed: '.$template);
-		$this->db->query('UPDATE account SET template = ' . $this->db->escapeString($template) . ' WHERE '.$this->SQL.' LIMIT 1');
+		if (!in_array($template, array_keys(Globals::getAvailableTemplates())))
+			throw new Exception('Template not allowed: ' . $template);
+		$this->db->query('UPDATE account SET template = ' . $this->db->escapeString($template) . ' WHERE ' . $this->SQL . ' LIMIT 1');
 		$this->template = $template;
 		$colourSchemes = Globals::getAvailableColourSchemes($template);
 		$this->setColourScheme($colourSchemes[0]);
@@ -719,10 +719,10 @@ 
 	}
 
 	public function setColourScheme($colourScheme) {
-		if($this->colourScheme==$colourScheme)
+		if ($this->colourScheme == $colourScheme)
 			return;
-		if(!in_array($colourScheme,array_keys(Globals::getAvailableColourSchemes($this->getTemplate()))))
-			throw new Exception('Colour scheme not allowed: '.$colourScheme);
+		if (!in_array($colourScheme, array_keys(Globals::getAvailableColourSchemes($this->getTemplate()))))
+			throw new Exception('Colour scheme not allowed: ' . $colourScheme);
 		$this->colourScheme = $colourScheme;
 		$this->hasChanged = true;
 		$this->update();
@@ -738,7 +738,7 @@ 
 		return CSS_COLOUR_URLS[$this->getTemplate()][$this->getColourScheme()];
 	}
 
-	public function getHofName($linked=false) {
+	public function getHofName($linked = false) {
 		if ($linked) {
 			return '<a href="' . $this->getPersonalHofHREF() . '">' . $this->hofName . '</a>';
 		} else {
@@ -747,7 +747,7 @@ 
 	}
 
 	public function setHofName($name) {
-		if($this->hofName==$name)
+		if ($this->hofName == $name)
 			return;
 		$this->hofName = $name;
 		$this->hasChanged = true;
@@ -759,7 +759,7 @@ 
 	}
 
 	public function setIrcNick($nick) {
-		if($this->ircNick==$nick)
+		if ($this->ircNick == $nick)
 			return;
 		$this->ircNick = $nick;
 		$this->hasChanged = true;
@@ -780,7 +780,7 @@ 
 	}
 
 	public function getReferralLink() {
-		return URL . '/login_create.php?ref='.$this->getAccountID();
+		return URL . '/login_create.php?ref=' . $this->getAccountID();
 	}
 
 	public function getShortDateFormat() {
@@ -788,7 +788,7 @@ 
 	}
 
 	public function setShortDateFormat($format) {
-		if($this->dateShort==$format)
+		if ($this->dateShort == $format)
 			return;
 		$this->dateShort = $format;
 		$this->hasChanged = true;
@@ -800,7 +800,7 @@ 
 	}
 
 	public function setShortTimeFormat($format) {
-		if($this->timeShort==$format)
+		if ($this->timeShort == $format)
 			return;
 		$this->timeShort = $format;
 		$this->hasChanged = true;
@@ -812,15 +812,15 @@ 
 	}
 
 	protected function setValidationCode($code) {
-		if($this->validation_code == $code)
+		if ($this->validation_code == $code)
 			return;
-		$this->validation_code=$code;
-		$this->hasChanged=true;
+		$this->validation_code = $code;
+		$this->hasChanged = true;
 		$this->update();
 	}
 
 	public function setValidated($bool) {
-		if($this->validated == $bool)
+		if ($this->validated == $bool)
 			return;
 		$this->validated = $bool;
 		$this->hasChanged = true;
@@ -832,7 +832,7 @@ 
 	}
 
 	public function isLoggedIn() {
-		$this->db->query('SELECT 1 FROM active_session WHERE account_id = '.$this->db->escapeNumber($this->getAccountID()).' LIMIT 1');
+		$this->db->query('SELECT 1 FROM active_session WHERE account_id = ' . $this->db->escapeNumber($this->getAccountID()) . ' LIMIT 1');
 		return $this->db->nextRecord();
 	}
 
@@ -873,15 +873,15 @@ 
 		$this->update();
 	}
 
-	public function addAuthMethod($loginType,$authKey) {
-		$this->db->query('SELECT account_id FROM account_auth WHERE login_type='.$this->db->escapeString($loginType).' AND auth_key = '.$this->db->escapeString($authKey).';');
-		if($this->db->nextRecord()) {
-			if($this->db->getInt('account_id')!=$this->getAccountID()) {
+	public function addAuthMethod($loginType, $authKey) {
+		$this->db->query('SELECT account_id FROM account_auth WHERE login_type=' . $this->db->escapeString($loginType) . ' AND auth_key = ' . $this->db->escapeString($authKey) . ';');
+		if ($this->db->nextRecord()) {
+			if ($this->db->getInt('account_id') != $this->getAccountID()) {
 				throw new Exception('Another account already uses this form of auth.');
 			}
 			return true;
 		}
-		$this->db->query('INSERT INTO account_auth values ('.$this->db->escapeNumber($this->getAccountID()).','.$this->db->escapeString($loginType).','.$this->db->escapeString($authKey).');');
+		$this->db->query('INSERT INTO account_auth values (' . $this->db->escapeNumber($this->getAccountID()) . ',' . $this->db->escapeString($loginType) . ',' . $this->db->escapeString($authKey) . ');');
 		return true;
 	}
 
@@ -894,10 +894,10 @@ 
 	}
 
 	protected function setPasswordReset($passwordReset) {
-		if($this->passwordReset == $passwordReset)
+		if ($this->passwordReset == $passwordReset)
 			return;
-		$this->passwordReset=$passwordReset;
-		$this->hasChanged=true;
+		$this->passwordReset = $passwordReset;
+		$this->hasChanged = true;
 		$this->update();
 	}
 
@@ -906,7 +906,7 @@ 
 	}
 
 	public function setDisplayShipImages($yesNo) {
-		if($this->images == $yesNo)
+		if ($this->images == $yesNo)
 			return;
 		$this->images = $yesNo;
 		$this->hasChanged = true;
@@ -918,10 +918,10 @@ 
 	}
 
 	public function setUseAJAX($bool) {
-		if($this->useAJAX == $bool)
+		if ($this->useAJAX == $bool)
 			return;
-		$this->useAJAX=$bool;
-		$this->hasChanged=true;
+		$this->useAJAX = $bool;
+		$this->hasChanged = true;
 		$this->update();
 	}
 
@@ -930,16 +930,16 @@ 
 	}
 
 	public function setDefaultCSSEnabled($bool) {
-		if($this->defaultCSSEnabled == $bool)
+		if ($this->defaultCSSEnabled == $bool)
 			return;
-		$this->defaultCSSEnabled=$bool;
-		$this->hasChanged=true;
+		$this->defaultCSSEnabled = $bool;
+		$this->hasChanged = true;
 		$this->update();
 	}
 
 	public function getHotkeys($hotkeyType = false) {
-		if($hotkeyType!==false) {
-			if(isset($this->hotkeys[$hotkeyType])) {
+		if ($hotkeyType !== false) {
+			if (isset($this->hotkeys[$hotkeyType])) {
 				return $this->hotkeys[$hotkeyType];
 			}
 			else {
@@ -949,42 +949,42 @@ 
 		return $this->hotkeys;
 	}
 
-	public function setHotkey($hotkeyType,$binding) {
-		if($this->getHotkeys($hotkeyType) == $binding)
+	public function setHotkey($hotkeyType, $binding) {
+		if ($this->getHotkeys($hotkeyType) == $binding)
 			return;
 		$this->hotkeys[$hotkeyType] = $binding;
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 		$this->update();
 	}
 
 	public function isReceivingMessageNotifications($messageTypeID) {
-		return isset($this->messageNotifications[$messageTypeID])?$this->messageNotifications[$messageTypeID]>0:false;
+		return isset($this->messageNotifications[$messageTypeID]) ? $this->messageNotifications[$messageTypeID] > 0 : false;
 	}
 
 	public function getMessageNotifications($messageTypeID) {
-		return isset($this->messageNotifications[$messageTypeID])?$this->messageNotifications[$messageTypeID]:0;
+		return isset($this->messageNotifications[$messageTypeID]) ? $this->messageNotifications[$messageTypeID] : 0;
 	}
 
-	public function setMessageNotifications($messageTypeID,$num) {
-		if($this->getMessageNotifications($messageTypeID) == $num)
+	public function setMessageNotifications($messageTypeID, $num) {
+		if ($this->getMessageNotifications($messageTypeID) == $num)
 			return;
-		$this->messageNotifications[$messageTypeID]=$num;
-		$this->hasChanged=true;
+		$this->messageNotifications[$messageTypeID] = $num;
+		$this->hasChanged = true;
 		$this->update();
 	}
 
-	public function increaseMessageNotifications($messageTypeID,$num) {
-		if($num==0)
+	public function increaseMessageNotifications($messageTypeID, $num) {
+		if ($num == 0)
 			return;
-		if($num<0)
+		if ($num < 0)
 			throw new Exception('You cannot increase by a negative amount');
 		$this->setMessageNotifications($messageTypeID, $this->getMessageNotifications($messageTypeID) + $num);
 	}
 
-	public function decreaseMessageNotifications($messageTypeID,$num) {
-		if($num==0)
+	public function decreaseMessageNotifications($messageTypeID, $num) {
+		if ($num == 0)
 			return;
-		if($num<0)
+		if ($num < 0)
 			throw new Exception('You cannot decrease by a negative amount');
 		$this->setMessageNotifications($messageTypeID, $this->getMessageNotifications($messageTypeID) - $num);
 	}
@@ -994,10 +994,10 @@ 
 	}
 
 	public function setCenterGalaxyMapOnPlayer($bool) {
-		if($this->centerGalaxyMapOnPlayer == $bool)
+		if ($this->centerGalaxyMapOnPlayer == $bool)
 			return;
-		$this->centerGalaxyMapOnPlayer=$bool;
-		$this->hasChanged=true;
+		$this->centerGalaxyMapOnPlayer = $bool;
+		$this->hasChanged = true;
 		$this->update();
 	}
 
@@ -1006,26 +1006,26 @@ 
 	}
 
 	public function isMailBanned() {
-		return $this->mailBanned>TIME;
+		return $this->mailBanned > TIME;
 	}
 
 	public function setMailBanned($time) {
-		if($this->mailBanned == $time)
+		if ($this->mailBanned == $time)
 			return;
-		$this->mailBanned=$time;
-		$this->hasChanged=true;
+		$this->mailBanned = $time;
+		$this->hasChanged = true;
 	}
 
 	public function increaseMailBanned($increaseTime) {
-		$time = max(TIME,$this->getMailBanned());
-		$this->setMailBanned($time+$increaseTime);
+		$time = max(TIME, $this->getMailBanned());
+		$this->setMailBanned($time + $increaseTime);
 	}
 	
 	public function getPermissions() {
-		if(!isset($this->permissions)) {
+		if (!isset($this->permissions)) {
 			$this->permissions = array();
 			$this->db->query('SELECT permission_id FROM account_has_permission WHERE ' . $this->SQL);
-			while($this->db->nextRecord()) {
+			while ($this->db->nextRecord()) {
 				$this->permissions[$this->db->getInt('permission_id')] = true;
 			}
 		}
@@ -1034,28 +1034,28 @@ 
 
 	public function hasPermission($permissionID = false) {
 		$permissions = $this->getPermissions();
-		if($permissionID === false) {
+		if ($permissionID === false) {
 			return count($permissions) > 0;
 		}
 		return isset($permissions[$permissionID]) ? $permissions[$permissionID] : false;
 	}
 
 	public function getPoints() {
-		if(!isset($this->points)) {
-			$this->points=0;
+		if (!isset($this->points)) {
+			$this->points = 0;
 			$this->db->lockTable('account_has_points');
-			$this->db->query('SELECT * FROM account_has_points WHERE '.$this->SQL.' LIMIT 1');
-			if($this->db->nextRecord()) {
-				$this->points=$this->db->getInt('points');
+			$this->db->query('SELECT * FROM account_has_points WHERE ' . $this->SQL . ' LIMIT 1');
+			if ($this->db->nextRecord()) {
+				$this->points = $this->db->getInt('points');
 				$lastUpdate = $this->db->getInt('last_update');
 				//we are gonna check for reducing points...
-				if($this->points>0 && $lastUpdate < TIME - (7 * 86400)) {
-					$removePoints=0;
-					while($lastUpdate < TIME - (7 * 86400)) {
+				if ($this->points > 0 && $lastUpdate < TIME - (7 * 86400)) {
+					$removePoints = 0;
+					while ($lastUpdate < TIME - (7 * 86400)) {
 						$removePoints++;
 						$lastUpdate += (7 * 86400);
 					}
-					$this->removePoints($removePoints,$lastUpdate);
+					$this->removePoints($removePoints, $lastUpdate);
 				}
 			}
 			$this->db->unlock();
@@ -1063,30 +1063,30 @@ 
 		return $this->points;
 	}
 
-	public function setPoints($numPoints,$lastUpdate=false) {
-		$numPoints = max($numPoints,0);
-		if($this->getPoints()==$numPoints)
+	public function setPoints($numPoints, $lastUpdate = false) {
+		$numPoints = max($numPoints, 0);
+		if ($this->getPoints() == $numPoints)
 			return;
-		if ($this->points==0)
-			$this->db->query('INSERT INTO account_has_points (account_id, points, last_update) VALUES ('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($numPoints).', '.$this->db->escapeNumber($lastUpdate?$lastUpdate:TIME).')');
-		else if($numPoints<=0)
-			$this->db->query('DELETE FROM account_has_points WHERE '.$this->SQL.' LIMIT 1');
+		if ($this->points == 0)
+			$this->db->query('INSERT INTO account_has_points (account_id, points, last_update) VALUES (' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber($numPoints) . ', ' . $this->db->escapeNumber($lastUpdate ? $lastUpdate : TIME) . ')');
+		else if ($numPoints <= 0)
+			$this->db->query('DELETE FROM account_has_points WHERE ' . $this->SQL . ' LIMIT 1');
 		else
-			$this->db->query('UPDATE account_has_points SET points = '.$this->db->escapeNumber($numPoints).($lastUpdate ? ', last_update = '.$this->db->escapeNumber(TIME) : '').' WHERE '.$this->SQL.' LIMIT 1');
-		$this->points=$numPoints;
+			$this->db->query('UPDATE account_has_points SET points = ' . $this->db->escapeNumber($numPoints) . ($lastUpdate ? ', last_update = ' . $this->db->escapeNumber(TIME) : '') . ' WHERE ' . $this->SQL . ' LIMIT 1');
+		$this->points = $numPoints;
 	}
 
-	public function removePoints($numPoints,$lastUpdate=false) {
-		if($numPoints>0)
-			$this->setPoints($this->getPoints()-$numPoints,$lastUpdate);
+	public function removePoints($numPoints, $lastUpdate = false) {
+		if ($numPoints > 0)
+			$this->setPoints($this->getPoints() - $numPoints, $lastUpdate);
 	}
 
-	public function addPoints($numPoints,SmrAccount $admin,$reasonID,$suspicion) {
+	public function addPoints($numPoints, SmrAccount $admin, $reasonID, $suspicion) {
 		//do we have points
-		$this->setPoints($this->getPoints() + $numPoints,TIME);
+		$this->setPoints($this->getPoints() + $numPoints, TIME);
 		$totalPoints = $this->getPoints();
 		if ($totalPoints < 10)
-			return false;//leave scripts its only a warning
+			return false; //leave scripts its only a warning
 		elseif ($totalPoints < 20)
 			$days = 2;
 		elseif ($totalPoints < 30)
@@ -1094,7 +1094,7 @@ 
 		elseif ($totalPoints < 50)
 			$days = 7;
 		elseif ($totalPoints < 75)
-			$days = 15 ;
+			$days = 15;
 		elseif ($totalPoints < 100)
 			$days = 30;
 		elseif ($totalPoints < 125)
@@ -1108,13 +1108,13 @@ 
 		else
 			$days = 0; //Forever/indefinite
 
-		if($days==0) {
+		if ($days == 0) {
 			$expireTime = 0;
 		}
 		else {
 			$expireTime = TIME + $days * 86400;
 		}
-		$this->banAccount($expireTime,$admin,$reasonID,$suspicion);
+		$this->banAccount($expireTime, $admin, $reasonID, $suspicion);
 
 		return $days;
 	}
@@ -1141,12 +1141,12 @@ 
 		$this->hasChanged = true;
 	}
 
-	public function banAccount($expireTime,SmrAccount $admin,$reasonID,$suspicion,$removeExceptions = false) {
+	public function banAccount($expireTime, SmrAccount $admin, $reasonID, $suspicion, $removeExceptions = false) {
 		$this->db->query('REPLACE INTO account_is_closed
 					(account_id, reason_id, suspicion, expires)
-					VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($reasonID).', '.$this->db->escapeString($suspicion).', '.$this->db->escapeNumber($expireTime).')');
+					VALUES('.$this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber($reasonID) . ', ' . $this->db->escapeString($suspicion) . ', ' . $this->db->escapeNumber($expireTime) . ')');
 		$this->db->lockTable('active_session');
-		$this->db->query('DELETE FROM active_session WHERE '.$this->SQL.' LIMIT 1');
+		$this->db->query('DELETE FROM active_session WHERE ' . $this->SQL . ' LIMIT 1');
 		$this->db->unlock();
 
 		$this->db->query('INSERT INTO account_has_closing_history
@@ -1166,38 +1166,38 @@ 
 			$player->update();
 		}
 		$this->log(LOG_TYPE_ACCOUNT_CHANGES, 'Account closed by ' . $admin->getLogin() . '.');
-		if($removeExceptions!==false)
+		if ($removeExceptions !== false)
 			$this->db->query('DELETE FROM account_exceptions WHERE ' . $this->SQL);
 	}
 
-	public function unbanAccount(SmrAccount $admin = null,$currException=false) {
+	public function unbanAccount(SmrAccount $admin = null, $currException = false) {
 		$adminID = 0;
-		if($admin!==null)
+		if ($admin !== null)
 			$adminID = $admin->getAccountID();
 		$this->db->query('DELETE FROM account_is_closed WHERE ' . $this->SQL . ' LIMIT 1');
 		$this->db->query('INSERT INTO account_has_closing_history
 						(account_id, time, admin_id, action)
 						VALUES(' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber(TIME) . ', ' . $this->db->escapeNumber($adminID) . ', ' . $this->db->escapeString('Opened') . ')');
 		$this->db->query('UPDATE player SET last_turn_update = GREATEST(' . $this->db->escapeNumber(TIME) . ', last_turn_update) WHERE ' . $this->SQL);
-		if($admin!==null)
+		if ($admin !== null)
 			$this->log(LOG_TYPE_ACCOUNT_CHANGES, 'Account reopened by ' . $admin->getLogin() . '.');
 		else
 			$this->log(LOG_TYPE_ACCOUNT_CHANGES, 'Account automatically reopened.');
-		if($currException!==false)
+		if ($currException !== false)
 			$this->db->query('REPLACE INTO account_exceptions (account_id, reason)
 							VALUES (' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeString($currException) . ')');
 	}
 
 	public function getToggleAJAXHREF() {
 		global $var;
-		return SmrSession::getNewHREF(create_container('skeleton.php','toggle_processing.php',array('toggle'=>'AJAX','referrer'=>$var['body'])));
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'toggle_processing.php', array('toggle'=>'AJAX', 'referrer'=>$var['body'])));
 	}
 
 	public function getUserRankingHREF() {
-		return SmrSession::getNewHREF(create_container('skeleton.php','rankings_view.php'));
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'rankings_view.php'));
 	}
 
 	public function getPersonalHofHREF() {
-		return SmrSession::getNewHREF(create_container('skeleton.php','hall_of_fame_player_detail.php',array('account_id' => $this->getAccountID())));
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'hall_of_fame_player_detail.php', array('account_id' => $this->getAccountID())));
 	}
 }

lib/Default/Globals.class.inc

Spacing +48 added lines, -48 removed lines

@@ -17,7 +17,7 @@ 
 	}
 
 	protected static function initialiseDatabase() {
-		if(self::$db==null) {
+		if (self::$db == null) {
 			self::$db = new SmrMySqlDatabase();
 		}
 	}
@@ -27,9 +27,9 @@ 
 	}
 
 	public static function canAccessPage($pageName, AbstractSmrPlayer $player, array $extraInfo) {
-		switch($pageName) {
+		switch ($pageName) {
 			case 'AllianceMOTD':
-				if($player->getAllianceID() != $extraInfo['AllianceID']) {
+				if ($player->getAllianceID() != $extraInfo['AllianceID']) {
 					logException(new Exception('Tried to access page without permission.'));
 					create_error('You cannot access this page.');
 				}
@@ -38,10 +38,10 @@ 
 	}
 
 	public static function &getHiddenPlayers() {
-		if(self::$HIDDEN_PLAYERS==null) {
+		if (self::$HIDDEN_PLAYERS == null) {
 			self::initialiseDatabase();
 			self::$db->query('SELECT account_id FROM hidden_players');
-			self::$HIDDEN_PLAYERS = array(0);//stop errors
+			self::$HIDDEN_PLAYERS = array(0); //stop errors
 			while (self::$db->nextRecord()) {
 				self::$HIDDEN_PLAYERS[] = self::$db->getField('account_id');
 			}
@@ -50,7 +50,7 @@ 
 	}
 
 	public static function &getLevelRequirements() {
-		if(self::$LEVEL_REQUIREMENTS==null) {
+		if (self::$LEVEL_REQUIREMENTS == null) {
 			self::initialiseDatabase();
 			self::$LEVEL_REQUIREMENTS = array();
 
@@ -67,13 +67,13 @@ 
 	}
 
 	public static function &getRaces() {
-		if(self::$RACES==null) {
+		if (self::$RACES == null) {
 			self::initialiseDatabase();
 			self::$RACES = array();
 
 			// determine user level
 			self::$db->query('SELECT race_id,race_name,race_description FROM race ORDER BY race_id');
-			while(self::$db->nextRecord()) {
+			while (self::$db->nextRecord()) {
 				self::$RACES[self::$db->getInt('race_id')] = array(
 																'Race ID' => self::$db->getInt('race_id'),
 																'Race Name' => self::$db->getField('race_name'),
@@ -110,21 +110,21 @@ 
 
 	public static function getColouredRaceName($raceID, $relations, $linked = true) {
 		$raceName = get_colored_text($relations, Globals::getRaceName($raceID));
-		if($linked === true) {
-			$container = create_container('skeleton.php','council_list.php', array('race_id' => $raceID));
+		if ($linked === true) {
+			$container = create_container('skeleton.php', 'council_list.php', array('race_id' => $raceID));
 			$raceName = create_link($container, $raceName);
 		}
 		return $raceName;
 	}
 
 	public static function &getGoods() {
-		if(self::$GOODS==null) {
+		if (self::$GOODS == null) {
 			self::initialiseDatabase();
 			self::$GOODS = array();
 
 			// determine user level
 			self::$db->query('SELECT * FROM good ORDER BY good_id');
-			while(self::$db->nextRecord()) {
+			while (self::$db->nextRecord()) {
 				self::$GOODS[self::$db->getField('good_id')] = array(
 																'Type' => 'Good',
 																'ID' => self::$db->getInt('good_id'),
@@ -143,20 +143,20 @@ 
 		return Globals::getGoods()[$goodID];
 	}
 	public static function getGoodName($goodID) {
-		if($goodID==GOOD_NOTHING) {
+		if ($goodID == GOOD_NOTHING) {
 			return 'Nothing';
 		}
 		return Globals::getGoods()[$goodID]['Name'];
 	}
 
-	public static function &getHardwareTypes($hardwareTypeID=false) {
-		if(self::$HARDWARE_TYPES==null) {
+	public static function &getHardwareTypes($hardwareTypeID = false) {
+		if (self::$HARDWARE_TYPES == null) {
 			self::initialiseDatabase();
 			self::$HARDWARE_TYPES = array();
 
 			// determine user level
 			self::$db->query('SELECT * FROM hardware_type ORDER BY hardware_type_id');
-			while(self::$db->nextRecord()) {
+			while (self::$db->nextRecord()) {
 				self::$HARDWARE_TYPES[self::$db->getField('hardware_type_id')] = array(
 																			'Type' => 'Hardware',
 																			'ID' => self::$db->getInt('hardware_type_id'),
@@ -165,7 +165,7 @@ 
 																			);
 			}
 		}
-		if($hardwareTypeID===false) {
+		if ($hardwareTypeID === false) {
 			return self::$HARDWARE_TYPES;
 		}
 		return self::$HARDWARE_TYPES[$hardwareTypeID];
@@ -197,7 +197,7 @@ 
 	}
 
 	public static function getGameType($gameID) {
-		if(self::isValidGame($gameID)) {
+		if (self::isValidGame($gameID)) {
 			return SmrGame::getGame($gameID)->getGameType();
 		}
 		return 0;
@@ -244,7 +244,7 @@ 
 	}
 
 	public static function isFeatureRequestOpen() {
-		if(self::$FEATURE_REQUEST_OPEN == null) {
+		if (self::$FEATURE_REQUEST_OPEN == null) {
 			self::initialiseDatabase();
 			self::$db->query('SELECT open FROM open_forms WHERE type=\'FEATURE\'');
 			self::$db->nextRecord();
@@ -254,12 +254,12 @@ 
 		return self::$FEATURE_REQUEST_OPEN;
 	}
 
-	public static function &getRaceRelations($gameID,$raceID) {
-		if(!isset(self::$RACE_RELATIONS[$gameID])) {
+	public static function &getRaceRelations($gameID, $raceID) {
+		if (!isset(self::$RACE_RELATIONS[$gameID])) {
 			self::$RACE_RELATIONS[$gameID] = array();
 		}
 
-		if(!isset(self::$RACE_RELATIONS[$gameID][$raceID])) {
+		if (!isset(self::$RACE_RELATIONS[$gameID][$raceID])) {
 			self::initialiseDatabase();
 			//get relations
 			$RACES = Globals::getRaces();
@@ -267,7 +267,7 @@ 
 			foreach ($RACES as $otherRaceID => $raceArray) {
 				self::$RACE_RELATIONS[$gameID][$raceID][$otherRaceID] = 0;
 			}
-			self::$db->query('SELECT race_id_2,relation FROM race_has_relation WHERE race_id_1='.self::$db->escapeNumber($raceID).' AND game_id='.self::$db->escapeNumber($gameID).' LIMIT '.count($RACES));
+			self::$db->query('SELECT race_id_2,relation FROM race_has_relation WHERE race_id_1=' . self::$db->escapeNumber($raceID) . ' AND game_id=' . self::$db->escapeNumber($gameID) . ' LIMIT ' . count($RACES));
 			while (self::$db->nextRecord()) {
 				self::$RACE_RELATIONS[$gameID][$raceID][self::$db->getInt('race_id_2')] = self::$db->getInt('relation');
 			}
@@ -276,7 +276,7 @@ 
 	}
 
 	public static function getUserRanking() {
-		if(!isset(self::$USER_RANKINGS)) {
+		if (!isset(self::$USER_RANKINGS)) {
 			self::initialiseDatabase();
 			self::$USER_RANKINGS = array();
 			self::$db->query('SELECT rank, rank_name FROM user_rankings ORDER BY rank');
@@ -292,15 +292,15 @@ 
 	}
 
 	public static function getCurrentSectorHREF() {
-		return self::$AVAILABLE_LINKS['CurrentSector'] = SmrSession::getNewHREF(create_container('skeleton.php','current_sector.php'));
+		return self::$AVAILABLE_LINKS['CurrentSector'] = SmrSession::getNewHREF(create_container('skeleton.php', 'current_sector.php'));
 	}
 
 	public static function getLocalMapHREF() {
-		return self::$AVAILABLE_LINKS['LocalMap'] = SmrSession::getNewHREF(create_container('skeleton.php','map_local.php'));
+		return self::$AVAILABLE_LINKS['LocalMap'] = SmrSession::getNewHREF(create_container('skeleton.php', 'map_local.php'));
 	}
 
 	public static function getCurrentPlayersHREF() {
-		return self::$AVAILABLE_LINKS['CurrentPlayers'] = SmrSession::getNewHREF(create_container('skeleton.php','current_players.php'));
+		return self::$AVAILABLE_LINKS['CurrentPlayers'] = SmrSession::getNewHREF(create_container('skeleton.php', 'current_players.php'));
 	}
 
 	public static function getTradeHREF() {
@@ -308,7 +308,7 @@ 
 	}
 
 	public static function getAttackTraderHREF($accountID) {
-		$container = create_container('skeleton.php','trader_attack_processing.php');
+		$container = create_container('skeleton.php', 'trader_attack_processing.php');
 		$container['target'] = $accountID;
 		return self::$AVAILABLE_LINKS['AttackTrader'] = SmrSession::getNewHREF($container);
 	}
@@ -317,8 +317,8 @@ 
 		return SmrSession::getNewHREF(create_container('death_processing.php'));
 	}
 
-	public static function getBetaFunctionsHREF(){ //BETA
-		return SmrSession::getNewHREF(create_container('skeleton.php','beta_functions.php'));
+	public static function getBetaFunctionsHREF() { //BETA
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'beta_functions.php'));
 	}
 
 	public static function getBugReportProcessingHREF() {
@@ -326,13 +326,13 @@ 
 	}
 
 	public static function getWeaponReorderHREF($weaponOrderID, $direction) {
-		$container = create_container('skeleton.php','weapon_reorder.php');
-		$container[$direction]	= $weaponOrderID;
+		$container = create_container('skeleton.php', 'weapon_reorder.php');
+		$container[$direction] = $weaponOrderID;
 		return SmrSession::getNewHREF($container);
 	}
 
 	public static function getSmrFileCreateHREF($adminCreateGameID = false) {
-		$container = create_container('skeleton.php','smr_file_create.php');
+		$container = create_container('skeleton.php', 'smr_file_create.php');
 		$container['AdminCreateGameID'] = $adminCreateGameID;
 		return SmrSession::getNewHREF($container);
 	}
@@ -351,42 +351,42 @@ 
 
 	public static function getSectorScanHREF($toSector) {
 		global $player;
-		$container = create_container('skeleton.php','sector_scan.php');
+		$container = create_container('skeleton.php', 'sector_scan.php');
 		$container['target_sector'] = $toSector;
 		return self::$AVAILABLE_LINKS['Scan' . $player->getSector()->getSectorDirection($toSector)] = SmrSession::getNewHREF($container);
 	}
 
 	public static function getPlotCourseHREF($fromSector = false, $toSector = false) {
-		if($fromSector === false && $toSector === false) {
-			return self::$AVAILABLE_LINKS['PlotCourse'] = SmrSession::getNewHREF(create_container('skeleton.php','course_plot.php'));
+		if ($fromSector === false && $toSector === false) {
+			return self::$AVAILABLE_LINKS['PlotCourse'] = SmrSession::getNewHREF(create_container('skeleton.php', 'course_plot.php'));
 		}
 		else {
-			return SmrSession::getNewHREF(create_container('course_plot_processing.php','',array('from'=>$fromSector,'to'=>$toSector)));
+			return SmrSession::getNewHREF(create_container('course_plot_processing.php', '', array('from'=>$fromSector, 'to'=>$toSector)));
 		}
 	}
 
 	public static function getPlanetMainHREF() {
-		return SmrSession::getNewHREF(create_container('skeleton.php','planet_main.php'));
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'planet_main.php'));
 	}
 
 	public static function getPlanetConstructionHREF() {
-		return SmrSession::getNewHREF(create_container('skeleton.php','planet_construction.php'));
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'planet_construction.php'));
 	}
 
 	public static function getPlanetDefensesHREF() {
-		return SmrSession::getNewHREF(create_container('skeleton.php','planet_defense.php'));
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'planet_defense.php'));
 	}
 
 	public static function getPlanetOwnershipHREF() {
-		return SmrSession::getNewHREF(create_container('skeleton.php','planet_ownership.php'));
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'planet_ownership.php'));
 	}
 
 	public static function getPlanetStockpileHREF() {
-		return SmrSession::getNewHREF(create_container('skeleton.php','planet_stockpile.php'));
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'planet_stockpile.php'));
 	}
 
 	public static function getPlanetFinancesHREF() {
-		return SmrSession::getNewHREF(create_container('skeleton.php','planet_financial.php'));
+		return SmrSession::getNewHREF(create_container('skeleton.php', 'planet_financial.php'));
 	}
 
 	public static function getAllianceHREF($allianceID = null) {
@@ -400,7 +400,7 @@ 
 
 	public static function getAllianceBankHREF($allianceID = null) {
 		$container = create_container('skeleton.php', 'bank_alliance.php');
-		if ($allianceID!=null) {
+		if ($allianceID != null) {
 			$container['alliance_id'] = $allianceID;
 		}
 		return SmrSession::getNewHREF($container);
@@ -408,7 +408,7 @@ 
 
 	public static function getAllianceRosterHREF($allianceID = null) {
 		$container = create_container('skeleton.php', 'alliance_roster.php');
-		if ($allianceID!=null) {
+		if ($allianceID != null) {
 			$container['alliance_id'] = $allianceID;
 		}
 		return SmrSession::getNewHREF($container);
@@ -473,9 +473,9 @@ 
 		return SmrSession::getNewHREF(create_container('skeleton.php', 'trader_status.php'));
 	}
 
-	public static function getCouncilHREF($raceID=false) {
+	public static function getCouncilHREF($raceID = false) {
 		$container = create_container('skeleton.php', 'council_list.php');
-		if($raceID!==false) {
+		if ($raceID !== false) {
 			$container['race_id'] = $raceID;
 		}
 		return SmrSession::getNewHREF($container);
@@ -548,7 +548,7 @@ 
 
 	public static function getAvailableTemplates() {
 		return array('Default' => array('Default'),
-			'Freon22' => array('Default','Blue','ClassicGreen','None'));
+			'Freon22' => array('Default', 'Blue', 'ClassicGreen', 'None'));
 	}
 
 	public static function getAvailableColourSchemes($templateName) {

lib/Default/SmrShip.class.inc

Spacing +21 added lines, -21 removed lines

@@ -7,9 +7,9 @@ 
 	protected $SQL;
 	
 	public static function refreshCache() {
-		foreach(self::$CACHE_SHIPS as &$gameShips) {
-			foreach($gameShips as &$ship) {
-				$ship = self::getShip($ship->getPlayer(),true);
+		foreach (self::$CACHE_SHIPS as &$gameShips) {
+			foreach ($gameShips as &$ship) {
+				$ship = self::getShip($ship->getPlayer(), true);
 			}
 		}
 	}
@@ -19,15 +19,15 @@ 
 	}
 	
 	public static function saveShips() {
-		foreach(self::$CACHE_SHIPS as $gameShips) {
-			foreach($gameShips as $ship) {
+		foreach (self::$CACHE_SHIPS as $gameShips) {
+			foreach ($gameShips as $ship) {
 				$ship->update();
 			}
 		}
 	}
 
-	public static function &getShip(AbstractSmrPlayer $player,$forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_SHIPS[$player->getGameID()][$player->getAccountID()])) {
+	public static function &getShip(AbstractSmrPlayer $player, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_SHIPS[$player->getGameID()][$player->getAccountID()])) {
 			$s = new SmrShip($player);
 			self::$CACHE_SHIPS[$player->getGameID()][$player->getAccountID()] = $s;
 		}
@@ -37,7 +37,7 @@ 
 	protected function __construct(AbstractSmrPlayer $player) {
 		parent::__construct($player);
 		$this->db = new SmrMySqlDatabase();
-		$this->SQL = 'account_id='.$this->db->escapeNumber($this->getAccountID()).' AND game_id='.$this->db->escapeNumber($this->getGameID());
+		$this->SQL = 'account_id=' . $this->db->escapeNumber($this->getAccountID()) . ' AND game_id=' . $this->db->escapeNumber($this->getGameID());
 		
 		$this->loadHardware();
 		$this->loadWeapons();
@@ -50,7 +50,7 @@ 
 	protected function loadWeapons() {
 		// determine weapon
 		$this->db->query('SELECT weapon_type.*, order_id FROM ship_has_weapon JOIN weapon_type USING (weapon_type_id)
-							WHERE ' . $this->SQL .'
+							WHERE ' . $this->SQL . '
 							ORDER BY order_id LIMIT ' . $this->db->escapeNumber($this->getHardpoints()));
 		
 		$this->weapons = array();
@@ -62,7 +62,7 @@ 
 	}
 	
 	protected function loadCargo() {
-		if(!isset($this->cargo)) {
+		if (!isset($this->cargo)) {
 			// initialize cargo array
 			$this->cargo = array();
 			
@@ -101,7 +101,7 @@ 
 	}
 	
 	function updateCargo() {
-		if($this->hasChangedCargo === true) {
+		if ($this->hasChangedCargo === true) {
 			// write cargo info
 			foreach ($this->getCargo() as $id => $amount) {
 				if ($amount > 0) {
@@ -135,7 +135,7 @@ 
 	}
 	
 	function updateWeapon() {
-		if($this->hasChangedWeapons === true) {
+		if ($this->hasChangedWeapons === true) {
 			// write weapon info
 			$this->db->query('DELETE FROM ship_has_weapon WHERE ' . $this->SQL);
 			foreach ($this->weapons as $orderID => $weapon) {
@@ -181,11 +181,11 @@ 
 	}
 	
 	public function isCloaked() {
-		if(!$this->hasCloak())
+		if (!$this->hasCloak())
 			return false;
-		if(!isset($this->isCloaked)) {
+		if (!isset($this->isCloaked)) {
 			$this->db->query('SELECT 1 FROM ship_is_cloaked WHERE ' . $this->SQL . ' LIMIT 1');
-			$this->isCloaked = $this->db->getNumRows()>0;
+			$this->isCloaked = $this->db->getNumRows() > 0;
 		}
 		return $this->isCloaked;
 	}
@@ -202,13 +202,13 @@ 
 	
 	function cloakOverload() {
 		// 1 in 25 chance of cloak being destroyed if active
-		if($this->isCloaked() && mt_rand(0,99) < 5) {
+		if ($this->isCloaked() && mt_rand(0, 99) < 5) {
 			$this->db->query('DELETE FROM ship_has_hardware
 								WHERE ' . $this->SQL . '
 								AND hardware_type_id = 8
 								LIMIT 1');
 			$this->decloak();
-			$this->setHardware(HARDWARE_CLOAK,0);
+			$this->setHardware(HARDWARE_CLOAK, 0);
 			return true;
 		}
 		
@@ -224,14 +224,14 @@ 
 	}
 	
 	public function getIllusionShip() {
-		if(!isset($this->illusionShip)) {
-			$this->illusionShip=false;
+		if (!isset($this->illusionShip)) {
+			$this->illusionShip = false;
 			$this->db->query('SELECT ship_has_illusion.*,ship_type.ship_name
 							FROM ship_has_illusion
 							JOIN ship_type USING(ship_type_id)
 							WHERE ' . $this->SQL . ' LIMIT 1');
-			if($this->db->nextRecord()) {
-				$this->illusionShip=array(
+			if ($this->db->nextRecord()) {
+				$this->illusionShip = array(
 										'ID' => $this->db->getInt('ship_type_id'),
 										'Attack' => $this->db->getInt('attack'),
 										'Defense' => $this->db->getInt('defense'),