smrealms / smr

lib/Default/shop_goods.inc

Spacing +11 added lines, -11 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 
-function checkPortTradeable(&$port,&$player) {
-	if($port->getSectorID()!=$player->getSectorID())
+function checkPortTradeable(&$port, &$player) {
+	if ($port->getSectorID() != $player->getSectorID())
 		return 'That port is not in this sector!';
 	
-	if(!$port->exists())
+	if (!$port->exists())
 		return 'There is no port in this sector!';
 	
-	if($player->getRelation($port->getRaceID()) <= RELATIONS_WAR)
+	if ($player->getRelation($port->getRaceID()) <= RELATIONS_WAR)
 		return 'We will not trade with our enemies!';
 	
-	if($port->getReinforceTime() > TIME)
+	if ($port->getReinforceTime() > TIME)
 		return 'We are still repairing damage caused during the last raid.';
 	
 	return true;
 }
 
-function check_bargain_number($amount,$ideal_price,$offered_price,$bargain_price,&$container) {
+function check_bargain_number($amount, $ideal_price, $offered_price, $bargain_price, &$container) {
 	global $var, $player;
 
 	$port = $player->getSectorPort();
@@ -27,9 +27,9 @@ 
 	if (isset($var['overall_number_of_bargains'])) {
 		// lose relations for bad bargain
 		if ($port->getRaceID() != RACE_NEUTRAL || $player->getRaceID() == RACE_ALSKANT) {
-			$player->decreaseRelationsByTrade($amount,$port->getRaceID());
+			$player->decreaseRelationsByTrade($amount, $port->getRaceID());
 		}
-		$player->increaseHOF(1,array('Trade','Results','Fail'), HOF_PUBLIC);
+		$player->increaseHOF(1, array('Trade', 'Results', 'Fail'), HOF_PUBLIC);
 		// transfer values
 		transfer('overall_number_of_bargains');
 
@@ -37,9 +37,9 @@ 
 		if ($container['number_of_bargains'] > $container['overall_number_of_bargains']) {
 			// change relation for non neutral ports
 			if ($port->getRaceID() != RACE_NEUTRAL || $player->getRaceID() == RACE_ALSKANT) {
-				$player->decreaseRelationsByTrade($amount,$port->getRaceID());
+				$player->decreaseRelationsByTrade($amount, $port->getRaceID());
 			}
-			$player->increaseHOF(1,array('Trade','Results','Epic Fail'), HOF_PUBLIC);
+			$player->increaseHOF(1, array('Trade', 'Results', 'Epic Fail'), HOF_PUBLIC);
 			create_error('You don\'t want to accept my offer? I\'m sick of you! Get out of here!');
 		}
 
@@ -93,7 +93,7 @@ 
 }
 
 function get_bargain_price() {
-	global $_REQUEST,$var;
+	global $_REQUEST, $var;
 
 	// we get it from form
 	if (isset($_REQUEST['bargain_price']))

lib/Default/MySqlDatabase.class.inc

Spacing +54 added lines, -54 removed lines

@@ -7,7 +7,7 @@ 
 	protected $dbRecord = null;
 	
 	public function __construct($host, $user, $password, $dbName, $port, $socket) {
-		if(!self::$dbConn) {
+		if (!self::$dbConn) {
 			self::$dbConn = new mysqli($host, $user, $password, $dbName, $port, $socket);
 			if (self::$dbConn->connect_errno) {
 				$this->error('Connection failed: ' . self::$dbConn->connect_error);
@@ -33,17 +33,17 @@ 
 	}
 	
 	public function query($query) {
-		if(!$this->dbResult = self::$dbConn->query($query)) {
+		if (!$this->dbResult = self::$dbConn->query($query)) {
 			$this->error('SQL query failed (' . $query . ')');
 			// the SQL error message will be reported by logException
 		}
 	}
 	
 	public function nextRecord() {
-		if(!$this->dbResult)
+		if (!$this->dbResult)
 			$this->error('No resource to get record from.');
 		
-		if($this->dbRecord = $this->dbResult->fetch_assoc()) {
+		if ($this->dbRecord = $this->dbResult->fetch_assoc()) {
 			return true;
 		}
 		return false;
@@ -56,7 +56,7 @@ 
 	}
 	
 	public function getBoolean($name) {
-		if($this->dbRecord[$name] == 'TRUE')
+		if ($this->dbRecord[$name] == 'TRUE')
 			return true;
 //		if($this->dbRecord[$name] == 'FALSE')
 		return false;
@@ -75,7 +75,7 @@ 
 	// For backwards compatibility, set $pad_msec=true to try to guess at the
 	// intended value. This is not safe if the Microtime length is wrong for an
 	// unrelated reason!
-	public function getMicrotime($name, $pad_msec=false) {
+	public function getMicrotime($name, $pad_msec = false) {
 		$data = $this->dbRecord[$name];
 		$sec  = substr($data, 0, 10);
 		$msec = substr($data, 10);
@@ -83,15 +83,15 @@ 
 			if ($pad_msec) {
 				$msec = str_pad($msec, 6, '0', STR_PAD_LEFT);
 			} else {
-				throw new Exception('Field is not an escaped microtime ('.$data.')');
+				throw new Exception('Field is not an escaped microtime (' . $data . ')');
 			}
 		}
 		return "$sec.$msec";
 	}
 	
-	public function getObject($name,$compressed=false) {
+	public function getObject($name, $compressed = false) {
 		$object = $this->getField($name);
-		if($compressed===true)
+		if ($compressed === true)
 			$object = gzuncompress($object);
 		return unserialize($object);
 	}
@@ -101,13 +101,13 @@ 
 	}
 	
 	public function lockTable($table) {
-		if(!self::$dbConn->query('LOCK TABLES ' . $table . ' WRITE')) {
-			$this->error('Unable to lock table: '. $table);
+		if (!self::$dbConn->query('LOCK TABLES ' . $table . ' WRITE')) {
+			$this->error('Unable to lock table: ' . $table);
 		}
 	}
 	
 	public function unlock() {
-		if(!self::$dbConn->query('UNLOCK TABLES')) {
+		if (!self::$dbConn->query('UNLOCK TABLES')) {
 			$this->error('Unable to remove table locks.');
 		}
 	}
@@ -132,70 +132,70 @@ 
 		throw new Exception($err);
 	}
 	
-	public function escape($escape,$autoQuotes=true,$quotes=true) {
-		if(is_bool($escape)) {
-			if($autoQuotes)
+	public function escape($escape, $autoQuotes = true, $quotes = true) {
+		if (is_bool($escape)) {
+			if ($autoQuotes)
 				return $this->escapeBoolean($escape);
 			else
-				return $this->escapeBoolean($escape,$quotes);
+				return $this->escapeBoolean($escape, $quotes);
 		}
-		if(is_numeric($escape)) {
+		if (is_numeric($escape)) {
 			return $this->escapeNumber($escape);
 		}
-		if(is_string($escape)) {
-			if($autoQuotes)
+		if (is_string($escape)) {
+			if ($autoQuotes)
 				return $this->escapeString($escape);
 			else
-				return $this->escapeString($escape,$quotes);
+				return $this->escapeString($escape, $quotes);
 		}
-		if(is_array($escape)) {
-			return $this->escapeArray($escape,$autoQuotes,$quotes);
+		if (is_array($escape)) {
+			return $this->escapeArray($escape, $autoQuotes, $quotes);
 		}
-		if(is_object($escape)) {
-			if($autoQuotes)
+		if (is_object($escape)) {
+			if ($autoQuotes)
 				return $this->escapeObject($escape);
 			else
-				return $this->escapeObject($escape,$quotes);
+				return $this->escapeObject($escape, $quotes);
 		}
 	}
 	
-	public function escapeString($string,$quotes=true,$nullable=false) {
-		if($nullable===true && ($string===null || $string===''))
+	public function escapeString($string, $quotes = true, $nullable = false) {
+		if ($nullable === true && ($string === null || $string === ''))
 			return 'NULL';
-		if($string===true)
+		if ($string === true)
 			$string = 'TRUE';
-		else if($string===false)
+		else if ($string === false)
 			$string = 'FALSE';
-		if(is_array($string)) {
+		if (is_array($string)) {
 			$escapedString = '';
-			foreach($string as $value) {
-				$escapedString .= $this->escapeString($value, $quotes) .',';
+			foreach ($string as $value) {
+				$escapedString .= $this->escapeString($value, $quotes) . ',';
 			}
-			return substr($escapedString,0,-1);
+			return substr($escapedString, 0, -1);
 		}
-		if($quotes) {
+		if ($quotes) {
 			return '\'' . self::$dbConn->real_escape_string($string) . '\'';
 		}
 		return self::$dbConn->real_escape_string($string);
 	}
 	
 	public function escapeBinary($binary) {
-		return '0x'.bin2hex($binary);
+		return '0x' . bin2hex($binary);
 	}
 	
-	public function escapeArray(array $array,$autoQuotes=true,$quotes=true,$implodeString=',',$escapeIndividually=true) {
+	public function escapeArray(array $array, $autoQuotes = true, $quotes = true, $implodeString = ',', $escapeIndividually = true) {
 		$string = '';
-		if($escapeIndividually) {
-			foreach($array as $value) {
-				if(is_array($value))
-					$string .= $this->escapeArray($value,$autoQuotes,$quotes,$implodeString,$escapeIndividually).$implodeString;
+		if ($escapeIndividually) {
+			foreach ($array as $value) {
+				if (is_array($value))
+					$string .= $this->escapeArray($value, $autoQuotes, $quotes, $implodeString, $escapeIndividually) . $implodeString;
 				else
-					$string .= $this->escape($value, $autoQuotes, $quotes).$implodeString;
+					$string .= $this->escape($value, $autoQuotes, $quotes) . $implodeString;
 			}
-			$string = substr($string,0,-1);
+			$string = substr($string, 0, -1);
 		}
 		else {
-			$string = $this->escape(implode($implodeString,$array), $autoQuotes, $quotes);
+			$string = $this->escape(implode($implodeString, $array), $autoQuotes, $quotes);
 		}
 		return $string;
 	}
@@ -206,29 +206,29 @@ 
 		if (is_numeric($num)) {
 			return $num;
 		} else {
-			throw new Exception('Not a number! ('.$num.')');
+			throw new Exception('Not a number! (' . $num . ')');
 		}
 	}
 	
-	public function escapeMicrotime($microtime,$quotes=false) {
+	public function escapeMicrotime($microtime, $quotes = false) {
 		$sec_str = sprintf('%010d', $microtime);
-		$usec_str = sprintf('%06d', fmod($microtime,1) * 1E6);
+		$usec_str = sprintf('%06d', fmod($microtime, 1) * 1E6);
 		return $this->escapeString($sec_str . $usec_str, $quotes);
 	}
 	
-	public function escapeBoolean($bool,$quotes=true) {
-		if($bool===true)
-			return $this->escapeString('TRUE',$quotes);
-		else if($bool===false)
-			return $this->escapeString('FALSE',$quotes);
+	public function escapeBoolean($bool, $quotes = true) {
+		if ($bool === true)
+			return $this->escapeString('TRUE', $quotes);
+		else if ($bool === false)
+			return $this->escapeString('FALSE', $quotes);
 		else
 			throw new Exception('Not a boolean!'); //TEST
 	}
 	
-	public function escapeObject($object,$compress=false,$quotes=true,$nullable=false) {
-		if($compress===true)
+	public function escapeObject($object, $compress = false, $quotes = true, $nullable = false) {
+		if ($compress === true)
 			return $this->escapeBinary(gzcompress(serialize($object)));
-		return $this->escapeString(serialize($object),$quotes,$nullable);
+		return $this->escapeString(serialize($object), $quotes, $nullable);
 	}
 
 }

lib/Default/AbstractSmrLocation.class.inc

Spacing +78 added lines, -78 removed lines

@@ -23,11 +23,11 @@ 
 	protected $weaponsSold;
 	
 	public static function &getAllLocations($forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_ALL_LOCATIONS)) {
+		if ($forceUpdate || !isset(self::$CACHE_ALL_LOCATIONS)) {
 			$db = new SmrMySqlDatabase();
 			$db->query('SELECT * FROM location_type ORDER BY location_type_id');
 			$locations = array();
-			while($db->nextRecord()) {
+			while ($db->nextRecord()) {
 				$locationTypeID = $db->getInt('location_type_id');
 				$locations[$locationTypeID] = SmrLocation::getLocation($locationTypeID, $forceUpdate, $db);
 			}
@@ -36,12 +36,12 @@ 
 		return self::$CACHE_ALL_LOCATIONS;
 	}
 	
-	public static function &getSectorLocations($gameID,$sectorID,$forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_SECTOR_LOCATIONS[$gameID][$sectorID])) {
+	public static function &getSectorLocations($gameID, $sectorID, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_SECTOR_LOCATIONS[$gameID][$sectorID])) {
 			$db = new SmrMySqlDatabase();
 			$db->query('SELECT * FROM location JOIN location_type USING (location_type_id) WHERE sector_id = ' . $db->escapeNumber($sectorID) . ' AND game_id=' . $db->escapeNumber($gameID));
 			$locations = array();
-			while($db->nextRecord()) {
+			while ($db->nextRecord()) {
 				$locationTypeID = $db->getInt('location_type_id');
 				$locations[$locationTypeID] = self::getLocation($locationTypeID, $forceUpdate, $db);
 			}
@@ -50,14 +50,14 @@ 
 		return self::$CACHE_SECTOR_LOCATIONS[$gameID][$sectorID];
 	}
 	
-	public static function &getLocation($locationTypeID, $forceUpdate=false, $db=null) {
-		if($forceUpdate || !isset(self::$CACHE_LOCATIONS[$locationTypeID])) {
+	public static function &getLocation($locationTypeID, $forceUpdate = false, $db = null) {
+		if ($forceUpdate || !isset(self::$CACHE_LOCATIONS[$locationTypeID])) {
 			self::$CACHE_LOCATIONS[$locationTypeID] = new SmrLocation($locationTypeID, $db);
 		}
 		return self::$CACHE_LOCATIONS[$locationTypeID];
 	}
 	
-	protected function __construct($locationTypeID, $db=null) {
+	protected function __construct($locationTypeID, $db = null) {
 		$this->db = new SmrMySqlDatabase();
 		$this->SQL = 'location_type_id = ' . $this->db->escapeNumber($locationTypeID);
 
@@ -76,7 +76,7 @@ 
 			$this->image = $db->getField('location_image');
 		}
 		else {
-			throw new Exception('Cannot find location: '.$locationTypeID);
+			throw new Exception('Cannot find location: ' . $locationTypeID);
 		}
 	}
 	
@@ -85,10 +85,10 @@ 
 	}
 	
 	public function getRaceID() {
-		if($this->isFed() && $this->getTypeID()!=LOCATION_TYPE_FEDERAL_BEACON) {
+		if ($this->isFed() && $this->getTypeID() != LOCATION_TYPE_FEDERAL_BEACON) {
 			return $this->getTypeID() - LOCATION_GROUP_RACIAL_BEACONS;
 		}
-		if($this->isHQ() && $this->getTypeID()!=LOCATION_TYPE_FEDERAL_HQ) {
+		if ($this->isHQ() && $this->getTypeID() != LOCATION_TYPE_FEDERAL_HQ) {
 			return $this->getTypeID() - LOCATION_GROUP_RACIAL_HQS;
 		}
 		return RACE_NEUTRAL;
@@ -99,8 +99,8 @@ 
 	}
 	
 	public function setName($name) {
-		$name = htmlentities($name,ENT_COMPAT,'utf-8');
-		if($this->name==$name) {
+		$name = htmlentities($name, ENT_COMPAT, 'utf-8');
+		if ($this->name == $name) {
 			return;
 		}
 		$this->name = $name;
@@ -108,7 +108,7 @@ 
 	}
 	
 	public function hasAction() {
-		return $this->processor!=null;
+		return $this->processor != null;
 	}
 	
 	public function getAction() {
@@ -120,7 +120,7 @@ 
 	}
 	
 	public function isFed() {
-		if(!isset($this->fed)) {
+		if (!isset($this->fed)) {
 			$this->db->query('SELECT * FROM location_is_fed WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->fed = $this->db->nextRecord();
 		}
@@ -128,21 +128,21 @@ 
 	}
 	
 	public function setFed($bool) {
-		if($this->fed===$bool) {
+		if ($this->fed === $bool) {
 			return;
 		}
-		if($bool===true) {
+		if ($bool === true) {
 			$this->db->query('INSERT IGNORE INTO location_is_fed (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->fed = true;
 		}
-		else if($bool===false) {
+		else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_fed WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->fed = false;
 		}
 	}
 	
 	public function isBank() {
-		if(!isset($this->bank)) {
+		if (!isset($this->bank)) {
 			$this->db->query('SELECT * FROM location_is_bank WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->bank = $this->db->nextRecord();
 		}
@@ -150,20 +150,20 @@ 
 	}
 	
 	public function setBank($bool) {
-		if($this->bank===$bool)
+		if ($this->bank === $bool)
 			return;
-		if($bool===true) {
+		if ($bool === true) {
 			$this->db->query('INSERT INTO location_is_bank (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->bank = true;
 		}
-		else if($bool===false) {
+		else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_bank WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->bank = false;
 		}
 	}
 	
 	public function isBar() {
-		if(!isset($this->bar)) {
+		if (!isset($this->bar)) {
 			$this->db->query('SELECT * FROM location_is_bar WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->bar = $this->db->nextRecord();
 		}
@@ -171,20 +171,20 @@ 
 	}
 	
 	public function setBar($bool) {
-		if($this->bar===$bool)
+		if ($this->bar === $bool)
 			return;
-		if($bool===true) {
+		if ($bool === true) {
 			$this->db->query('INSERT IGNORE INTO location_is_bar (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->bar = true;
 		}
-		else if($bool===false) {
+		else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_bar WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->bar = false;
 		}
 	}
 	
 	public function isHQ() {
-		if(!isset($this->HQ)) {
+		if (!isset($this->HQ)) {
 			$this->db->query('SELECT * FROM location_is_hq WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->HQ = $this->db->nextRecord();
 		}
@@ -192,20 +192,20 @@ 
 	}
 	
 	public function setHQ($bool) {
-		if($this->HQ===$bool)
+		if ($this->HQ === $bool)
 			return;
-		if($bool===true) {
+		if ($bool === true) {
 			$this->db->query('INSERT IGNORE INTO location_is_hq (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->HQ = true;
 		}
-		else if($bool===false) {
+		else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_hq WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->HQ = false;
 		}
 	}
 	
 	public function isUG() {
-		if(!isset($this->UG)) {
+		if (!isset($this->UG)) {
 			$this->db->query('SELECT * FROM location_is_ug WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->UG = $this->db->nextRecord();
 		}
@@ -213,118 +213,118 @@ 
 	}
 	
 	public function setUG($bool) {
-		if($this->UG===$bool)
+		if ($this->UG === $bool)
 			return;
-		if($bool===true) {
+		if ($bool === true) {
 			$this->db->query('INSERT INTO location_is_ug (location_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ')');
 			$this->UG = true;
 		}
-		else if($bool===false) {
+		else if ($bool === false) {
 			$this->db->query('DELETE FROM location_is_ug WHERE ' . $this->SQL . ' LIMIT 1');
 			$this->UG = false;
 		}
 	}
 	
 	public function &getHardwareSold() {
-		if(!isset($this->hardwareSold)) {
+		if (!isset($this->hardwareSold)) {
 			$this->hardwareSold = array();
 			$this->db->query('SELECT hardware_type_id FROM location_sells_hardware WHERE ' . $this->SQL);
-			while($this->db->nextRecord()) {
+			while ($this->db->nextRecord()) {
 				$this->hardwareSold[$this->db->getInt('hardware_type_id')] = Globals::getHardwareTypes($this->db->getInt('hardware_type_id'));
 			}
 		}
 		return $this->hardwareSold;
 	}
 	
-	public function isHardwareSold($hardwareTypeID=false) {
+	public function isHardwareSold($hardwareTypeID = false) {
 		$hardware = $this->getHardwareSold();
-		if($hardwareTypeID===false) {
-			return count($hardware)!=0;
+		if ($hardwareTypeID === false) {
+			return count($hardware) != 0;
 		}
 		return isset($hardware[$hardwareTypeID]);
 	}
 	
 	public function addHardwareSold($hardwareTypeID) {
-		if($this->isHardwareSold($hardwareTypeID))
+		if ($this->isHardwareSold($hardwareTypeID))
 			return;
 		$this->db->query('SELECT * FROM hardware_type WHERE hardware_type_id = ' . $this->db->escapeNumber($hardwareTypeID) . ' LIMIT 1');
-		if(!$this->db->nextRecord())
+		if (!$this->db->nextRecord())
 			throw new Exception('Invalid hardware type id given');
 		$this->db->query('INSERT INTO location_sells_hardware (location_type_id,hardware_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ',' . $this->db->escapeNumber($hardwareTypeID) . ')');
 		$this->hardwareSold[$hardwareTypeID] = $this->db->getField('hardware_name');
 	}
 	
 	public function removeHardwareSold($hardwareTypeID) {
-		if(!$this->isHardwareSold($hardwareTypeID))
+		if (!$this->isHardwareSold($hardwareTypeID))
 			return;
 		$this->db->query('DELETE FROM location_sells_hardware WHERE ' . $this->SQL . ' AND hardware_type_id = ' . $this->db->escapeNumber($hardwareTypeID) . ' LIMIT 1');
 		unset($this->hardwareSold[$hardwareTypeID]);
 	}
 	
 	public function &getShipsSold() {
-		if(!isset($this->shipsSold)) {
+		if (!isset($this->shipsSold)) {
 			$this->shipsSold = array();
 			$this->db->query('SELECT * FROM location_sells_ships WHERE ' . $this->SQL);
-			while($this->db->nextRecord()) {
+			while ($this->db->nextRecord()) {
 				$this->shipsSold[$this->db->getInt('ship_type_id')] = AbstractSmrShip::getBaseShip(Globals::getGameType(SmrSession::getGameID()), $this->db->getInt('ship_type_id'));
 			}
 		}
 		return $this->shipsSold;
 	}
 	
-	public function isShipSold($shipTypeID=false) {
+	public function isShipSold($shipTypeID = false) {
 		$ships = $this->getShipsSold();
-		if($shipTypeID===false)
-			return count($ships)!=0;
+		if ($shipTypeID === false)
+			return count($ships) != 0;
 		return isset($ships[$shipTypeID]);
 	}
 	
 	public function addShipSold($shipTypeID) {
-		if($this->isShipSold($shipTypeID))
+		if ($this->isShipSold($shipTypeID))
 			return;
 		$ship = AbstractSmrShip::getBaseShip(Globals::getGameType(SmrSession::getGameID()), $shipTypeID);
-		if($ship===false)
+		if ($ship === false)
 			throw new Exception('Invalid ship type id given');
 		$this->db->query('INSERT INTO location_sells_ships (location_type_id,ship_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ',' . $this->db->escapeNumber($shipTypeID) . ')');
 		$this->shipsSold[$shipTypeID] = $ship;
 	}
 	
 	public function removeShipSold($shipTypeID) {
-		if(!$this->isShipSold($shipTypeID))
+		if (!$this->isShipSold($shipTypeID))
 			return;
 		$this->db->query('DELETE FROM location_sells_ships WHERE ' . $this->SQL . ' AND ship_type_id = ' . $this->db->escapeNumber($shipTypeID) . ' LIMIT 1');
 		unset($this->shipsSold[$shipTypeID]);
 	}
 	
 	public function &getWeaponsSold() {
-		if(!isset($this->weaponsSold)) {
+		if (!isset($this->weaponsSold)) {
 			$this->weaponsSold = array();
 			$this->db->query('SELECT * FROM location_sells_weapons JOIN weapon_type USING (weapon_type_id) WHERE ' . $this->SQL);
-			while($this->db->nextRecord())
+			while ($this->db->nextRecord())
 				$this->weaponsSold[$this->db->getInt('weapon_type_id')] = SmrWeapon::getWeapon($this->db->getInt('weapon_type_id'), false, $this->db);
 		}
 		return $this->weaponsSold;
 	}
 	
-	public function isWeaponSold($weaponTypeID=false) {
+	public function isWeaponSold($weaponTypeID = false) {
 		$weapons = $this->getWeaponsSold();
-		if($weaponTypeID===false)
-			return count($weapons)!=0;
+		if ($weaponTypeID === false)
+			return count($weapons) != 0;
 		return isset($weapons[$weaponTypeID]);
 	}
 	
 	public function addWeaponSold($weaponTypeID) {
-		if($this->isWeaponSold($weaponTypeID))
+		if ($this->isWeaponSold($weaponTypeID))
 			return;
 		$weapon = SmrWeapon::getWeapon($weaponTypeID);
-		if($weapon===false)
+		if ($weapon === false)
 			throw new Exception('Invalid weapon type id given');
-		$this->db->query('INSERT INTO location_sells_weapons (location_type_id,weapon_type_id) values (' . $this->db->escapeNumber($this->getTypeID()). ',' . $this->db->escapeNumber($weaponTypeID) . ')');
+		$this->db->query('INSERT INTO location_sells_weapons (location_type_id,weapon_type_id) values (' . $this->db->escapeNumber($this->getTypeID()) . ',' . $this->db->escapeNumber($weaponTypeID) . ')');
 		$this->weaponsSold[$weaponTypeID] = $weapon;
 	}
 	
 	public function removeWeaponSold($weaponTypeID) {
-		if(!$this->isWeaponSold($weaponTypeID))
+		if (!$this->isWeaponSold($weaponTypeID))
 			return;
 		$this->db->query('DELETE FROM location_sells_weapons WHERE ' . $this->SQL . ' AND weapon_type_id = ' . $this->db->escapeNumber($weaponTypeID) . ' LIMIT 1');
 		unset($this->weaponsSold[$weaponTypeID]);
@@ -332,16 +332,16 @@ 
 	
 	public function &getLinkedLocations() {
 		$linkedLocations = array();
-		if($this->isHQ()) {
-			if($this->getTypeID()==LOCATION_TYPE_FEDERAL_HQ) {
+		if ($this->isHQ()) {
+			if ($this->getTypeID() == LOCATION_TYPE_FEDERAL_HQ) {
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_TYPE_FEDERAL_BEACON);
 				$linkedLocations[] = SmrLocation::getLocation(LOCATION_TYPE_FEDERAL_MINT);
 			}
 			else {
 				$raceID = $this->getRaceID();
-				$linkedLocations[] = SmrLocation::getLocation(LOCATION_GROUP_RACIAL_BEACONS+$raceID);
-				$linkedLocations[] = SmrLocation::getLocation(LOCATION_GROUP_RACIAL_SHIPS+$raceID);
-				$linkedLocations[] = SmrLocation::getLocation(LOCATION_GROUP_RACIAL_SHOPS+$raceID);
+				$linkedLocations[] = SmrLocation::getLocation(LOCATION_GROUP_RACIAL_BEACONS + $raceID);
+				$linkedLocations[] = SmrLocation::getLocation(LOCATION_GROUP_RACIAL_SHIPS + $raceID);
+				$linkedLocations[] = SmrLocation::getLocation(LOCATION_GROUP_RACIAL_SHOPS + $raceID);
 			}
 		}
 		return $linkedLocations;
@@ -361,47 +361,47 @@ 
 	}
 	
 	public function equals(SmrLocation $otherLocation) {
-		return $this->getTypeID()==$otherLocation->getTypeID();
+		return $this->getTypeID() == $otherLocation->getTypeID();
 	}
 
-	public function hasX(/*Object*/ $x, AbstractSmrPlayer $player=null) {
+	public function hasX(/*Object*/ $x, AbstractSmrPlayer $player = null) {
 		if ($x instanceof SmrWeapon) {
 			return $this->isWeaponSold($x->getWeaponTypeID());
 		}
 		if (is_array($x)) {
-			if($x['Type']=='Ship') { // instanceof Ship)
+			if ($x['Type'] == 'Ship') { // instanceof Ship)
 				return $this->isShipSold($x['ShipTypeID']);
 			}
-			if ($x['Type']=='Hardware') { // instanceof ShipEquipment)
+			if ($x['Type'] == 'Hardware') { // instanceof ShipEquipment)
 				return $this->isHardwareSold($x['ID']);
 			}
 		}
-		if(is_string($x)) {
-			if ($x=='Bank') {
+		if (is_string($x)) {
+			if ($x == 'Bank') {
 				return $this->isBank();
 			}
-			if ($x=='Bar') {
+			if ($x == 'Bar') {
 				return $this->isBar();
 			}
-			if ($x=='Fed') {
+			if ($x == 'Fed') {
 				return $this->isFed();
 			}
-			if ($x=='SafeFed') {
+			if ($x == 'SafeFed') {
 				return $player != null && $this->isFed() && $player->canBeProtectedByRace($this->getRaceID());
 			}
-			if ($x=='HQ') {
+			if ($x == 'HQ') {
 				return $this->isHQ();
 			}
-			if ($x=='UG') {
+			if ($x == 'UG') {
 				return $this->isUG();
 			}
-			if ($x=='Hardware') {
+			if ($x == 'Hardware') {
 				return $this->isHardwareSold();
 			}
-			if ($x=='Ship') {
+			if ($x == 'Ship') {
 				return $this->isShipSold();
 			}
-			if ($x=='Weapon') {
+			if ($x == 'Weapon') {
 				return $this->isWeaponSold();
 			}
 		}

lib/Default/SocialLogin.class.inc

Spacing +15 added lines, -15 removed lines

@@ -10,15 +10,15 @@ 
 	private $loginType = null;
 	private $userID = null;
 	private $email = null;
-	private static $facebook=null;
-	private static $openID=null;
+	private static $facebook = null;
+	private static $openID = null;
 	private static $OPEN_ID_IDENTITIES = array();
 
 	private static function getFacebookObj() {
 		if (session_status() === PHP_SESSION_NONE) {
 			session_start();
 		}
-		if(self::$facebook==null) {
+		if (self::$facebook == null) {
 			self::$facebook = new Facebook\Facebook([
 				'app_id' => FACEBOOK_APP_ID,
 				'app_secret' => FACEBOOK_APP_SECRET,
@@ -28,7 +28,7 @@ 
 		return self::$facebook;
 	}
 
-	private static function getTwitterObj($token=null) {
+	private static function getTwitterObj($token = null) {
 		return new Abraham\TwitterOAuth\TwitterOAuth(
 			TWITTER_CONSUMER_KEY,
 			TWITTER_CONSUMER_SECRET,
@@ -38,8 +38,8 @@ 
 	}
 
 	private static function getOpenIdObj() {
-		if(self::$openID==null) {
-			require_once(LIB.'External/OpenID/openid.php');
+		if (self::$openID == null) {
+			require_once(LIB . 'External/OpenID/openid.php');
 			self::$openID = new LightOpenID();
 		}
 		return self::$openID;
@@ -79,8 +79,8 @@ 
 	}
 
 	public static function getOpenIdLoginUrl($loginType) {
-		if(!isset(self::$OPEN_ID_IDENTITIES[$loginType])) {
-			throw new Exception('OpenID does not exist for login type: '.$loginType);
+		if (!isset(self::$OPEN_ID_IDENTITIES[$loginType])) {
+			throw new Exception('OpenID does not exist for login type: ' . $loginType);
 		}
 		$openID = self::getOpenIdObj();
 		$openID->required = array('contact/email');
@@ -92,7 +92,7 @@ 
 	public function __construct($loginType) {
 		$this->loginType = $loginType;
 
-		if($loginType == self::FACEBOOK) {
+		if ($loginType == self::FACEBOOK) {
 			$helper = self::getFacebookObj()->getRedirectLoginHelper();
 			$accessToken = $helper->getAccessToken(self::getRedirectUrl($loginType));
 			$response = self::getFacebookObj()->get('/me?fields=email', $accessToken);
@@ -101,7 +101,7 @@ 
 			$this->email = $userInfo->getEmail();
 			$this->valid = true;
 		}
-		else if($loginType == self::TWITTER) {
+		else if ($loginType == self::TWITTER) {
 			if (session_status() === PHP_SESSION_NONE) {
 				session_start();
 			}
@@ -119,12 +119,12 @@ 
 				$this->valid = true;
 			}
 		}
-		else if($loginType == self::GOOGLE) {
-			if(self::getOpenIdObj()->validate()) {
-				if(strripos(self::getOpenIdObj()->identity, self::$OPEN_ID_IDENTITIES[$loginType]) === 0) {
-					$this->userID=self::getOpenIdObj()->identity;
+		else if ($loginType == self::GOOGLE) {
+			if (self::getOpenIdObj()->validate()) {
+				if (strripos(self::getOpenIdObj()->identity, self::$OPEN_ID_IDENTITIES[$loginType]) === 0) {
+					$this->userID = self::getOpenIdObj()->identity;
 					$userInfo = self::getOpenIdObj()->getAttributes();
-					$this->email=$userInfo['contact/email'];
+					$this->email = $userInfo['contact/email'];
 					$this->valid = true;
 				}
 			}

lib/Default/SmrAlliance.class.inc

Spacing +52 added lines, -52 removed lines

@@ -25,16 +25,16 @@ 
 	protected $memberList;
 	protected $seedlist;
 
-	public static function &getAlliance($allianceID,$gameID,$forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_ALLIANCES[$gameID][$allianceID])) {
+	public static function &getAlliance($allianceID, $gameID, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_ALLIANCES[$gameID][$allianceID])) {
 			self::$CACHE_ALLIANCES[$gameID][$allianceID] = new SmrAlliance($allianceID, $gameID);
 		}
 		return self::$CACHE_ALLIANCES[$gameID][$allianceID];
 	}
 
-	public static function getAllianceByDiscordChannel($channel, $forceUpdate=false) {
+	public static function getAllianceByDiscordChannel($channel, $forceUpdate = false) {
 		$db = new SmrMySqlDatabase();
-		$db->query('SELECT alliance_id, game_id FROM alliance JOIN game USING(game_id) WHERE discord_channel = '.$db->escapeString($channel).' AND game.end_date > '.$db->escapeNumber(time()).' ORDER BY game_id DESC LIMIT 1');
+		$db->query('SELECT alliance_id, game_id FROM alliance JOIN game USING(game_id) WHERE discord_channel = ' . $db->escapeString($channel) . ' AND game.end_date > ' . $db->escapeNumber(time()) . ' ORDER BY game_id DESC LIMIT 1');
 		if ($db->nextRecord()) {
 			return self::getAlliance($db->getInt('alliance_id'), $db->getInt('game_id'), $forceUpdate);
 		} else {
@@ -42,10 +42,10 @@ 
 		}
 	}
 
-	public static function &getAllianceByIrcChannel($channel,$forceUpdate = false) {
+	public static function &getAllianceByIrcChannel($channel, $forceUpdate = false) {
 		$db = new SmrMySqlDatabase();
-		$db->query('SELECT alliance_id, game_id FROM irc_alliance_has_channel WHERE channel = '.$db->escapeString($channel).' LIMIT 1');
-		if($db->nextRecord()) {
+		$db->query('SELECT alliance_id, game_id FROM irc_alliance_has_channel WHERE channel = ' . $db->escapeString($channel) . ' LIMIT 1');
+		if ($db->nextRecord()) {
 			return self::getAlliance($db->getInt('alliance_id'), $db->getInt('game_id'), $forceUpdate);
 		}
 		$return = null;
@@ -62,17 +62,17 @@ 
 		if ($allianceID != 0) {
 			$this->db->query('SELECT * FROM alliance WHERE ' . $this->SQL);
 			$this->db->nextRecord();
-			$this->allianceName		= stripslashes($this->db->getField('alliance_name'));
+			$this->allianceName = stripslashes($this->db->getField('alliance_name'));
 			$this->password			= stripslashes($this->db->getField('alliance_password'));
-			$this->description		= strip_tags(stripslashes($this->db->getField('alliance_description')));
+			$this->description = strip_tags(stripslashes($this->db->getField('alliance_description')));
 			$this->leaderID			= $this->db->getInt('leader_id');
-			$this->account			= $this->db->getInt('alliance_account');
+			$this->account = $this->db->getInt('alliance_account');
 			$this->kills			= $this->db->getInt('alliance_kills');
 			$this->deaths			= $this->db->getInt('alliance_deaths');
 			$this->motd				= strip_tags(stripslashes($this->db->getField('mod')));
 			$this->imgSrc			= $this->db->getField('img_src');
-			$this->discordServer	= $this->db->getField('discord_server');
-			$this->discordChannel	= $this->db->getField('discord_channel');
+			$this->discordServer = $this->db->getField('discord_server');
+			$this->discordChannel = $this->db->getField('discord_channel');
 			$this->flagshipID = $this->db->getInt('flagship_id');
 
 			if (empty($this->kills)) {
@@ -95,12 +95,12 @@ 
 		return $this->allianceID;
 	}
 
-	public function getAllianceName($linked=false, $includeAllianceID=false) {
+	public function getAllianceName($linked = false, $includeAllianceID = false) {
 		$name = $this->allianceName;
 		if ($includeAllianceID) {
 			$name .= ' (' . $this->allianceID . ')';
 		}
-		if($linked === true && !$this->hasDisbanded()) {
+		if ($linked === true && !$this->hasDisbanded()) {
 			return create_link(Globals::getAllianceRosterHREF($this->getAllianceID()), $name);
 		}
 		return $name;
@@ -123,7 +123,7 @@ 
 	}
 
 	public function &getLeader() {
-		return SmrPlayer::getPlayer($this->getLeaderID(),$this->getGameID());
+		return SmrPlayer::getPlayer($this->getLeaderID(), $this->getGameID());
 	}
 
 	public function getDiscordServer() {
@@ -143,9 +143,9 @@ 
 	}
 
 	public function getIrcChannel() {
-		if(!isset($this->ircChannel)) {
+		if (!isset($this->ircChannel)) {
 			$this->db->query('SELECT channel FROM irc_alliance_has_channel WHERE ' . $this->SQL);
-			if($this->db->nextRecord()) {
+			if ($this->db->nextRecord()) {
 				$this->ircChannel = $this->db->getField('channel');
 			}
 			else {
@@ -156,11 +156,11 @@ 
 	}
 
 	public function setIrcChannel($ircChannel) {
-		if($this->ircChannel == $ircChannel) {
+		if ($this->ircChannel == $ircChannel) {
 			return;
 		}
-		if(strlen($ircChannel)>0 && $ircChannel != '#') {
-			if($ircChannel[0] != '#') {
+		if (strlen($ircChannel) > 0 && $ircChannel != '#') {
+			if ($ircChannel[0] != '#') {
 				$ircChannel = '#' . $ircChannel;
 			}
 			if ($ircChannel == '#smr' || $ircChannel == '#smr-bar') {
@@ -184,7 +184,7 @@ 
 	}
 
 	public function setImageURL($url) {
-		if(preg_match('/"/',$url)) {
+		if (preg_match('/"/', $url)) {
 			throw new Exception('Tried to set an image url with ": ' . $url);
 		}
 		$this->imgSrc = htmlspecialchars($url);
@@ -228,18 +228,18 @@ 
 
 	public function setAllianceDescription($description) {
 		$description = word_filter($description);
-		if($description==$this->description) {
+		if ($description == $this->description) {
 			return;
 		}
-		global $player,$account;
-		$boxDescription = 'Alliance '.$this->getAllianceName(false, true).' had their description changed to:'.EOL.EOL.$description;
-		if(is_object($player)) {
-			$player->sendMessageToBox(BOX_ALLIANCE_DESCRIPTIONS,$boxDescription);
+		global $player, $account;
+		$boxDescription = 'Alliance ' . $this->getAllianceName(false, true) . ' had their description changed to:' . EOL . EOL . $description;
+		if (is_object($player)) {
+			$player->sendMessageToBox(BOX_ALLIANCE_DESCRIPTIONS, $boxDescription);
 		}
 		else {
-			$account->sendMessageToBox(BOX_ALLIANCE_DESCRIPTIONS,$boxDescription);
+			$account->sendMessageToBox(BOX_ALLIANCE_DESCRIPTIONS, $boxDescription);
 		}
-		$this->description=nl2br(htmlspecialchars($description));
+		$this->description = nl2br(htmlspecialchars($description));
 	}
 
 	public function hasFlagship() {
@@ -264,7 +264,7 @@ 
 		$this->flagshipID = $accountID;
 	}
 
-	public function canJoinAlliance(SmrPlayer $player, $doAllianceCheck=true) {
+	public function canJoinAlliance(SmrPlayer $player, $doAllianceCheck = true) {
 		if (!$player->getAccount()->isValidated()) {
 			return 'You cannot join an alliance until you validate your account.';
 		}
@@ -274,23 +274,23 @@ 
 		if ($doAllianceCheck && $player->hasAlliance()) {
 			return 'You are already in an alliance!';
 		}
-		if($this->getPassword()=='*') {
+		if ($this->getPassword() == '*') {
 			return 'This alliance is not currently accepting new recruits.';
 		}
-		if($player->getAllianceJoinable() > TIME) {
-			return 'You cannot join another alliance for '.format_time($player->getAllianceJoinable()-TIME).'.';
+		if ($player->getAllianceJoinable() > TIME) {
+			return 'You cannot join another alliance for ' . format_time($player->getAllianceJoinable() - TIME) . '.';
 		}
-		if($this->getNumMembers()<Globals::getAllianceMaxPlayers($this->getGameID())) {
+		if ($this->getNumMembers() < Globals::getAllianceMaxPlayers($this->getGameID())) {
 			if ($player->hasNewbieStatus()) {
 				return true;
 			}
 			$maxVets = Globals::getAllianceMaxVets($this->getGameID());
-			if($this->getNumMembers()<$maxVets) {
+			if ($this->getNumMembers() < $maxVets) {
 				return true;
 			}
-			$this->db->query('SELECT status FROM player_joined_alliance WHERE account_id='.$this->db->escapeNumber($player->getAccountID()).' AND '.$this->SQL);
-			if($this->db->nextRecord()) {
-				if($this->db->getField('status')=='NEWBIE') {
+			$this->db->query('SELECT status FROM player_joined_alliance WHERE account_id=' . $this->db->escapeNumber($player->getAccountID()) . ' AND ' . $this->SQL);
+			if ($this->db->nextRecord()) {
+				if ($this->db->getField('status') == 'NEWBIE') {
 					return true;
 				}
 			}
@@ -298,7 +298,7 @@ 
 							FROM player_joined_alliance
 							JOIN player USING (account_id, alliance_id, game_id)
 							WHERE ' . $this->SQL . ' AND status=\'VETERAN\'');
-			if(!$this->db->nextRecord() || $this->db->getInt('num_orig_vets') < $maxVets) {
+			if (!$this->db->nextRecord() || $this->db->getInt('num_orig_vets') < $maxVets) {
 				return true;
 			}
 		}
@@ -306,7 +306,7 @@ 
 	}
 
 	public function getNumVeterans() {
-		$numVeterans=0;
+		$numVeterans = 0;
 		foreach ($this->getMembers() as $player) {
 			if (!$player->hasNewbieStatus()) {
 				$numVeterans++;
@@ -321,16 +321,16 @@ 
 
 	function update() {
 		$this->db->query('UPDATE alliance SET alliance_password = ' . $this->db->escapeString($this->password) . ',
-								alliance_account = '.$this->db->escapeNumber($this->account).',
+								alliance_account = '.$this->db->escapeNumber($this->account) . ',
 								alliance_description = ' . $this->db->escapeString($this->description) . ',
 								`mod` = ' . $this->db->escapeString($this->motd) . ',
 								img_src = ' . $this->db->escapeString($this->imgSrc) . ',
-								alliance_kills = '.$this->db->escapeNumber($this->kills).',
-								alliance_deaths = '.$this->db->escapeNumber($this->deaths).',
-								discord_server = '.$this->db->escapeString($this->discordServer).',
-								discord_channel = '.$this->db->escapeString($this->discordChannel).',
-								flagship_id = '.$this->db->escapeNumber($this->flagshipID).',
-								leader_id = '.$this->db->escapeNumber($this->leaderID).'
+								alliance_kills = '.$this->db->escapeNumber($this->kills) . ',
+								alliance_deaths = '.$this->db->escapeNumber($this->deaths) . ',
+								discord_server = '.$this->db->escapeString($this->discordServer) . ',
+								discord_channel = '.$this->db->escapeString($this->discordChannel) . ',
+								flagship_id = '.$this->db->escapeNumber($this->flagshipID) . ',
+								leader_id = '.$this->db->escapeNumber($this->leaderID) . '
 							WHERE ' . $this->SQL);
 	}
 
@@ -342,7 +342,7 @@ 
 	}
 
 	function getMemberIDs() {
-		if(!isset($this->memberList)) {
+		if (!isset($this->memberList)) {
 			$this->db->query('SELECT account_id FROM player WHERE ' . $this->SQL);
 
 			//we have the list of players put them in an array now
@@ -360,9 +360,9 @@ 
 		$this->db->query('SELECT account_id
 						FROM active_session
 						JOIN player USING(account_id, game_id)
-						WHERE '.$this->SQL.' AND last_accessed >= ' . $this->db->escapeNumber(TIME - 600));
+						WHERE '.$this->SQL . ' AND last_accessed >= ' . $this->db->escapeNumber(TIME - 600));
 		
-		while($this->db->nextRecord()) {
+		while ($this->db->nextRecord()) {
 			$activeIDs[] = $this->db->getInt('account_id');
 		}
 		
@@ -412,7 +412,7 @@ 
 	 * Create the default roles for this alliance.
 	 * This should only be called once after the alliance is created.
 	 */
-	public function createDefaultRoles($newMemberPermission='basic') {
+	public function createDefaultRoles($newMemberPermission = 'basic') {
 		$db = $this->db; //for convenience
 
 		$withPerDay = ALLIANCE_BANK_UNLIMITED;
@@ -427,7 +427,7 @@ 
 		$opLeader = TRUE;
 		$viewBonds = TRUE;
 		$db->query('INSERT INTO alliance_has_roles (alliance_id, game_id, role_id, role, with_per_day, remove_member, change_pass, change_mod, change_roles, planet_access, exempt_with, mb_messages, send_alliance_msg, op_leader, view_bonds) ' .
-			'VALUES (' . $db->escapeNumber($this->getAllianceID()) . ', ' . $db->escapeNumber($this->getGameID()) . ', 1, \'Leader\', ' . $db->escapeNumber($withPerDay) . ', '.$db->escapeBoolean($removeMember) . ', ' . $db->escapeBoolean($changePass) . ', ' . $db->escapeBoolean($changeMOD) . ', '.$db->escapeBoolean($changeRoles) . ', ' . $db->escapeBoolean($planetAccess) . ', ' . $db->escapeBoolean($exemptWith) . ', ' . $db->escapeBoolean($mbMessages) . ', ' . $db->escapeString($sendAllMsg) . ', ' . $db->escapeBoolean($opLeader) . ', ' . $db->escapeBoolean($viewBonds) . ')');
+			'VALUES (' . $db->escapeNumber($this->getAllianceID()) . ', ' . $db->escapeNumber($this->getGameID()) . ', 1, \'Leader\', ' . $db->escapeNumber($withPerDay) . ', ' . $db->escapeBoolean($removeMember) . ', ' . $db->escapeBoolean($changePass) . ', ' . $db->escapeBoolean($changeMOD) . ', ' . $db->escapeBoolean($changeRoles) . ', ' . $db->escapeBoolean($planetAccess) . ', ' . $db->escapeBoolean($exemptWith) . ', ' . $db->escapeBoolean($mbMessages) . ', ' . $db->escapeString($sendAllMsg) . ', ' . $db->escapeBoolean($opLeader) . ', ' . $db->escapeBoolean($viewBonds) . ')');
 
 		switch ($newMemberPermission) {
 			case 'full':
@@ -461,7 +461,7 @@ 
 			break;
 		}
 		$db->query('INSERT INTO alliance_has_roles (alliance_id, game_id, role_id, role, with_per_day, remove_member, change_pass, change_mod, change_roles, planet_access, exempt_with, mb_messages, send_alliance_msg, op_leader, view_bonds) ' .
-					'VALUES (' . $db->escapeNumber($this->getAllianceID()) . ', ' . $db->escapeNumber($this->getGameID()) . ', 2, \'New Member\', ' . $db->escapeNumber($withPerDay) . ', '.$db->escapeBoolean($removeMember) . ', ' . $db->escapeBoolean($changePass) . ', ' . $db->escapeBoolean($changeMOD) . ', '.$db->escapeBoolean($changeRoles) . ', ' . $db->escapeBoolean($planetAccess) . ', ' . $db->escapeBoolean($exemptWith) . ', ' . $db->escapeBoolean($mbMessages) . ', ' . $db->escapeString($sendAllMsg) . ', ' . $db->escapeBoolean($opLeader) . ', ' . $db->escapeBoolean($viewBonds) . ')');
+					'VALUES (' . $db->escapeNumber($this->getAllianceID()) . ', ' . $db->escapeNumber($this->getGameID()) . ', 2, \'New Member\', ' . $db->escapeNumber($withPerDay) . ', ' . $db->escapeBoolean($removeMember) . ', ' . $db->escapeBoolean($changePass) . ', ' . $db->escapeBoolean($changeMOD) . ', ' . $db->escapeBoolean($changeRoles) . ', ' . $db->escapeBoolean($planetAccess) . ', ' . $db->escapeBoolean($exemptWith) . ', ' . $db->escapeBoolean($mbMessages) . ', ' . $db->escapeString($sendAllMsg) . ', ' . $db->escapeBoolean($opLeader) . ', ' . $db->escapeBoolean($viewBonds) . ')');
 
 		// Set the leader permissions
 		$db->query('INSERT INTO player_has_alliance_role (game_id, account_id, role_id, alliance_id) VALUES (' . $db->escapeNumber($this->getGameID()) . ', ' . $db->escapeNumber($this->getLeaderID()) . ', 1,' . $db->escapeNumber($this->getAllianceID()) . ')');

lib/Default/message.functions.inc

Spacing +11 added lines, -11 removed lines

@@ -26,31 +26,31 @@
 }
 
 function &getMessagePlayer($accountID, $gameID, $messageType = false) {
-	if($accountID==ACCOUNT_ID_PORT)
+	if ($accountID == ACCOUNT_ID_PORT)
 		$return = '<span class="yellow">Port Defenses</span>';
-	else if($accountID==ACCOUNT_ID_ADMIN)
+	else if ($accountID == ACCOUNT_ID_ADMIN)
 		$return = '<span class="admin">Administrator</span>';
-	else if($accountID==ACCOUNT_ID_PLANET)
+	else if ($accountID == ACCOUNT_ID_PLANET)
 		$return = '<span class="yellow">Planetary Defenses</span>';
-	else if($accountID==ACCOUNT_ID_ALLIANCE_AMBASSADOR)
+	else if ($accountID == ACCOUNT_ID_ALLIANCE_AMBASSADOR)
 		$return = '<span class="green">Alliance Ambassador</span>';
-	else if($accountID==ACCOUNT_ID_CASINO)
+	else if ($accountID == ACCOUNT_ID_CASINO)
 		$return = '<span class="yellow">Casino</span>';
-	else if($accountID==ACCOUNT_ID_FED_CLERK)
+	else if ($accountID == ACCOUNT_ID_FED_CLERK)
 		$return = '<span class="yellow">Federal Clerk</span>';
-	else if($accountID==ACCOUNT_ID_OP_ANNOUNCE || $accountID==ACCOUNT_ID_ALLIANCE_COMMAND)
+	else if ($accountID == ACCOUNT_ID_OP_ANNOUNCE || $accountID == ACCOUNT_ID_ALLIANCE_COMMAND)
 		$return = '<span class="green">Alliance Command</span>';
 	else {
 		foreach (Globals::getRaces() as $raceID => $raceInfo) {
-			if($accountID==ACCOUNT_ID_GROUP_RACES+$raceID) {
-				$return = '<span class="yellow">'.$raceInfo['Race Name'].' Government</span>';
+			if ($accountID == ACCOUNT_ID_GROUP_RACES + $raceID) {
+				$return = '<span class="yellow">' . $raceInfo['Race Name'] . ' Government</span>';
 				return $return;
 			}
 		}
-		if(!empty($accountID))
+		if (!empty($accountID))
 			$return = SmrPlayer::getPlayer($accountID, $gameID);
 		else {
-			switch($messageType) {
+			switch ($messageType) {
 				case MSG_ADMIN:
 					$return = '<span class="admin">Administrator</span>';
 				break;

lib/Default/SmrPlayer.class.inc

Spacing +344 added lines, -344 removed lines

@@ -35,9 +35,9 @@ 
 
 
 	public static function refreshCache() {
-		foreach(self::$CACHE_PLAYERS as $gameID => &$gamePlayers) {
-			foreach($gamePlayers as $accountID => &$player) {
-				$player = self::getPlayer($accountID,$gameID,true);
+		foreach (self::$CACHE_PLAYERS as $gameID => &$gamePlayers) {
+			foreach ($gamePlayers as $accountID => &$player) {
+				$player = self::getPlayer($accountID, $gameID, true);
 			}
 		}
 	}
@@ -48,28 +48,28 @@ 
 	}
 
 	public static function savePlayers() {
-		foreach(self::$CACHE_PLAYERS as $gamePlayers) {
-			foreach($gamePlayers as $player) {
+		foreach (self::$CACHE_PLAYERS as $gamePlayers) {
+			foreach ($gamePlayers as $player) {
 				$player->save();
 			}
 		}
 	}
 
-	public static function &getSectorPlayersByAlliances($gameID,$sectorID, array $allianceIDs, $forceUpdate = false) {
-		$players = self::getSectorPlayers($gameID,$sectorID,$forceUpdate); // Don't use & as we do an unset
-		foreach($players as $accountID => $player) {
-			if(!in_array($player->getAllianceID(),$allianceIDs))
+	public static function &getSectorPlayersByAlliances($gameID, $sectorID, array $allianceIDs, $forceUpdate = false) {
+		$players = self::getSectorPlayers($gameID, $sectorID, $forceUpdate); // Don't use & as we do an unset
+		foreach ($players as $accountID => $player) {
+			if (!in_array($player->getAllianceID(), $allianceIDs))
 				unset($players[$accountID]);
 		}
 		return $players;
 	}
 
-	public static function &getSectorPlayers($gameID,$sectorID,$forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_SECTOR_PLAYERS[$gameID][$sectorID])) {
+	public static function &getSectorPlayers($gameID, $sectorID, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_SECTOR_PLAYERS[$gameID][$sectorID])) {
 			$db = new SmrMySqlDatabase();
-			$db->query('SELECT * FROM player WHERE sector_id = ' . $db->escapeNumber($sectorID) . ' AND game_id=' . $db->escapeNumber($gameID) . ' AND land_on_planet = ' . $db->escapeBoolean(false) . ' AND (last_cpl_action > ' . $db->escapeNumber(TIME-TIME_BEFORE_INACTIVE) . ' OR newbie_turns = 0) AND account_id NOT IN (' . $db->escapeArray(Globals::getHiddenPlayers()) . ') ORDER BY last_cpl_action DESC');
+			$db->query('SELECT * FROM player WHERE sector_id = ' . $db->escapeNumber($sectorID) . ' AND game_id=' . $db->escapeNumber($gameID) . ' AND land_on_planet = ' . $db->escapeBoolean(false) . ' AND (last_cpl_action > ' . $db->escapeNumber(TIME - TIME_BEFORE_INACTIVE) . ' OR newbie_turns = 0) AND account_id NOT IN (' . $db->escapeArray(Globals::getHiddenPlayers()) . ') ORDER BY last_cpl_action DESC');
 			$players = array();
-			while($db->nextRecord()) {
+			while ($db->nextRecord()) {
 				$accountID = $db->getInt('account_id');
 				$players[$accountID] = self::getPlayer($accountID, $gameID, $forceUpdate, $db);
 			}
@@ -78,12 +78,12 @@ 
 		return self::$CACHE_SECTOR_PLAYERS[$gameID][$sectorID];
 	}
 
-	public static function &getPlanetPlayers($gameID,$sectorID,$forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_PLANET_PLAYERS[$gameID][$sectorID])) {
+	public static function &getPlanetPlayers($gameID, $sectorID, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_PLANET_PLAYERS[$gameID][$sectorID])) {
 			$db = new SmrMySqlDatabase();
 			$db->query('SELECT * FROM player WHERE sector_id = ' . $db->escapeNumber($sectorID) . ' AND game_id=' . $db->escapeNumber($gameID) . ' AND land_on_planet = ' . $db->escapeBoolean(true) . ' AND account_id NOT IN (' . $db->escapeArray(Globals::getHiddenPlayers()) . ') ORDER BY last_cpl_action DESC');
 			$players = array();
-			while($db->nextRecord()) {
+			while ($db->nextRecord()) {
 				$accountID = $db->getField('account_id');
 				$players[$accountID] = self::getPlayer($accountID, $gameID, $forceUpdate, $db);
 			}
@@ -92,12 +92,12 @@ 
 		return self::$CACHE_PLANET_PLAYERS[$gameID][$sectorID];
 	}
 
-	public static function &getAlliancePlayers($gameID,$allianceID,$forceUpdate = false) {
-		if($forceUpdate || !isset(self::$CACHE_ALLIANCE_PLAYERS[$gameID][$allianceID])) {
+	public static function &getAlliancePlayers($gameID, $allianceID, $forceUpdate = false) {
+		if ($forceUpdate || !isset(self::$CACHE_ALLIANCE_PLAYERS[$gameID][$allianceID])) {
 			$db = new SmrMySqlDatabase();
-			$db->query('SELECT * FROM player WHERE alliance_id = ' . $db->escapeNumber($allianceID) . ' AND game_id=' . $db->escapeNumber($gameID) .' ORDER BY experience DESC');
+			$db->query('SELECT * FROM player WHERE alliance_id = ' . $db->escapeNumber($allianceID) . ' AND game_id=' . $db->escapeNumber($gameID) . ' ORDER BY experience DESC');
 			$players = array();
-			while($db->nextRecord()) {
+			while ($db->nextRecord()) {
 				$accountID = $db->getInt('account_id');
 				$players[$accountID] = self::getPlayer($accountID, $gameID, $forceUpdate, $db);
 			}
@@ -106,23 +106,23 @@ 
 		return self::$CACHE_ALLIANCE_PLAYERS[$gameID][$allianceID];
 	}
 
-	public static function &getPlayer($accountID, $gameID, $forceUpdate=false, $db=null) {
+	public static function &getPlayer($accountID, $gameID, $forceUpdate = false, $db = null) {
 		if ($forceUpdate || !isset(self::$CACHE_PLAYERS[$gameID][$accountID])) {
 			self::$CACHE_PLAYERS[$gameID][$accountID] = new SmrPlayer($gameID, $accountID, $db);
 		}
 		return self::$CACHE_PLAYERS[$gameID][$accountID];
 	}
 
-	public static function &getPlayerByPlayerID($playerID,$gameID,$forceUpdate = false) {
+	public static function &getPlayerByPlayerID($playerID, $gameID, $forceUpdate = false) {
 		$db = new SmrMySqlDatabase();
-		$db->query('SELECT * FROM player WHERE game_id = '.$db->escapeNumber($gameID).' AND player_id = '.$db->escapeNumber($playerID).' LIMIT 1');
+		$db->query('SELECT * FROM player WHERE game_id = ' . $db->escapeNumber($gameID) . ' AND player_id = ' . $db->escapeNumber($playerID) . ' LIMIT 1');
 		if ($db->nextRecord()) {
 			return self::getPlayer($db->getInt('account_id'), $gameID, $forceUpdate, $db);
 		}
 		throw new PlayerNotFoundException('Player ID not found.');
 	}
 
-	protected function __construct($gameID, $accountID, $db=null) {
+	protected function __construct($gameID, $accountID, $db = null) {
 		parent::__construct();
 		$this->db = new SmrMySqlDatabase();
 		$this->SQL = 'account_id = ' . $this->db->escapeNumber($accountID) . ' AND game_id = ' . $this->db->escapeNumber($gameID);
@@ -136,8 +136,8 @@ 
 		}
 
 		if ($playerExists) {
-			$this->accountID = (int) $accountID;
-			$this->gameID = (int) $gameID;
+			$this->accountID = (int)$accountID;
+			$this->gameID = (int)$gameID;
 			$this->playerName = $db->getField('player_name');
 			$this->playerID = $db->getInt('player_id');
 			$this->sectorID = $db->getInt('sector_id');
@@ -177,13 +177,13 @@ 
 			$this->combatDronesKamikazeOnMines = $db->getBoolean('combat_drones_kamikaze_on_mines');
 		}
 		else {
-			throw new PlayerNotFoundException('Invalid accountID: '.$accountID. ' OR gameID:'.$gameID);
+			throw new PlayerNotFoundException('Invalid accountID: ' . $accountID . ' OR gameID:' . $gameID);
 		}
 	}
 
 	// Get array of players whose info can be accessed by this player.
 	// Skips players who are not in the same alliance as this player.
-	public function getSharingPlayers($forceUpdate=false) {
+	public function getSharingPlayers($forceUpdate = false) {
 		$results = array($this);
 
 		// Only return this player if not in an alliance
@@ -212,7 +212,7 @@ 
 	}
 
 	function get($bit) {
-		switch($bit) {
+		switch ($bit) {
 			case 'Sector ID':
 				return $this->sectorID;
 			case 'Last Sector ID':
@@ -285,7 +285,7 @@ 
 			case 'Aether Knowledge':
 				return $this->getKnowledge('Aether');
 			default:
-				throw new Exception('Player->get('.$bit.') not found, report to Page.');
+				throw new Exception('Player->get(' . $bit . ') not found, report to Page.');
 		}
 	}
 
@@ -304,52 +304,52 @@ 
 	function setZoom($zoom) {
 		if ($zoom < 0) $zoom = 0;
 		if ($zoom > 12) $zoom = 12;
-		if($this->zoom == $zoom)
+		if ($this->zoom == $zoom)
 			return;
-		$this->zoom=$zoom;
-		$this->hasChanged=true;
+		$this->zoom = $zoom;
+		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET zoom = ' . $zoom . ' WHERE ' . $this->SQL . ' LIMIT 1');
 	}
 
 	function increaseZoom($zoom) {
 		if ($zoom < 0)
 			throw new Exception('Trying to increase negative zoom.');
-		$this->setZoom($this->getZoom()+$zoom);
+		$this->setZoom($this->getZoom() + $zoom);
 	}
 
 	function decreaseZoom($zoom) {
 		if ($zoom < 0)
 			throw new Exception('Trying to decrease negative zoom.');
-		$this->setZoom($this->getZoom()-$zoom);
+		$this->setZoom($this->getZoom() - $zoom);
 	}
 
 	public function setSectorID($sectorID) {
-		$port = SmrPort::getPort($this->getGameID(),$this->getSectorID());
+		$port = SmrPort::getPort($this->getGameID(), $this->getSectorID());
 		$port->addCachePort($this->getAccountID()); //Add port of sector we were just in, to make sure it is left totally up to date.
 
 		parent::setSectorID($sectorID);
 
-		$port = SmrPort::getPort($this->getGameID(),$sectorID);
+		$port = SmrPort::getPort($this->getGameID(), $sectorID);
 		$port->addCachePort($this->getAccountID()); //Add the port of sector we are now in.
 	}
 
 	function setLastSectorID($lastSectorID) {
-		if($this->lastSectorID == $lastSectorID)
+		if ($this->lastSectorID == $lastSectorID)
 			return;
-		$this->lastSectorID=$lastSectorID;
-		$this->hasChanged=true;
+		$this->lastSectorID = $lastSectorID;
+		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET last_sector_id = '.$this->lastSectorID.' WHERE '.$this->SQL.' LIMIT 1');
 	}
 
 	function leaveAlliance(AbstractSmrPlayer $kickedBy = null) {
 		$allianceID = $this->getAllianceID();
 		$alliance = $this->getAlliance();
-		if($kickedBy != null) {
+		if ($kickedBy != null) {
 			$kickedBy->sendMessage($this->getAccountID(), MSG_PLAYER, 'You were kicked out of the alliance!', false);
 			$this->actionTaken('PlayerKicked', array('Alliance' => $alliance, 'Player' => $kickedBy));
 			$kickedBy->actionTaken('KickPlayer', array('Alliance' => $alliance, 'Player' => $this));
 		}
-		else if($this->isAllianceLeader()) {
+		else if ($this->isAllianceLeader()) {
 			$this->actionTaken('DisbandAlliance', array('Alliance' => $alliance));
 		}
 		else {
@@ -362,7 +362,7 @@ 
 		$this->setAllianceID(0);
 		$this->db->query('DELETE FROM player_has_alliance_role WHERE ' . $this->SQL);
 
-		if(!$this->isAllianceLeader() && $allianceID!=NHA_ID) { // Don't have a delay for switching alliance after leaving NHA, or for disbanding an alliance.
+		if (!$this->isAllianceLeader() && $allianceID != NHA_ID) { // Don't have a delay for switching alliance after leaving NHA, or for disbanding an alliance.
 			$this->setAllianceJoinable(TIME + self::TIME_FOR_ALLIANCE_SWITCH);
 			$alliance->getLeader()->setAllianceJoinable(TIME + self::TIME_FOR_ALLIANCE_SWITCH); //We set the joinable time for leader here, that way a single player alliance won't cause a player to wait before switching.
 		}
@@ -393,10 +393,10 @@ 
 	}
 
 	function setAllianceJoinable($time) {
-		if($this->allianceJoinable == $time)
+		if ($this->allianceJoinable == $time)
 			return;
-		$this->allianceJoinable=$time;
-		$this->hasChanged=true;
+		$this->allianceJoinable = $time;
+		$this->hasChanged = true;
 	}
 
 	function getAttackColour() {
@@ -404,10 +404,10 @@ 
 	}
 
 	function setAttackColour($colour) {
-		if($this->attackColour == $colour)
+		if ($this->attackColour == $colour)
 			return;
-		$this->attackColour=$colour;
-		$this->hasChanged=true;
+		$this->attackColour = $colour;
+		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET attack_warning = ' . $this->db->escapeString($this->attackColour) . ' WHERE ' . $this->SQL . ' LIMIT 1');
 	}
 
@@ -416,30 +416,30 @@ 
 	}
 
 	function increaseBank($credits) {
-		if($credits < 0)
+		if ($credits < 0)
 			throw new Exception('Trying to increase negative credits.');
-		if($credits == 0)
+		if ($credits == 0)
 			return;
 		$credits += $this->bank;
 		$this->setBank($credits);
 	}
 	function decreaseBank($credits) {
-		if($credits < 0)
+		if ($credits < 0)
 			throw new Exception('Trying to decrease negative credits.');
-		if($credits == 0)
+		if ($credits == 0)
 			return;
 		$credits = $this->bank - $credits;
 		$this->setBank($credits);
 	}
 	function setBank($credits) {
-		if($this->bank == $credits)
+		if ($this->bank == $credits)
 			return;
-		if($credits < 0)
+		if ($credits < 0)
 			throw new Exception('Trying to set negative credits.');
-		if($credits > MAX_MONEY)
+		if ($credits > MAX_MONEY)
 			throw new Exception('Trying to set more than max credits.');
 		$this->bank = $credits;
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET bank = '.$this->bank.' WHERE '.$this->SQL.' LIMIT 1');
 	}
 
@@ -448,10 +448,10 @@ 
 	}
 
 	function setLastNewsUpdate($time) {
-		if($this->lastNewsUpdate == $time)
+		if ($this->lastNewsUpdate == $time)
 			return;
-		$this->lastNewsUpdate=$time;
-		$this->hasChanged=true;
+		$this->lastNewsUpdate = $time;
+		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET last_news_update = ' . $time . ' WHERE ' . $this->SQL . ' LIMIT 1');
 	}
 
@@ -467,7 +467,7 @@ 
 	 * Calculate the time in seconds between the given time and when the
 	 * player will be at max turns.
 	 */
-	public function getTimeUntilMaxTurns($time, $forceUpdate=false) {
+	public function getTimeUntilMaxTurns($time, $forceUpdate = false) {
 		$timeDiff = $time - $this->getLastTurnUpdate();
 		$turnsDiff = $this->getMaxTurns() - $this->getTurns();
 		$ship = $this->getShip($forceUpdate);
@@ -478,7 +478,7 @@ 
 
 	// Turns only update when player is active.
 	// Calculate turns gained between given time and the last turn update
-	public function getTurnsGained($time, $forceUpdate=false) {
+	public function getTurnsGained($time, $forceUpdate = false) {
 		$timeDiff = $time - $this->getLastTurnUpdate();
 		$ship = $this->getShip($forceUpdate);
 		$extraTurns = floor($timeDiff * $ship->getRealSpeed() / 3600);
@@ -499,7 +499,7 @@ 
 			$newLastTurnUpdate = $this->getLastTurnUpdate() + ceil($extraTurns * 3600 / $ship->getRealSpeed());
 
 			$startTurnsDate = $this->getGame()->getStartTurnsDate();
-			if($startTurnsDate < $newLastTurnUpdate && $startTurnsDate >= $this->getLastTurnUpdate()) {
+			if ($startTurnsDate < $newLastTurnUpdate && $startTurnsDate >= $this->getLastTurnUpdate()) {
 				$startingTurns = min($ship->getRealSpeed() * $this->getGame()->getStartTurnHours(), $this->getMaxTurns() - $this->getTurns());
 				$extraUpdateTime = (ceil($startingTurns) - $startingTurns) * 3600 / $ship->getRealSpeed();
 				$extraTurns += $startingTurns;
@@ -516,10 +516,10 @@ 
 	}
 
 	function setIgnoreGlobals($bool) {
-		if($this->ignoreGlobals == $bool)
+		if ($this->ignoreGlobals == $bool)
 			return;
-		$this->ignoreGlobals=$bool;
-		$this->hasChanged=true;
+		$this->ignoreGlobals = $bool;
+		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET ignore_globals = '.$this->db->escapeBoolean($bool).' WHERE '.$this->SQL.' LIMIT 1');
 	}
 
@@ -529,10 +529,10 @@ 
 	}
 
 	function setLastPort($lastPort) {
-		if($this->lastPort == $lastPort)
+		if ($this->lastPort == $lastPort)
 			return;
-		$this->lastPort=$lastPort;
-		$this->hasChanged=true;
+		$this->lastPort = $lastPort;
+		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET last_port = ' . $this->lastPort . ' WHERE ' . $this->SQL . ' LIMIT 1');
 	}
 
@@ -541,10 +541,10 @@ 
 	}
 
 	function setDisplayMissions($bool) {
-		if($this->displayMissions == $bool)
+		if ($this->displayMissions == $bool)
 			return;
-		$this->displayMissions=$bool;
-		$this->hasChanged=true;
+		$this->displayMissions = $bool;
+		$this->hasChanged = true;
 	}
 
 	function isDisplayWeapons() {
@@ -552,10 +552,10 @@ 
 	}
 
 	function setDisplayWeapons($bool) {
-		if($this->displayWeapons == $bool)
+		if ($this->displayWeapons == $bool)
 			return;
-		$this->displayWeapons=$bool;
-		$this->hasChanged=true;
+		$this->displayWeapons = $bool;
+		$this->hasChanged = true;
 	}
 
 	function isForceDropMessages() {
@@ -563,10 +563,10 @@ 
 	}
 
 	function setForceDropMessages($bool) {
-		if($this->forceDropMessages == $bool)
+		if ($this->forceDropMessages == $bool)
 			return;
-		$this->forceDropMessages=$bool;
-		$this->hasChanged=true;
+		$this->forceDropMessages = $bool;
+		$this->hasChanged = true;
 	}
 
 	function getScoutMessageGroupLimit() {
@@ -596,15 +596,15 @@ 
 	}
 
 	function setLastTurnUpdate($time) {
-		if($this->lastTurnUpdate == $time)
+		if ($this->lastTurnUpdate == $time)
 			return;
-		$this->lastTurnUpdate=$time;
-		$this->hasChanged=true;
+		$this->lastTurnUpdate = $time;
+		$this->hasChanged = true;
 //		$sql = $this->db->query('UPDATE player SET last_turn_update = ' . $this->lastTurnUpdate . ' WHERE '. $this->SQL . ' LIMIT 1');
 	}
 
 	protected function getPureRelationsData() {
-		if(!isset($this->pureRelations)) {
+		if (!isset($this->pureRelations)) {
 			//get relations
 			$RACES = Globals::getRaces();
 			$this->pureRelations = array();
@@ -618,40 +618,40 @@ 
 		}
 	}
 
-	function increaseRelationsByTrade($numGoods,$raceID) {
-		$relations = ceil(min($numGoods,300)/30);
+	function increaseRelationsByTrade($numGoods, $raceID) {
+		$relations = ceil(min($numGoods, 300) / 30);
 		//Cap relations to a max of 1 after 500 have been reached
-		if($this->getPureRelation($raceID) + $relations >= 500)
+		if ($this->getPureRelation($raceID) + $relations >= 500)
 			$relations = max(1, min($relations, 500 - $this->getPureRelation($raceID)));
-		$this->increaseRelations($relations,$raceID);
+		$this->increaseRelations($relations, $raceID);
 	}
 
-	function decreaseRelationsByTrade($numGoods,$raceID) {
-		$relations = ceil(min($numGoods,300)/30);
-		$this->decreaseRelations($relations,$raceID);
+	function decreaseRelationsByTrade($numGoods, $raceID) {
+		$relations = ceil(min($numGoods, 300) / 30);
+		$this->decreaseRelations($relations, $raceID);
 	}
 
-	function increaseRelations($relations,$raceID) {
-		if($relations < 0)
+	function increaseRelations($relations, $raceID) {
+		if ($relations < 0)
 			throw new Exception('Trying to increase negative relations.');
-		if($relations == 0)
+		if ($relations == 0)
 			return;
 		$relations += $this->getPureRelation($raceID);
-		$this->setRelations($relations,$raceID);
+		$this->setRelations($relations, $raceID);
 	}
-	function decreaseRelations($relations,$raceID) {
-		if($relations < 0)
+	function decreaseRelations($relations, $raceID) {
+		if ($relations < 0)
 			throw new Exception('Trying to decrease negative relations.');
-		if($relations == 0)
+		if ($relations == 0)
 			return;
 		$relations = $this->getPureRelation($raceID) - $relations;
-		$this->setRelations($relations,$raceID);
+		$this->setRelations($relations, $raceID);
 	}
-	function setRelations($relations,$raceID) {
+	function setRelations($relations, $raceID) {
 		$this->getRelations();
-		if($this->pureRelations[$raceID] == $relations)
+		if ($this->pureRelations[$raceID] == $relations)
 			return;
-		if($relations < MIN_RELATIONS)
+		if ($relations < MIN_RELATIONS)
 			$relations = MIN_RELATIONS;
 		$relationsDiff = $relations - $this->pureRelations[$raceID];
 		$this->pureRelations[$raceID] = $relations;
@@ -664,9 +664,9 @@ 
 	 * This will flag the player as having used their free name change.
 	 */
 	public function setPlayerNameByPlayer($playerName) {
-		$this->playerName=$playerName;
+		$this->playerName = $playerName;
 		$this->setNameChanged(true);
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 	}
 
 	public function isNameChanged() {
@@ -675,15 +675,15 @@ 
 
 	public function setNameChanged($bool) {
 		$this->nameChanged = $bool;
-		$this->hasChanged=true;
+		$this->hasChanged = true;
 	}
 
 	public function hasCustomShipName() {
-		return $this->getCustomShipName()!==false;
+		return $this->getCustomShipName() !== false;
 	}
 
 	public function getCustomShipName() {
-		if(!isset($this->customShipName)) {
+		if (!isset($this->customShipName)) {
 			$this->db->query('SELECT * FROM ship_has_name WHERE ' . $this->SQL . ' LIMIT 1');
 			if ($this->db->nextRecord()) {
 				$this->customShipName = $this->db->getField('ship_name');
@@ -696,7 +696,7 @@ 
 	}
 
 	protected function getGadgetsData() {
-		if(!isset($this->gadgets)) {
+		if (!isset($this->gadgets)) {
 			//Get Player Gadgets
 			$this->db->query('SELECT gadget_id,equipped,cooldown,lasts_until FROM player_has_gadget WHERE ' . $this->SQL);
 			$this->gadgets = array();
@@ -705,67 +705,67 @@ 
 		}
 	}
 
-	public function setGadgets($keyOrUpdateArray,$value) {
+	public function setGadgets($keyOrUpdateArray, $value) {
 		$this->getGadgets();
 
-		if(is_array($keyOrUpdateArray)) {
+		if (is_array($keyOrUpdateArray)) {
 			$set = '';
-			foreach($keyOrUpdateArray as $key => $newInfo) {
+			foreach ($keyOrUpdateArray as $key => $newInfo) {
 				$field = $this->gadgetKeyToField($key);
-				if($field!==false) {
-					foreach($this->gadgets as $gadgetID => $gadget) {
+				if ($field !== false) {
+					foreach ($this->gadgets as $gadgetID => $gadget) {
 						$this->gadgets[$gadgetID][$key] = $newInfo;
 					}
-					$set .= '`' . $field . '` = '.$this->db->escapeString($newInfo).',';
+					$set .= '`' . $field . '` = ' . $this->db->escapeString($newInfo) . ',';
 				}
 			}
-			if($set!=='') {
-				$set=substr($set,0,-1);
-				$this->db->query('UPDATE player_has_gadget SET '.$set.' WHERE '.$this->SQL.' LIMIT '.count($this->gadgets));
+			if ($set !== '') {
+				$set = substr($set, 0, -1);
+				$this->db->query('UPDATE player_has_gadget SET ' . $set . ' WHERE ' . $this->SQL . ' LIMIT ' . count($this->gadgets));
 			}
 		}
 		else {
 			$field = $this->gadgetKeyToField($keyOrUpdateArray);
-			if($field!==false) {
-				foreach($this->gadgets as $gadgetID => $gadget) {
+			if ($field !== false) {
+				foreach ($this->gadgets as $gadgetID => $gadget) {
 					$this->gadgets[$gadgetID][$keyOrUpdateArray] = $value;
 				}
-				$this->db->query('UPDATE player_has_gadget SET `'.$field.'` = ' . $this->db->escapeString($value) . ' WHERE '.$this->SQL.' LIMIT '.count($this->gadgets));
+				$this->db->query('UPDATE player_has_gadget SET `' . $field . '` = ' . $this->db->escapeString($value) . ' WHERE ' . $this->SQL . ' LIMIT ' . count($this->gadgets));
 			}
 		}
 	}
 
-	function setGadget($gadgetID,$keyOrUpdateArray,$value) {
-		if(!is_numeric($gadgetID)) {
+	function setGadget($gadgetID, $keyOrUpdateArray, $value) {
+		if (!is_numeric($gadgetID)) {
 			global $GADGETS;
 			$gadgetID = $GADGETS[$gadgetID]['ID'];
 		}
 		$this->getGadgets();
-		if(isset($this->gadgets[$gadgetID])) {
-			if(is_array($keyOrUpdateArray)) {
+		if (isset($this->gadgets[$gadgetID])) {
+			if (is_array($keyOrUpdateArray)) {
 				$set = '';
-				foreach($keyOrUpdateArray as $key => $newInfo) {
+				foreach ($keyOrUpdateArray as $key => $newInfo) {
 					$field = $this->gadgetKeyToField($key);
-					if($field!==false) {
-						if($this->gadgets[$gadgetID][$key] != $newInfo) {
-							$this->gadgets[$gadgetID][$key]=$newInfo;
-							$set .= '`' . $field . '` = '.$this->db->escapeString($newInfo).',';
+					if ($field !== false) {
+						if ($this->gadgets[$gadgetID][$key] != $newInfo) {
+							$this->gadgets[$gadgetID][$key] = $newInfo;
+							$set .= '`' . $field . '` = ' . $this->db->escapeString($newInfo) . ',';
 						}
 					}
 				}
-				if($set!=='') {
-					$set=substr($set,0,-1);
-					$this->db->query('UPDATE player_has_gadget SET '.$set.' WHERE '.$this->SQL.' AND gadget_id = ' . $this->db->escapeNumber($gadgetID) . ' LIMIT 1');
+				if ($set !== '') {
+					$set = substr($set, 0, -1);
+					$this->db->query('UPDATE player_has_gadget SET ' . $set . ' WHERE ' . $this->SQL . ' AND gadget_id = ' . $this->db->escapeNumber($gadgetID) . ' LIMIT 1');
 					return true;
 				}
 			}
 			else {
 				$field = $this->gadgetKeyToField($keyOrUpdateArray);
-				if($field!==false) {
-					if($this->gadgets[$gadgetID][$keyOrUpdateArray] == $value)
+				if ($field !== false) {
+					if ($this->gadgets[$gadgetID][$keyOrUpdateArray] == $value)
 						return;
-					$this->gadgets[$gadgetID][$keyOrUpdateArray]=$value;
-					$this->db->query('UPDATE player_has_gadget SET `' . $field . '` = ' . $this->db->escapeString($value) . ' WHERE '.$this->SQL.' AND gadget_id = ' . $this->db->escapeNumber($gadgetID) . ' LIMIT 1');
+					$this->gadgets[$gadgetID][$keyOrUpdateArray] = $value;
+					$this->db->query('UPDATE player_has_gadget SET `' . $field . '` = ' . $this->db->escapeString($value) . ' WHERE ' . $this->SQL . ' AND gadget_id = ' . $this->db->escapeNumber($gadgetID) . ' LIMIT 1');
 					return true;
 				}
 			}
@@ -774,7 +774,7 @@ 
 	}
 
 	public function addGadget($gadgetID) {
-		if(isset($this->gadgets[$gadgetID]))
+		if (isset($this->gadgets[$gadgetID]))
 			return false;
 		$this->gadgets[$gadgetID] = array('Equipped' => 0, 'Cooldown' => 0, 'Expires' => 0);
 		$this->db->query('REPLACE INTO player_has_gadget (game_id, account_id, gadget_id, cooldown, equipped,lasts_until) VALUES (' . $this->db->escapeNumber($this->gameID) . ',' . $this->db->escapeNumber($this->accountID) . ',' . $this->db->escapeNumber($gadgetID) . ',0,0,0)');
@@ -782,7 +782,7 @@ 
 	}
 
 	protected function gadgetKeyToField($key) {
-		switch($key) {
+		switch ($key) {
 			case 'Equipped':
 				return 'equipped';
 			break;
@@ -793,12 +793,12 @@ 
 				return 'lasts_until';
 			break;
 			default:
-				throw new Exception('Invalid gadget attribute: '.$key);
+				throw new Exception('Invalid gadget attribute: ' . $key);
 		}
 	}
 
-	function getKnowledge($knowledgeType=false) {
-		if(!isset($this->knowledge)) {
+	function getKnowledge($knowledgeType = false) {
+		if (!isset($this->knowledge)) {
 			//get players faction knowledge
 			$this->db->query('SELECT * FROM player_knows_faction WHERE ' . $this->SQL . ' LIMIT 1');
 			if ($this->db->nextRecord()) {
@@ -818,15 +818,15 @@ 
 				$this->knowledge['Underground'] = 0;
 			}
 		}
-		if($knowledgeType===false)
+		if ($knowledgeType === false)
 			return $this->knowledge;
-		if(isset($this->knowledge[$knowledgeType]))
+		if (isset($this->knowledge[$knowledgeType]))
 			return $this->knowledge[$knowledgeType];
 		return false;
 	}
 
 	public function killPlayer($sectorID) {
-		$sector = SmrSector::getSector($this->getGameID(),$sectorID);
+		$sector = SmrSector::getSector($this->getGameID(), $sectorID);
 		//msg taken care of in trader_att_proc.php
 		// forget plotted course
 		$this->deletePlottedCourse();
@@ -839,11 +839,11 @@ 
 							WHERE game_id = ' . $this->db->escapeNumber($this->getGameID()) . ' AND alliance_id = ' . $this->db->escapeNumber($this->getAllianceID()) . ' LIMIT 1');
 
 		// record death stat
-		$this->increaseHOF(1,array('Dying','Deaths'), HOF_PUBLIC);
+		$this->increaseHOF(1, array('Dying', 'Deaths'), HOF_PUBLIC);
 		//record cost of ship lost
-		$this->increaseHOF($this->getShip()->getCost(),array('Dying','Money','Cost Of Ships Lost'), HOF_PUBLIC);
+		$this->increaseHOF($this->getShip()->getCost(), array('Dying', 'Money', 'Cost Of Ships Lost'), HOF_PUBLIC);
 		// reset turns since last death
-		$this->setHOF(0,array('Movement','Turns Used','Since Last Death'), HOF_ALLIANCE);
+		$this->setHOF(0, array('Movement', 'Turns Used', 'Since Last Death'), HOF_ALLIANCE);
 
 		// 1/4 of ship value -> insurance
 		$newCredits = round($this->getShip()->getCost() / 4);
@@ -862,7 +862,7 @@ 
 
 		// Update turns due to ship change
 		$new_speed = $this->getShip()->getSpeed();
-		$this->setTurns(round($this->turns / $old_speed * $new_speed),100);
+		$this->setTurns(round($this->turns / $old_speed * $new_speed), 100);
 	}
 
 	static public function getHome($gameID, $raceID) {
@@ -893,16 +893,16 @@ 
 
 		if ($this->hasCustomShipName()) {
 			$named_ship = strip_tags($this->getCustomShipName(), '<font><span><img>');
-			$msg .= ' flying <span class="yellow">'.$named_ship.'</span>';
+			$msg .= ' flying <span class="yellow">' . $named_ship . '</span>';
 		}
 		$msg .= ' was destroyed by ' . $killer->getBBLink();
 		if ($killer->hasCustomShipName()) {
 			$named_ship = strip_tags($killer->getCustomShipName(), '<font><span><img>');
-			$msg .= ' flying <span class="yellow">'.$named_ship.'</span>';
+			$msg .= ' flying <span class="yellow">' . $named_ship . '</span>';
 		}
 		$msg .= ' in Sector&nbsp;' . Globals::getSectorBBLink($this->getSectorID());
 		$this->getSector()->increaseBattles(1);
-		$this->db->query('INSERT INTO news (game_id,time,news_message,type,killer_id,killer_alliance,dead_id,dead_alliance) VALUES (' . $this->db->escapeNumber($this->getGameID()) . ',' . $this->db->escapeNumber(TIME) . ',' . $this->db->escapeString($msg,true) . ',\'regular\',' . $this->db->escapeNumber($killer->getAccountID()) . ',' . $this->db->escapeNumber($killer->getAllianceID()) . ',' . $this->db->escapeNumber($this->getAccountID()) . ',' . $this->db->escapeNumber($this->getAllianceID()) . ')');
+		$this->db->query('INSERT INTO news (game_id,time,news_message,type,killer_id,killer_alliance,dead_id,dead_alliance) VALUES (' . $this->db->escapeNumber($this->getGameID()) . ',' . $this->db->escapeNumber(TIME) . ',' . $this->db->escapeString($msg, true) . ',\'regular\',' . $this->db->escapeNumber($killer->getAccountID()) . ',' . $this->db->escapeNumber($killer->getAllianceID()) . ',' . $this->db->escapeNumber($this->getAccountID()) . ',' . $this->db->escapeNumber($this->getAllianceID()) . ')');
 
 		self::sendMessageFromFedClerk($this->getGameID(), $this->getAccountID(), 'You were <span class="red">DESTROYED</span> by ' . $killer->getBBLink() . ' in sector ' . Globals::getSectorBBLink($this->getSectorID()));
 		self::sendMessageFromFedClerk($this->getGameID(), $killer->getAccountID(), 'You <span class="red">DESTROYED</span>&nbsp;' . $this->getBBLink() . ' in sector ' . Globals::getSectorBBLink($this->getSectorID()));
@@ -924,19 +924,19 @@ 
 		$relation = $relations[$killer->getRaceID()];
 
 		$alignChangePerRelation = 0.1;
-		if($relation >= RELATIONS_PEACE || $relation <= RELATIONS_WAR)
+		if ($relation >= RELATIONS_PEACE || $relation <= RELATIONS_WAR)
 			$alignChangePerRelation = 0.04;
 
 		$return['KillerAlign'] = -$relation * $alignChangePerRelation; //Lose relations when killing a peaceful race
-		if($return['KillerAlign'] > 0) {
+		if ($return['KillerAlign'] > 0) {
 			$killer->increaseAlignment($return['KillerAlign']);
 		}
 		else {
 			$killer->decreaseAlignment(-$return['KillerAlign']);
 		}
 		// War setting gives them military pay
-		if($relation <= RELATIONS_WAR) {
-			$killer->increaseMilitaryPayment(-floor($relation * 100 * (pow($return['KillerExp']/2,0.25))));
+		if ($relation <= RELATIONS_WAR) {
+			$killer->increaseMilitaryPayment(-floor($relation * 100 * (pow($return['KillerExp'] / 2, 0.25))));
 		}
 
 		//check for federal bounty being offered for current port raiders;
@@ -961,69 +961,69 @@ 
 			'Type' => 'None',
 			'Amount' => 0
 		);
-		if($alignmentDiff >= 200) {
+		if ($alignmentDiff >= 200) {
 			// If the podded players alignment makes them deputy or member then set bounty
-			if($this->getAlignment() >= 100) {
+			if ($this->getAlignment() >= 100) {
 				$return['BountyGained']['Type'] = 'HQ';
 			}
 			else if ($this->getAlignment() <= 100) {
 				$return['BountyGained']['Type'] = 'UG';
 			}
 
-			if($return['BountyGained']['Type'] != 'None') {
+			if ($return['BountyGained']['Type'] != 'None') {
 				$return['BountyGained']['Amount'] = floor(pow($alignmentDiff, 2.56));
 				$killer->increaseCurrentBountyAmount($return['BountyGained']['Type'], $return['BountyGained']['Amount']);
 			}
 		}
 
-		if($this->isNPC()) {
-			$killer->increaseHOF($return['KillerExp'],array('Killing','NPC','Experience','Gained'), HOF_PUBLIC);
-			$killer->increaseHOF($this->getExperience(),array('Killing','NPC','Experience','Of Traders Killed'), HOF_PUBLIC);
+		if ($this->isNPC()) {
+			$killer->increaseHOF($return['KillerExp'], array('Killing', 'NPC', 'Experience', 'Gained'), HOF_PUBLIC);
+			$killer->increaseHOF($this->getExperience(), array('Killing', 'NPC', 'Experience', 'Of Traders Killed'), HOF_PUBLIC);
 
-			$killer->increaseHOF($return['DeadExp'],array('Killing','Experience','Lost By NPCs Killed'), HOF_PUBLIC);
+			$killer->increaseHOF($return['DeadExp'], array('Killing', 'Experience', 'Lost By NPCs Killed'), HOF_PUBLIC);
 
-			$killer->increaseHOF($return['KillerCredits'],array('Killing','NPC','Money','Lost By Traders Killed'), HOF_PUBLIC);
-			$killer->increaseHOF($return['KillerCredits'],array('Killing','NPC','Money','Gain'), HOF_PUBLIC);
-			$killer->increaseHOF($this->getShip()->getCost(),array('Killing','NPC','Money','Cost Of Ships Killed'), HOF_PUBLIC);
+			$killer->increaseHOF($return['KillerCredits'], array('Killing', 'NPC', 'Money', 'Lost By Traders Killed'), HOF_PUBLIC);
+			$killer->increaseHOF($return['KillerCredits'], array('Killing', 'NPC', 'Money', 'Gain'), HOF_PUBLIC);
+			$killer->increaseHOF($this->getShip()->getCost(), array('Killing', 'NPC', 'Money', 'Cost Of Ships Killed'), HOF_PUBLIC);
 
-			if($return['KillerAlign'] > 0) {
-				$killer->increaseHOF($return['KillerAlign'],array('Killing','NPC','Alignment','Gain'), HOF_PUBLIC);
+			if ($return['KillerAlign'] > 0) {
+				$killer->increaseHOF($return['KillerAlign'], array('Killing', 'NPC', 'Alignment', 'Gain'), HOF_PUBLIC);
 			}
 			else {
-				$killer->increaseHOF(-$return['KillerAlign'],array('Killing','NPC','Alignment','Loss'), HOF_PUBLIC);
+				$killer->increaseHOF(-$return['KillerAlign'], array('Killing', 'NPC', 'Alignment', 'Loss'), HOF_PUBLIC);
 			}
 
-			$killer->increaseHOF($return['BountyGained']['Amount'],array('Killing','NPC','Money','Bounty Gained'), HOF_PUBLIC);
+			$killer->increaseHOF($return['BountyGained']['Amount'], array('Killing', 'NPC', 'Money', 'Bounty Gained'), HOF_PUBLIC);
 
-			$killer->increaseHOF(1,array('Killing','NPC Kills'), HOF_PUBLIC);
+			$killer->increaseHOF(1, array('Killing', 'NPC Kills'), HOF_PUBLIC);
 		}
 		else {
-			$killer->increaseHOF($return['KillerExp'],array('Killing','Experience','Gained'), HOF_PUBLIC);
-			$killer->increaseHOF($this->getExperience(),array('Killing','Experience','Of Traders Killed'), HOF_PUBLIC);
+			$killer->increaseHOF($return['KillerExp'], array('Killing', 'Experience', 'Gained'), HOF_PUBLIC);
+			$killer->increaseHOF($this->getExperience(), array('Killing', 'Experience', 'Of Traders Killed'), HOF_PUBLIC);
 
-			$killer->increaseHOF($return['DeadExp'],array('Killing','Experience','Lost By Traders Killed'), HOF_PUBLIC);
+			$killer->increaseHOF($return['DeadExp'], array('Killing', 'Experience', 'Lost By Traders Killed'), HOF_PUBLIC);
 
-			$killer->increaseHOF($return['KillerCredits'],array('Killing','Money','Lost By Traders Killed'), HOF_PUBLIC);
-			$killer->increaseHOF($return['KillerCredits'],array('Killing','Money','Gain'), HOF_PUBLIC);
-			$killer->increaseHOF($this->getShip()->getCost(),array('Killing','Money','Cost Of Ships Killed'), HOF_PUBLIC);
+			$killer->increaseHOF($return['KillerCredits'], array('Killing', 'Money', 'Lost By Traders Killed'), HOF_PUBLIC);
+			$killer->increaseHOF($return['KillerCredits'], array('Killing', 'Money', 'Gain'), HOF_PUBLIC);
+			$killer->increaseHOF($this->getShip()->getCost(), array('Killing', 'Money', 'Cost Of Ships Killed'), HOF_PUBLIC);
 
-			if($return['KillerAlign'] > 0) {
-				$killer->increaseHOF($return['KillerAlign'],array('Killing','Alignment','Gain'), HOF_PUBLIC);
+			if ($return['KillerAlign'] > 0) {
+				$killer->increaseHOF($return['KillerAlign'], array('Killing', 'Alignment', 'Gain'), HOF_PUBLIC);
 			}
 			else {
-				$killer->increaseHOF(-$return['KillerAlign'],array('Killing','Alignment','Loss'), HOF_PUBLIC);
+				$killer->increaseHOF(-$return['KillerAlign'], array('Killing', 'Alignment', 'Loss'), HOF_PUBLIC);
 			}
 
-			$killer->increaseHOF($return['BountyGained']['Amount'],array('Killing','Money','Bounty Gained'), HOF_PUBLIC);
+			$killer->increaseHOF($return['BountyGained']['Amount'], array('Killing', 'Money', 'Bounty Gained'), HOF_PUBLIC);
 
-			if($this->getShip()->getAttackRatingWithMaxCDs() <= MAX_ATTACK_RATING_NEWBIE && $this->hasNewbieStatus() && !$killer->hasNewbieStatus()) { //Newbie kill
-				$killer->increaseHOF(1,array('Killing','Newbie Kills'), HOF_PUBLIC);
+			if ($this->getShip()->getAttackRatingWithMaxCDs() <= MAX_ATTACK_RATING_NEWBIE && $this->hasNewbieStatus() && !$killer->hasNewbieStatus()) { //Newbie kill
+				$killer->increaseHOF(1, array('Killing', 'Newbie Kills'), HOF_PUBLIC);
 			}
 			else {
 				$killer->increaseKills(1);
-				$killer->increaseHOF(1,array('Killing','Kills'), HOF_PUBLIC);
+				$killer->increaseHOF(1, array('Killing', 'Kills'), HOF_PUBLIC);
 
-				if($killer->hasAlliance()) {
+				if ($killer->hasAlliance()) {
 					$this->db->query('UPDATE alliance SET alliance_kills=alliance_kills+1 WHERE alliance_id=' . $this->db->escapeNumber($killer->getAllianceID()) . ' AND game_id=' . $this->db->escapeNumber($killer->getGameID()) . ' LIMIT 1');
 				}
 
@@ -1032,13 +1032,13 @@ 
 			}
 		}
 
-		$this->increaseHOF($return['BountyGained']['Amount'],array('Dying','Players','Money','Bounty Gained By Killer'), HOF_PUBLIC);
-		$this->increaseHOF($return['KillerExp'],array('Dying','Players','Experience','Gained By Killer'), HOF_PUBLIC);
-		$this->increaseHOF($return['DeadExp'],array('Dying','Experience','Lost'), HOF_PUBLIC);
-		$this->increaseHOF($return['DeadExp'],array('Dying','Players','Experience','Lost'), HOF_PUBLIC);
-		$this->increaseHOF($return['KillerCredits'],array('Dying','Players','Money Lost'), HOF_PUBLIC);
-		$this->increaseHOF($this->getShip()->getCost(),array('Dying','Players','Money','Cost Of Ships Lost'), HOF_PUBLIC);
-		$this->increaseHOF(1,array('Dying','Players','Deaths'), HOF_PUBLIC);
+		$this->increaseHOF($return['BountyGained']['Amount'], array('Dying', 'Players', 'Money', 'Bounty Gained By Killer'), HOF_PUBLIC);
+		$this->increaseHOF($return['KillerExp'], array('Dying', 'Players', 'Experience', 'Gained By Killer'), HOF_PUBLIC);
+		$this->increaseHOF($return['DeadExp'], array('Dying', 'Experience', 'Lost'), HOF_PUBLIC);
+		$this->increaseHOF($return['DeadExp'], array('Dying', 'Players', 'Experience', 'Lost'), HOF_PUBLIC);
+		$this->increaseHOF($return['KillerCredits'], array('Dying', 'Players', 'Money Lost'), HOF_PUBLIC);
+		$this->increaseHOF($this->getShip()->getCost(), array('Dying', 'Players', 'Money', 'Cost Of Ships Lost'), HOF_PUBLIC);
+		$this->increaseHOF(1, array('Dying', 'Players', 'Deaths'), HOF_PUBLIC);
 
 		$this->killPlayer($this->getSectorID());
 		return $return;
@@ -1048,13 +1048,13 @@ 
 		$return = array();
 		$owner = $forces->getOwner();
 		// send a message to the person who died
-		self::sendMessageFromFedClerk($this->getGameID(), $owner->getAccountID(), 'Your forces <span class="red">DESTROYED </span>'.$this->getBBLink().' in sector '.Globals::getSectorBBLink($forces->getSectorID()));
-		self::sendMessageFromFedClerk($this->getGameID(), $this->getAccountID(), 'You were <span class="red">DESTROYED</span> by '.$owner->getBBLink().'\'s forces in sector '.Globals::getSectorBBLink($this->getSectorID()));
+		self::sendMessageFromFedClerk($this->getGameID(), $owner->getAccountID(), 'Your forces <span class="red">DESTROYED </span>' . $this->getBBLink() . ' in sector ' . Globals::getSectorBBLink($forces->getSectorID()));
+		self::sendMessageFromFedClerk($this->getGameID(), $this->getAccountID(), 'You were <span class="red">DESTROYED</span> by ' . $owner->getBBLink() . '\'s forces in sector ' . Globals::getSectorBBLink($this->getSectorID()));
 
 		$news_message = $this->getBBLink();
 		if ($this->hasCustomShipName()) {
 			$named_ship = strip_tags($this->getCustomShipName(), '<font><span><img>');
-			$news_message .= ' flying <span class="yellow">'.$named_ship.'</span>';
+			$news_message .= ' flying <span class="yellow">' . $named_ship . '</span>';
 		}
 		$news_message .= ' was destroyed by ' . $owner->getBBLink() . '\'s forces in sector ' . Globals::getSectorBBLink($forces->getSectorID());
 		// insert the news entry
@@ -1072,11 +1072,11 @@ 
 		$this->incrementAllianceVsDeaths(ALLIANCE_VS_FORCES);
 		$owner->incrementAllianceVsKills(ALLIANCE_VS_FORCES);
 
-		$this->increaseHOF($return['DeadExp'], array('Dying','Experience','Lost'), HOF_PUBLIC);
-		$this->increaseHOF($return['DeadExp'], array('Dying','Forces','Experience Lost'), HOF_PUBLIC);
-		$this->increaseHOF($return['LostCredits'], array('Dying','Forces','Money Lost'), HOF_PUBLIC);
-		$this->increaseHOF($this->getShip()->getCost(), array('Dying','Forces','Cost Of Ships Lost'), HOF_PUBLIC);
-		$this->increaseHOF(1, array('Dying','Forces','Deaths'), HOF_PUBLIC);
+		$this->increaseHOF($return['DeadExp'], array('Dying', 'Experience', 'Lost'), HOF_PUBLIC);
+		$this->increaseHOF($return['DeadExp'], array('Dying', 'Forces', 'Experience Lost'), HOF_PUBLIC);
+		$this->increaseHOF($return['LostCredits'], array('Dying', 'Forces', 'Money Lost'), HOF_PUBLIC);
+		$this->increaseHOF($this->getShip()->getCost(), array('Dying', 'Forces', 'Cost Of Ships Lost'), HOF_PUBLIC);
+		$this->increaseHOF(1, array('Dying', 'Forces', 'Deaths'), HOF_PUBLIC);
 
 		$this->killPlayer($forces->getSectorID());
 		return $return;
@@ -1085,20 +1085,20 @@ 
 	public function &killPlayerByPort(SmrPort $port) {
 		$return = array();
 		// send a message to the person who died
-		self::sendMessageFromFedClerk($this->getGameID(), $this->getAccountID(), 'You were <span class="red">DESTROYED</span> by the defenses of '.$port->getDisplayName());
+		self::sendMessageFromFedClerk($this->getGameID(), $this->getAccountID(), 'You were <span class="red">DESTROYED</span> by the defenses of ' . $port->getDisplayName());
 
 		$news_message = $this->getBBLink();
 		if ($this->hasCustomShipName()) {
 			$named_ship = strip_tags($this->getCustomShipName(), '<font><span><img>');
-			$news_message .= ' flying <span class="yellow">'.$named_ship.'</span>';
+			$news_message .= ' flying <span class="yellow">' . $named_ship . '</span>';
 		}
-		$news_message .= ' was destroyed while invading '.$port->getDisplayName().'.';
+		$news_message .= ' was destroyed while invading ' . $port->getDisplayName() . '.';
 		// insert the news entry
 		$this->db->query('INSERT INTO news (game_id, time, news_message,killer_id,dead_id,dead_alliance)
 						VALUES(' . $this->db->escapeNumber($this->getGameID()) . ', ' . $this->db->escapeNumber(TIME) . ', ' . $this->db->escapeString($news_message) . ',' . $this->db->escapeNumber(ACCOUNT_ID_PORT) . ',' . $this->db->escapeNumber($this->getAccountID()) . ',' . $this->db->escapeNumber($this->getAllianceID()) . ')');
 
 		// Player loses between 20% and 28% experience
-		$expLossPercentage = .29 - .09 * $port->getLevel()/$port->getMaxLevel();
+		$expLossPercentage = .29 - .09 * $port->getLevel() / $port->getMaxLevel();
 		$return['DeadExp'] = max(0, floor($this->getExperience() * $expLossPercentage));
 		$this->decreaseExperience($return['DeadExp']);
 
@@ -1107,11 +1107,11 @@ 
 		// alliance vs. alliance stats
 		$this->incrementAllianceVsDeaths(ALLIANCE_VS_PORTS);
 
-		$this->increaseHOF($return['DeadExp'], array('Dying','Experience','Lost'), HOF_PUBLIC);
-		$this->increaseHOF($return['DeadExp'], array('Dying','Ports','Experience Lost'), HOF_PUBLIC);
-		$this->increaseHOF($return['LostCredits'], array('Dying','Ports','Money Lost'), HOF_PUBLIC);
-		$this->increaseHOF($this->getShip()->getCost(), array('Dying','Ports','Cost Of Ships Lost'), HOF_PUBLIC);
-		$this->increaseHOF(1, array('Dying','Ports','Deaths'), HOF_PUBLIC);
+		$this->increaseHOF($return['DeadExp'], array('Dying', 'Experience', 'Lost'), HOF_PUBLIC);
+		$this->increaseHOF($return['DeadExp'], array('Dying', 'Ports', 'Experience Lost'), HOF_PUBLIC);
+		$this->increaseHOF($return['LostCredits'], array('Dying', 'Ports', 'Money Lost'), HOF_PUBLIC);
+		$this->increaseHOF($this->getShip()->getCost(), array('Dying', 'Ports', 'Cost Of Ships Lost'), HOF_PUBLIC);
+		$this->increaseHOF(1, array('Dying', 'Ports', 'Deaths'), HOF_PUBLIC);
 
 		$this->killPlayer($port->getSectorID());
 		return $return;
@@ -1121,13 +1121,13 @@ 
 		$return = array();
 		// send a message to the person who died
 		$planetOwner = $planet->getOwner();
-		self::sendMessageFromFedClerk($this->getGameID(), $planetOwner->getAccountID(), 'Your planet <span class="red">DESTROYED</span>&nbsp;'.$this->getBBLink().' in sector '.Globals::getSectorBBLink($planet->getSectorID()));
-		self::sendMessageFromFedClerk($this->getGameID(), $this->getAccountID(), 'You were <span class="red">DESTROYED</span> by the planetary defenses of '.$planet->getDisplayName());
+		self::sendMessageFromFedClerk($this->getGameID(), $planetOwner->getAccountID(), 'Your planet <span class="red">DESTROYED</span>&nbsp;' . $this->getBBLink() . ' in sector ' . Globals::getSectorBBLink($planet->getSectorID()));
+		self::sendMessageFromFedClerk($this->getGameID(), $this->getAccountID(), 'You were <span class="red">DESTROYED</span> by the planetary defenses of ' . $planet->getDisplayName());
 
 		$news_message = $this->getBBLink();
 		if ($this->hasCustomShipName()) {
 			$named_ship = strip_tags($this->getCustomShipName(), '<font><span><img>');
-			$news_message .= ' flying <span class="yellow">'.$named_ship.'</span>';
+			$news_message .= ' flying <span class="yellow">' . $named_ship . '</span>';
 		}
 		$news_message .= ' was destroyed by ' . $planet->getDisplayName() . '\'s planetary defenses in sector ' . Globals::getSectorBBLink($planet->getSectorID()) . '.';
 		// insert the news entry
@@ -1135,7 +1135,7 @@ 
 						VALUES(' . $this->db->escapeNumber($this->getGameID()) . ', ' . $this->db->escapeNumber(TIME) . ', ' . $this->db->escapeString($news_message) . ',' . $this->db->escapeNumber($planetOwner->getAccountID()) . ',' . $this->db->escapeNumber($planetOwner->getAllianceID()) . ',' . $this->db->escapeNumber($this->getAccountID()) . ',' . $this->db->escapeNumber($this->getAllianceID()) . ')');
 
 		// Player loses between 20% and 27% experience
-		$expLossPercentage = .27 - .07 * $planet->getLevel()/$planet->getMaxLevel();
+		$expLossPercentage = .27 - .07 * $planet->getLevel() / $planet->getMaxLevel();
 		$return['DeadExp'] = max(0, floor($this->getExperience() * $expLossPercentage));
 		$this->decreaseExperience($return['DeadExp']);
 
@@ -1145,68 +1145,68 @@ 
 		$this->incrementAllianceVsDeaths(ALLIANCE_VS_PLANETS);
 		$planetOwner->incrementAllianceVsKills(ALLIANCE_VS_PLANETS);
 
-		$this->increaseHOF($return['DeadExp'], array('Dying','Experience','Lost'), HOF_PUBLIC);
-		$this->increaseHOF($return['DeadExp'], array('Dying','Planets','Experience Lost'), HOF_PUBLIC);
-		$this->increaseHOF($return['LostCredits'], array('Dying','Planets','Money Lost'), HOF_PUBLIC);
-		$this->increaseHOF($this->getShip()->getCost(), array('Dying','Planets','Cost Of Ships Lost'), HOF_PUBLIC);
-		$this->increaseHOF(1, array('Dying','Planets','Deaths'), HOF_PUBLIC);
+		$this->increaseHOF($return['DeadExp'], array('Dying', 'Experience', 'Lost'), HOF_PUBLIC);
+		$this->increaseHOF($return['DeadExp'], array('Dying', 'Planets', 'Experience Lost'), HOF_PUBLIC);
+		$this->increaseHOF($return['LostCredits'], array('Dying', 'Planets', 'Money Lost'), HOF_PUBLIC);
+		$this->increaseHOF($this->getShip()->getCost(), array('Dying', 'Planets', 'Cost Of Ships Lost'), HOF_PUBLIC);
+		$this->increaseHOF(1, array('Dying', 'Planets', 'Deaths'), HOF_PUBLIC);
 
 		$this->killPlayer($planet->getSectorID());
 		return $return;
 	}
 
 	public function save() {
-		if($this->hasChanged === true) {
-			$this->db->query('UPDATE player SET player_name='.$this->db->escapeString($this->playerName).
-				', player_id='.$this->db->escapeNumber($this->playerID).
-				', sector_id='.$this->db->escapeNumber($this->sectorID).
-				', last_sector_id='.$this->db->escapeNumber($this->lastSectorID).
-				', turns='.$this->db->escapeNumber($this->turns).
-				', last_turn_update='.$this->db->escapeNumber($this->lastTurnUpdate).
-				', newbie_turns='.$this->db->escapeNumber($this->newbieTurns).
-				', last_news_update='.$this->db->escapeNumber($this->lastNewsUpdate).
-				', attack_warning='.$this->db->escapeString($this->attackColour).
-				', dead='.$this->db->escapeBoolean($this->dead).
-				', newbie_status='.$this->db->escapeBoolean($this->newbieStatus).
-				', land_on_planet='.$this->db->escapeBoolean($this->landedOnPlanet).
-				', last_active='.$this->db->escapeNumber($this->lastActive).
-				', last_cpl_action='.$this->db->escapeNumber($this->lastCPLAction).
-				', race_id='.$this->db->escapeNumber($this->raceID).
-				', credits='.$this->db->escapeNumber($this->credits).
-				', experience='.$this->db->escapeNumber($this->experience).
-				', alignment='.$this->db->escapeNumber($this->alignment).
-				', military_payment='.$this->db->escapeString($this->militaryPayment).
+		if ($this->hasChanged === true) {
+			$this->db->query('UPDATE player SET player_name=' . $this->db->escapeString($this->playerName) .
+				', player_id=' . $this->db->escapeNumber($this->playerID) .
+				', sector_id=' . $this->db->escapeNumber($this->sectorID) .
+				', last_sector_id=' . $this->db->escapeNumber($this->lastSectorID) .
+				', turns=' . $this->db->escapeNumber($this->turns) .
+				', last_turn_update=' . $this->db->escapeNumber($this->lastTurnUpdate) .
+				', newbie_turns=' . $this->db->escapeNumber($this->newbieTurns) .
+				', last_news_update=' . $this->db->escapeNumber($this->lastNewsUpdate) .
+				', attack_warning=' . $this->db->escapeString($this->attackColour) .
+				', dead=' . $this->db->escapeBoolean($this->dead) .
+				', newbie_status=' . $this->db->escapeBoolean($this->newbieStatus) .
+				', land_on_planet=' . $this->db->escapeBoolean($this->landedOnPlanet) .
+				', last_active=' . $this->db->escapeNumber($this->lastActive) .
+				', last_cpl_action=' . $this->db->escapeNumber($this->lastCPLAction) .
+				', race_id=' . $this->db->escapeNumber($this->raceID) .
+				', credits=' . $this->db->escapeNumber($this->credits) .
+				', experience=' . $this->db->escapeNumber($this->experience) .
+				', alignment=' . $this->db->escapeNumber($this->alignment) .
+				', military_payment=' . $this->db->escapeString($this->militaryPayment) .
 //				', past_knowledge='.$this->db->escapeString($this->pastKnowledge).
-				', alliance_id='.$this->db->escapeNumber($this->allianceID).
-				', alliance_join='.$this->db->escapeNumber($this->allianceJoinable).
-				', ship_type_id='.$this->db->escapeNumber($this->shipID).
-				', kills='.$this->db->escapeNumber($this->kills).
-				', deaths='.$this->db->escapeNumber($this->deaths).
-				', assists='.$this->db->escapeNumber($this->assists).
-				', last_port='.$this->db->escapeNumber($this->lastPort).
-				', bank='.$this->db->escapeNumber($this->bank).
-				', zoom='.$this->db->escapeString($this->zoom).
-				', display_missions='.$this->db->escapeBoolean($this->displayMissions).
-				', display_weapons='.$this->db->escapeBoolean($this->displayWeapons).
-				', force_drop_messages='.$this->db->escapeBoolean($this->forceDropMessages).
-				', group_scout_messages='.$this->db->escapeString($this->groupScoutMessages).
-				', ignore_globals='.$this->db->escapeBoolean($this->ignoreGlobals).
-				', newbie_warning = ' . $this->db->escapeBoolean($this->newbieWarning).
-				', name_changed = ' . $this->db->escapeBoolean($this->nameChanged).
-				', combat_drones_kamikaze_on_mines = ' . $this->db->escapeBoolean($this->combatDronesKamikazeOnMines).
-				' WHERE '.$this->SQL.' LIMIT 1');
-			$this->hasChanged=false;
-		}
-		foreach($this->hasBountyChanged as $key => &$bountyChanged) {
-			if($bountyChanged===true) {
+				', alliance_id=' . $this->db->escapeNumber($this->allianceID) .
+				', alliance_join=' . $this->db->escapeNumber($this->allianceJoinable) .
+				', ship_type_id=' . $this->db->escapeNumber($this->shipID) .
+				', kills=' . $this->db->escapeNumber($this->kills) .
+				', deaths=' . $this->db->escapeNumber($this->deaths) .
+				', assists=' . $this->db->escapeNumber($this->assists) .
+				', last_port=' . $this->db->escapeNumber($this->lastPort) .
+				', bank=' . $this->db->escapeNumber($this->bank) .
+				', zoom=' . $this->db->escapeString($this->zoom) .
+				', display_missions=' . $this->db->escapeBoolean($this->displayMissions) .
+				', display_weapons=' . $this->db->escapeBoolean($this->displayWeapons) .
+				', force_drop_messages=' . $this->db->escapeBoolean($this->forceDropMessages) .
+				', group_scout_messages=' . $this->db->escapeString($this->groupScoutMessages) .
+				', ignore_globals=' . $this->db->escapeBoolean($this->ignoreGlobals) .
+				', newbie_warning = ' . $this->db->escapeBoolean($this->newbieWarning) .
+				', name_changed = ' . $this->db->escapeBoolean($this->nameChanged) .
+				', combat_drones_kamikaze_on_mines = ' . $this->db->escapeBoolean($this->combatDronesKamikazeOnMines) .
+				' WHERE ' . $this->SQL . ' LIMIT 1');
+			$this->hasChanged = false;
+		}
+		foreach ($this->hasBountyChanged as $key => &$bountyChanged) {
+			if ($bountyChanged === true) {
 				$bountyChanged = false;
 				$bounty = $this->getBounty($key);
-				if($bounty['New'] === true) {
-					if($bounty['Amount'] > 0 || $bounty['SmrCredits'] > 0)
-						$this->db->query('INSERT INTO bounty (account_id,game_id,type,amount,smr_credits,claimer_id,time) VALUES (' . $this->db->escapeNumber($this->getAccountID()) . ',' . $this->db->escapeNumber($this->getGameID()) . ',' . $this->db->escapeString($bounty['Type']) . ',' . $this->db->escapeNumber($bounty['Amount']) . ',' . $this->db->escapeNumber($bounty['SmrCredits']) . ',' . $this->db->escapeNumber($bounty['Claimer']) . ',' . $this->db->escapeNumber($bounty['Time']) .')');
+				if ($bounty['New'] === true) {
+					if ($bounty['Amount'] > 0 || $bounty['SmrCredits'] > 0)
+						$this->db->query('INSERT INTO bounty (account_id,game_id,type,amount,smr_credits,claimer_id,time) VALUES (' . $this->db->escapeNumber($this->getAccountID()) . ',' . $this->db->escapeNumber($this->getGameID()) . ',' . $this->db->escapeString($bounty['Type']) . ',' . $this->db->escapeNumber($bounty['Amount']) . ',' . $this->db->escapeNumber($bounty['SmrCredits']) . ',' . $this->db->escapeNumber($bounty['Claimer']) . ',' . $this->db->escapeNumber($bounty['Time']) . ')');
 				}
 				else {
-					if($bounty['Amount'] > 0 || $bounty['SmrCredits'] > 0)
+					if ($bounty['Amount'] > 0 || $bounty['SmrCredits'] > 0)
 						$this->db->query('UPDATE bounty
 							SET amount=' . $this->db->escapeNumber($bounty['Amount']) . ',
 							smr_credits=' . $this->db->escapeString($bounty['SmrCredits']) . ',
@@ -1223,36 +1223,36 @@ 
 	}
 
 	public function saveHOF() {
-		if($this->hasHOFChanged!==false)
+		if ($this->hasHOFChanged !== false)
 			$this->doHOFSave($this->hasHOFChanged);
-		if(!empty(self::$hasHOFVisChanged)) {
-			foreach(self::$hasHOFVisChanged as $hofType => $changeType) {
-				if($changeType==self::HOF_NEW)
-					$this->db->query('INSERT INTO hof_visibility (type, visibility) VALUES ('.$this->db->escapeString($hofType).','.$this->db->escapeString(self::$HOFVis[$hofType]).')');
+		if (!empty(self::$hasHOFVisChanged)) {
+			foreach (self::$hasHOFVisChanged as $hofType => $changeType) {
+				if ($changeType == self::HOF_NEW)
+					$this->db->query('INSERT INTO hof_visibility (type, visibility) VALUES (' . $this->db->escapeString($hofType) . ',' . $this->db->escapeString(self::$HOFVis[$hofType]) . ')');
 				else
-					$this->db->query('UPDATE hof_visibility SET visibility = '.$this->db->escapeString(self::$HOFVis[$hofType]).' WHERE type = '.$this->db->escapeString($hofType).' LIMIT 1');
+					$this->db->query('UPDATE hof_visibility SET visibility = ' . $this->db->escapeString(self::$HOFVis[$hofType]) . ' WHERE type = ' . $this->db->escapeString($hofType) . ' LIMIT 1');
 				unset(self::$hasHOFVisChanged[$hofType]);
 			}
 		}
 	}
-	protected function doHOFSave(array &$hasChangedList,array $typeList = array()) {
-		foreach($hasChangedList as $type => &$hofChanged) {
+	protected function doHOFSave(array &$hasChangedList, array $typeList = array()) {
+		foreach ($hasChangedList as $type => &$hofChanged) {
 			$tempTypeList = $typeList;
 			$tempTypeList[] = $type;
-			if(is_array($hofChanged)) {
-				$this->doHOFSave($hofChanged,$tempTypeList);
+			if (is_array($hofChanged)) {
+				$this->doHOFSave($hofChanged, $tempTypeList);
 			}
 			else {
 				$amount = $this->getHOF($tempTypeList);
-				if($hofChanged==self::HOF_NEW) {
-					if($amount > 0)
-						$this->db->query('INSERT INTO player_hof (account_id,game_id,type,amount) VALUES (' . $this->db->escapeNumber($this->getAccountID()) . ',' . $this->db->escapeNumber($this->getGameID()) . ',' . $this->db->escapeArray($tempTypeList,false,true,':',false) . ',' . $this->db->escapeNumber($amount) . ')');
+				if ($hofChanged == self::HOF_NEW) {
+					if ($amount > 0)
+						$this->db->query('INSERT INTO player_hof (account_id,game_id,type,amount) VALUES (' . $this->db->escapeNumber($this->getAccountID()) . ',' . $this->db->escapeNumber($this->getGameID()) . ',' . $this->db->escapeArray($tempTypeList, false, true, ':', false) . ',' . $this->db->escapeNumber($amount) . ')');
 				}
-				else if($hofChanged==self::HOF_CHANGED) {
+				else if ($hofChanged == self::HOF_CHANGED) {
 	//				if($amount > 0)
 						$this->db->query('UPDATE player_hof
 							SET amount=' . $this->db->escapeNumber($amount) . '
-							WHERE ' . $this->SQL . ' AND type = ' . $this->db->escapeArray($tempTypeList,false,true,':',false).' LIMIT 1');
+							WHERE ' . $this->SQL . ' AND type = ' . $this->db->escapeArray($tempTypeList, false, true, ':', false) . ' LIMIT 1');
 	//				else
 	//					$this->db->query('DELETE FROM player_hof WHERE account_id=' . $this->getAccountID() . ' AND game_id = ' . $this->getGameID() . ' AND type = ' . $this->db->escapeArray($tempTypeList,false,true,':',false) . ' LIMIT 1');
 	//				}
@@ -1263,18 +1263,18 @@ 
 	}
 
 	protected function getHOFData() {
-		if(!isset($this->HOF)) {
+		if (!isset($this->HOF)) {
 			//Get Player HOF
 			$this->db->query('SELECT type,amount FROM player_hof WHERE ' . $this->SQL);
 			$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');
 			}
@@ -1283,22 +1283,22 @@ 
 	}
 
 	public static function getHOFVis() {
-		if(!isset(self::$HOFVis)) {
+		if (!isset(self::$HOFVis)) {
 			//Get Player HOF Vis
 			$db = new SmrMySqlDatabase();
 			$db->query('SELECT type,visibility FROM hof_visibility');
 			self::$HOFVis = array();
-			while($db->nextRecord()) {
+			while ($db->nextRecord()) {
 				self::$HOFVis[$db->getField('type')] = $db->getField('visibility');
 			}
 		}
 	}
 
 	protected function getBountiesData() {
-		if(!isset($this->bounties)) {
+		if (!isset($this->bounties)) {
 			$this->bounties = array();
 			$this->db->query('SELECT * FROM bounty WHERE ' . $this->SQL);
-			while($this->db->nextRecord()) {
+			while ($this->db->nextRecord()) {
 				$this->bounties[$this->db->getField('bounty_id')] = array(
 							'Amount' => $this->db->getInt('amount'),
 							'SmrCredits' => $this->db->getInt('smr_credits'),
@@ -1339,15 +1339,15 @@ 
 	}
 
 	public function isOnCouncil() {
-		return Council::isOnCouncil($this->getGameID(),$this->getRaceID(),$this->getAccountID());
+		return Council::isOnCouncil($this->getGameID(), $this->getRaceID(), $this->getAccountID());
 	}
 
 	public function setNewbieWarning($bool) {
-		if($this->newbieWarning==$bool) {
+		if ($this->newbieWarning == $bool) {
 			return;
 		}
-		$this->newbieWarning=$bool;
-		$this->hasChanged=true;
+		$this->newbieWarning = $bool;
+		$this->hasChanged = true;
 	}
 
 	public function getNewbieWarning() {
@@ -1355,12 +1355,12 @@ 
 	}
 
 	public function getTickers() {
-		if(!isset($this->tickers)) {
+		if (!isset($this->tickers)) {
 			$this->tickers = array();
 			//get ticker info
-			$this->db->query('SELECT type,time,expires,recent FROM player_has_ticker WHERE ' . $this->SQL .' AND expires > ' . $this->db->escapeNumber(TIME));
-			while($this->db->nextRecord())
-				$this->tickers[$this->db->getField('type')] = array( 'Type' => $this->db->getField('type'),
+			$this->db->query('SELECT type,time,expires,recent FROM player_has_ticker WHERE ' . $this->SQL . ' AND expires > ' . $this->db->escapeNumber(TIME));
+			while ($this->db->nextRecord())
+				$this->tickers[$this->db->getField('type')] = array('Type' => $this->db->getField('type'),
 																				'Time' => $this->db->getInt('time'),
 																				'Expires' => $this->db->getInt('expires'),
 																				'Recent' => $this->db->getField('recent'));
@@ -1374,7 +1374,7 @@ 
 
 	public function getTicker($tickerType) {
 		$tickers = $this->getTickers();
-		if(isset($tickers[$tickerType]))
+		if (isset($tickers[$tickerType]))
 			return $tickers[$tickerType];
 		return false;
 	}
@@ -1385,8 +1385,8 @@ 
 
 	public function getTurnsLevel() {
 		if (!$this->hasTurns()) return 'NONE';
-		if ($this->getTurns() <= 25 ) return 'LOW';
-		if ($this->getTurns() <= 75 ) return 'MEDIUM';
+		if ($this->getTurns() <= 25) return 'LOW';
+		if ($this->getTurns() <= 75) return 'MEDIUM';
 		return 'HIGH';
 	}
 
@@ -1394,7 +1394,7 @@ 
 	 * Returns the CSS class color to use when displaying the player's turns
 	 */
 	public function getTurnsColor() {
-		switch($this->getTurnsLevel()) {
+		switch ($this->getTurnsLevel()) {
 			case 'NONE':
 			case 'LOW':
 				return 'red';
@@ -1411,7 +1411,7 @@ 
 		$this->save();
 	}
 
-	protected static function doMessageSending($senderID,$receiverID, $gameID, $messageTypeID, $message, $expires, $senderDelete = false, $unread = true) {
+	protected static function doMessageSending($senderID, $receiverID, $gameID, $messageTypeID, $message, $expires, $senderDelete = false, $unread = true) {
 		$message = trim($message);
 		$db = new SmrMySqlDatabase();
 		// send him the message
@@ -1428,7 +1428,7 @@ 
 			$db->escapeBoolean($senderDelete) . ')'
 		);
 
-		if($unread === true) {
+		if ($unread === true) {
 			// give him the message icon
 			$db->query('REPLACE INTO player_has_unread_messages (game_id, account_id, message_type_id) VALUES
 						(' . $db->escapeNumber($gameID) . ', ' . $db->escapeNumber($receiverID) . ', ' . $db->escapeNumber($messageTypeID) . ')');
@@ -1437,7 +1437,7 @@ 
 		switch ($messageTypeID) {
 			case MSG_PLAYER:
 				$receiverAccount = SmrAccount::getAccount($receiverID);
-				if($receiverAccount->isValidated() && $receiverAccount->isReceivingMessageNotifications($messageTypeID) && !$receiverAccount->isLoggedIn()) {
+				if ($receiverAccount->isValidated() && $receiverAccount->isReceivingMessageNotifications($messageTypeID) && !$receiverAccount->isLoggedIn()) {
 					require_once(get_file_loc('message.functions.inc'));
 					$sender = getMessagePlayer($senderID, $gameID, $messageTypeID);
 					if ($sender instanceof SmrPlayer) {
@@ -1446,12 +1446,12 @@ 
 					$mail = setupMailer();
 					$mail->Subject = 'Message Notification';
 					$mail->setFrom('notifications@smrealms.de', 'SMR Notifications');
-					$bbifiedMessage = 'From: ' . $sender . ' Date: ' . date($receiverAccount->getShortDateFormat().' '.$receiverAccount->getShortTimeFormat(),TIME) . "<br/>\r\n<br/>\r\n" . bbifyMessage($message,true);
+					$bbifiedMessage = 'From: ' . $sender . ' Date: ' . date($receiverAccount->getShortDateFormat() . ' ' . $receiverAccount->getShortTimeFormat(), TIME) . "<br/>\r\n<br/>\r\n" . bbifyMessage($message, true);
 					$mail->msgHTML($bbifiedMessage);
 					$mail->AltBody = strip_tags($bbifiedMessage);
 					$mail->addAddress($receiverAccount->getEmail(), $receiverAccount->getHofName());
 					$mail->send();
-					$receiverAccount->decreaseMessageNotifications($messageTypeID,1);
+					$receiverAccount->decreaseMessageNotifications($messageTypeID, 1);
 				}
 			break;
 		}
@@ -1463,11 +1463,11 @@ 
 	}
 
 	public function sendGlobalMessage($message, $canBeIgnored = true) {
-		if($canBeIgnored) {
-			if($this->getAccount()->isMailBanned())
+		if ($canBeIgnored) {
+			if ($this->getAccount()->isMailBanned())
 				create_error('You are currently banned from sending messages');
 		}
-		$this->sendMessageToBox(BOX_GLOBALS,$message);
+		$this->sendMessageToBox(BOX_GLOBALS, $message);
 
 		// send to all online player
 		$db = new SmrMySqlDatabase();
@@ -1487,12 +1487,12 @@ 
 
 	public function sendMessage($receiverID, $messageTypeID, $message, $canBeIgnored = true, $unread = true, $expires = false, $senderDelete = false) {
 		//get expire time
-		if($canBeIgnored) {
-			if($this->getAccount()->isMailBanned())
+		if ($canBeIgnored) {
+			if ($this->getAccount()->isMailBanned())
 				create_error('You are currently banned from sending messages');
 			// Don't send messages to players ignoring us
 			$this->db->query('SELECT account_id FROM message_blacklist WHERE account_id=' . $this->db->escapeNumber($receiverID) . ' AND blacklisted_id=' . $this->db->escapeNumber($this->getAccountID()) . ' LIMIT 1');
-			if($this->db->nextRecord())
+			if ($this->db->nextRecord())
 				return;
 		}
 
@@ -1537,10 +1537,10 @@ 
 		}
 
 		// send him the message
-		self::doMessageSending($this->getAccountID(),$receiverID, $this->getGameID(), $messageTypeID, $message, $expires, $senderDelete, $unread);
+		self::doMessageSending($this->getAccountID(), $receiverID, $this->getGameID(), $messageTypeID, $message, $expires, $senderDelete, $unread);
 	}
 
-	public function sendMessageFromOpAnnounce($receiverID, $message, $expires=false) {
+	public function sendMessageFromOpAnnounce($receiverID, $message, $expires = false) {
 		// get expire time if not set
 		if ($expires === false) {
 			$expires = TIME + 86400 * 14;
@@ -1557,14 +1557,14 @@ 
 		//get expire time
 		$expires = TIME + 86400 * 31;
 		// send him the message
-		self::doMessageSending(ACCOUNT_ID_PLANET,$receiverID, $gameID, MSG_PLANET, $message, $expires);
+		self::doMessageSending(ACCOUNT_ID_PLANET, $receiverID, $gameID, MSG_PLANET, $message, $expires);
 	}
 
 	public static function sendMessageFromPort($gameID, $receiverID, $message) {
 		//get expire time
 		$expires = TIME + 86400 * 31;
 		// send him the message
-		self::doMessageSending(ACCOUNT_ID_PORT,$receiverID, $gameID, MSG_PLAYER, $message, $expires);
+		self::doMessageSending(ACCOUNT_ID_PORT, $receiverID, $gameID, MSG_PLAYER, $message, $expires);
 	}
 
 	public static function sendMessageFromFedClerk($gameID, $receiverID, $message) {
@@ -1574,15 +1574,15 @@ 
 
 	public static function sendMessageFromAdmin($gameID, $receiverID, $message, $expires = false) {
 		//get expire time
-		if($expires===false)
+		if ($expires === false)
 			$expires = TIME + 86400 * 365;
 		// send him the message
-		self::doMessageSending(ACCOUNT_ID_ADMIN,$receiverID, $gameID, MSG_ADMIN, $message, $expires);
+		self::doMessageSending(ACCOUNT_ID_ADMIN, $receiverID, $gameID, MSG_ADMIN, $message, $expires);
 	}
 
 	public static function sendMessageFromAllianceAmbassador($gameID, $receiverID, $message, $expires = false) {
 		//get expire time
-		if($expires===false)
+		if ($expires === false)
 			$expires = TIME + 86400 * 31;
 		// send him the message
 		self::doMessageSending(ACCOUNT_ID_ALLIANCE_AMBASSADOR, $receiverID, $gameID, MSG_ALLIANCE, $message, $expires);
@@ -1590,7 +1590,7 @@ 
 
 	public static function sendMessageFromCasino($gameID, $receiverID, $message, $expires = false) {
 		//get expire time
-		if($expires===false)
+		if ($expires === false)
 			$expires = TIME + 86400 * 7;
 		// send him the message
 		self::doMessageSending(ACCOUNT_ID_CASINO, $receiverID, $gameID, MSG_CASINO, $message, $expires);
@@ -1598,19 +1598,19 @@ 
 
 	public static function sendMessageFromRace($raceID, $gameID, $receiverID, $message, $expires = false) {
 		//get expire time
-		if($expires===false)
+		if ($expires === false)
 			$expires = TIME + 86400 * 5;
 		// send him the message
-		self::doMessageSending(ACCOUNT_ID_GROUP_RACES+$raceID,$receiverID, $gameID, MSG_POLITICAL, $message, $expires);
+		self::doMessageSending(ACCOUNT_ID_GROUP_RACES + $raceID, $receiverID, $gameID, MSG_POLITICAL, $message, $expires);
 	}
 
 	public function setMessagesRead($messageTypeID) {
 		$this->db->query('DELETE FROM player_has_unread_messages
-							WHERE '.$this->SQL.' AND message_type_id = ' . $this->db->escapeNumber($messageTypeID));
+							WHERE '.$this->SQL . ' AND message_type_id = ' . $this->db->escapeNumber($messageTypeID));
 	}
 
 	public function getPlottedCourse() {
-		if(!isset($this->plottedCourse)) {
+		if (!isset($this->plottedCourse)) {
 			// check if we have a course plotted
 			$this->db->query('SELECT course FROM player_plotted_course WHERE ' . $this->SQL . ' LIMIT 1');
 
@@ -1642,23 +1642,23 @@ 
 	public function setPlottedCourse(Distance $plottedCourse) {
 		$hadPlottedCourse = $this->hasPlottedCourse();
 		$this->plottedCourse = $plottedCourse;
-		if ($this->plottedCourse->getTotalSectors()>0)
+		if ($this->plottedCourse->getTotalSectors() > 0)
 			$this->db->query('REPLACE INTO player_plotted_course
 				(account_id, game_id, course)
 				VALUES(' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber($this->getGameID()) . ', ' . $this->db->escapeBinary(serialize($this->plottedCourse)) . ')');
-		else if($hadPlottedCourse) {
+		else if ($hadPlottedCourse) {
 			$this->deletePlottedCourse();
 		}
 	}
 
 	public function hasPlottedCourse() {
-		return $this->getPlottedCourse()!==false;
+		return $this->getPlottedCourse() !== false;
 	}
 
 	public function isPartOfCourse($sectorOrSectorID) {
-		if(!$this->hasPlottedCourse())
+		if (!$this->hasPlottedCourse())
 			return false;
-		if($sectorOrSectorID instanceof SmrSector )
+		if ($sectorOrSectorID instanceof SmrSector)
 			$sectorID = $sectorOrSectorID->getSectorID();
 		else
 			$sectorID = $sectorOrSectorID;
@@ -1667,14 +1667,14 @@ 
 
 	public function deletePlottedCourse() {
 		$this->plottedCourse = false;
-		$this->db->query('DELETE FROM player_plotted_course WHERE '.$this->SQL.' LIMIT 1');
+		$this->db->query('DELETE FROM player_plotted_course WHERE ' . $this->SQL . ' LIMIT 1');
 	}
 
 	// Computes the turn cost and max misjump between current and target sector
 	public function getJumpInfo(SmrSector $targetSector) {
 		$path = Plotter::findDistanceToX($targetSector, $this->getSector(), true);
-		if ($path===false) {
-			create_error('Unable to plot from '.$this->getSectorID().' to '.$targetSector->getSectorID().'.');
+		if ($path === false) {
+			create_error('Unable to plot from ' . $this->getSectorID() . ' to ' . $targetSector->getSectorID() . '.');
 		}
 		$distance = $path->getRelativeDistance();
 
@@ -1688,10 +1688,10 @@ 
 	}
 
 	public function &getStoredDestinations() {
-		if(!isset($this->storedDestinations)) {
+		if (!isset($this->storedDestinations)) {
 			$storedDestinations = array();
 			$this->db->query('SELECT * FROM player_stored_sector WHERE ' . $this->SQL);
-			while($this->db->nextRecord()) {
+			while ($this->db->nextRecord()) {
 				$storedDestinations[] = array(
 					'Label' => $this->db->getField('label'),
 					'SectorID' => $this->db->getInt('sector_id'),
@@ -1699,7 +1699,7 @@ 
 					'OffsetLeft' => $this->db->getInt('offset_left')
 				);
 			}
-			$this->storedDestinations =& $storedDestinations;
+			$this->storedDestinations = & $storedDestinations;
 		}
 		return $this->storedDestinations;
 	}
@@ -1707,19 +1707,19 @@ 
 
 	function moveDestinationButton($sectorID, $offsetTop, $offsetLeft) {
 
-		if( !is_numeric($offsetLeft) || !is_numeric($offsetTop)) {
+		if (!is_numeric($offsetLeft) || !is_numeric($offsetTop)) {
 			create_error('The position of the saved sector must be numeric!.');
 		}
 		$offsetTop = round($offsetTop);
 		$offsetLeft = round($offsetLeft);
 
-		if($offsetLeft < 0 || $offsetLeft > 500 || $offsetTop < 0 || $offsetTop > 300) {
+		if ($offsetLeft < 0 || $offsetLeft > 500 || $offsetTop < 0 || $offsetTop > 300) {
 			create_error('The saved sector must be in the box!');
 		}
 
-		$storedDestinations =& $this->getStoredDestinations();
-		foreach($storedDestinations as &$sd) {
-			if($sd['SectorID'] == $sectorID) {
+		$storedDestinations = & $this->getStoredDestinations();
+		foreach ($storedDestinations as &$sd) {
+			if ($sd['SectorID'] == $sectorID) {
 				$sd['OffsetTop'] = $offsetTop;
 				$sd['OffsetLeft'] = $offsetLeft;
 				$this->db->query('
@@ -1741,8 +1741,8 @@ 
 		}
 
 		// sector already stored ?
-		foreach($this->getStoredDestinations() as $sd) {
-			if($sd['SectorID'] == $sectorID) {
+		foreach ($this->getStoredDestinations() as $sd) {
+			if ($sd['SectorID'] == $sectorID) {
 				create_error('Sector already stored!');
 			}
 		}
@@ -1765,8 +1765,8 @@ 
 			create_error('You want to remove a non-existent sector?');
 		}
 
-		foreach($this->getStoredDestinations() as $key => $sd) {
-			if($sd['SectorID'] == $sectorID) {
+		foreach ($this->getStoredDestinations() as $key => $sd) {
+			if ($sd['SectorID'] == $sectorID) {
 				$this->db->query('
 					DELETE FROM player_stored_sector
 					WHERE ' . $this->SQL . '
@@ -1795,9 +1795,9 @@ 
 		$this->db->query('SELECT count(*) FROM player
 			WHERE game_id = ' . $this->db->escapeNumber($this->getGameID()) . '
 			AND (
-				'.$dbField.' > '.$this->db->escapeNumber($playerAmount).'
+				'.$dbField . ' > ' . $this->db->escapeNumber($playerAmount) . '
 				OR (
-					'.$dbField.' = '.$this->db->escapeNumber($playerAmount).'
+					'.$dbField . ' = ' . $this->db->escapeNumber($playerAmount) . '
 					AND player_name <= ' . $this->db->escapeString($this->getPlayerName()) . '
 				)
 			)');

lib/Default/DummyShip.class.inc

Spacing +9 added lines, -9 removed lines

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

lib/Default/AbstractSmrShip.class.inc

Spacing +241 added lines, -241 removed lines

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