smrealms / smr

lib/Default/SmrSector.class.php

Braces +143 added lines, -99 removed lines

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

lib/Default/SmrPlayer.class.php

Braces +182 added lines, -138 removed lines

@@ -58,8 +58,9 @@ 
 	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]);
+			if (!in_array($player->getAllianceID(), $allianceIDs)) {
+							unset($players[$accountID]);
+			}
 		}
 		return $players;
 	}
@@ -198,8 +199,7 @@ 
 			$this->newbieWarning = $db->getBoolean('newbie_warning');
 			$this->nameChanged = $db->getBoolean('name_changed');
 			$this->combatDronesKamikazeOnMines = $db->getBoolean('combat_drones_kamikaze_on_mines');
-		}
-		else {
+		} else {
 			throw new PlayerNotFoundException('Invalid accountID: ' . $accountID . ' OR gameID:' . $gameID);
 		}
 	}
@@ -285,22 +285,25 @@ 
 	protected function setZoom($zoom) {
 		// Set the zoom level between [1, 9]
 		$zoom = max(1, min(9, $zoom));
-		if ($this->zoom == $zoom)
-			return;
+		if ($this->zoom == $zoom) {
+					return;
+		}
 		$this->zoom = $zoom;
 		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET zoom = ' . $zoom . ' WHERE ' . $this->SQL . ' LIMIT 1');
 	}
 
 	public function increaseZoom($zoom) {
-		if ($zoom < 0)
-			throw new Exception('Trying to increase negative zoom.');
+		if ($zoom < 0) {
+					throw new Exception('Trying to increase negative zoom.');
+		}
 		$this->setZoom($this->getZoom() + $zoom);
 	}
 
 	public function decreaseZoom($zoom) {
-		if ($zoom < 0)
-			throw new Exception('Trying to decrease negative zoom.');
+		if ($zoom < 0) {
+					throw new Exception('Trying to decrease negative zoom.');
+		}
 		$this->setZoom($this->getZoom() - $zoom);
 	}
 
@@ -315,8 +318,9 @@ 
 	}
 
 	public function setLastSectorID($lastSectorID) {
-		if ($this->lastSectorID == $lastSectorID)
-			return;
+		if ($this->lastSectorID == $lastSectorID) {
+					return;
+		}
 		$this->lastSectorID = $lastSectorID;
 		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET last_sector_id = '.$this->lastSectorID.' WHERE '.$this->SQL.' LIMIT 1');
@@ -329,11 +333,9 @@ 
 			$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 {
+		} else {
 			$this->actionTaken('LeaveAlliance', array('Alliance' => $alliance));
 			if ($alliance->getLeaderID() != 0 && $alliance->getLeaderID() != ACCOUNT_ID_NHL) {
 				$this->sendMessage($alliance->getLeaderID(), MSG_PLAYER, 'I left your alliance!', false);
@@ -361,7 +363,9 @@ 
 			try {
 				$this->sendMessage($alliance->getLeaderID(), MSG_PLAYER, 'I joined your alliance!', false);
 			} catch (AccountNotFoundException $e) {
-				if ($alliance->getLeaderID() != ACCOUNT_ID_NHL) throw $e;
+				if ($alliance->getLeaderID() != ACCOUNT_ID_NHL) {
+					throw $e;
+				}
 			}
 
 			$roleID = ALLIANCE_ROLE_NEW_MEMBER;
@@ -381,8 +385,9 @@ 
 	}
 
 	private function setAllianceJoinable($time) {
-		if ($this->allianceJoinable == $time)
-			return;
+		if ($this->allianceJoinable == $time) {
+					return;
+		}
 		$this->allianceJoinable = $time;
 		$this->hasChanged = true;
 	}
@@ -392,8 +397,9 @@ 
 	}
 
 	public function setAttackColour($colour) {
-		if ($this->attackColour == $colour)
-			return;
+		if ($this->attackColour == $colour) {
+					return;
+		}
 		$this->attackColour = $colour;
 		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET attack_warning = ' . $this->db->escapeString($this->attackColour) . ' WHERE ' . $this->SQL . ' LIMIT 1');
@@ -404,28 +410,35 @@ 
 	}
 
 	public function increaseBank($credits) {
-		if ($credits < 0)
-			throw new Exception('Trying to increase negative credits.');
-		if ($credits == 0)
-			return;
+		if ($credits < 0) {
+					throw new Exception('Trying to increase negative credits.');
+		}
+		if ($credits == 0) {
+					return;
+		}
 		$credits += $this->bank;
 		$this->setBank($credits);
 	}
 	public function decreaseBank($credits) {
-		if ($credits < 0)
-			throw new Exception('Trying to decrease negative credits.');
-		if ($credits == 0)
-			return;
+		if ($credits < 0) {
+					throw new Exception('Trying to decrease negative credits.');
+		}
+		if ($credits == 0) {
+					return;
+		}
 		$credits = $this->bank - $credits;
 		$this->setBank($credits);
 	}
 	public function setBank($credits) {
-		if ($this->bank == $credits)
-			return;
-		if ($credits < 0)
-			throw new Exception('Trying to set negative credits.');
-		if ($credits > MAX_MONEY)
-			throw new Exception('Trying to set more than max credits.');
+		if ($this->bank == $credits) {
+					return;
+		}
+		if ($credits < 0) {
+					throw new Exception('Trying to set negative credits.');
+		}
+		if ($credits > MAX_MONEY) {
+					throw new Exception('Trying to set more than max credits.');
+		}
 		$this->bank = $credits;
 		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET bank = '.$this->bank.' WHERE '.$this->SQL.' LIMIT 1');
@@ -436,8 +449,9 @@ 
 	}
 
 	private function setLastNewsUpdate($time) {
-		if ($this->lastNewsUpdate == $time)
-			return;
+		if ($this->lastNewsUpdate == $time) {
+					return;
+		}
 		$this->lastNewsUpdate = $time;
 		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET last_news_update = ' . $time . ' WHERE ' . $this->SQL . ' LIMIT 1');
@@ -484,7 +498,9 @@ 
 
 	public function updateTurns() {
 		// is account validated?
-		if (!$this->getAccount()->isValidated()) return;
+		if (!$this->getAccount()->isValidated()) {
+			return;
+		}
 
 		// how many turns would he get right now?
 		$extraTurns = $this->getTurnsGained(TIME);
@@ -503,8 +519,9 @@ 
 	}
 
 	public function setIgnoreGlobals($bool) {
-		if ($this->ignoreGlobals == $bool)
-			return;
+		if ($this->ignoreGlobals == $bool) {
+					return;
+		}
 		$this->ignoreGlobals = $bool;
 		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET ignore_globals = '.$this->db->escapeBoolean($bool).' WHERE '.$this->SQL.' LIMIT 1');
@@ -516,8 +533,9 @@ 
 	}
 
 	public function setLastPort($lastPort) {
-		if ($this->lastPort == $lastPort)
-			return;
+		if ($this->lastPort == $lastPort) {
+					return;
+		}
 		$this->lastPort = $lastPort;
 		$this->hasChanged = true;
 //		$this->db->query('UPDATE player SET last_port = ' . $this->lastPort . ' WHERE ' . $this->SQL . ' LIMIT 1');
@@ -528,8 +546,9 @@ 
 	}
 
 	public function setDisplayMissions($bool) {
-		if ($this->displayMissions == $bool)
-			return;
+		if ($this->displayMissions == $bool) {
+					return;
+		}
 		$this->displayMissions = $bool;
 		$this->hasChanged = true;
 	}
@@ -544,8 +563,9 @@ 
 	 * which does not acquire a sector lock.
 	 */
 	public function setDisplayWeapons($bool) {
-		if ($this->displayWeapons == $bool)
-			return;
+		if ($this->displayWeapons == $bool) {
+					return;
+		}
 		$this->displayWeapons = $bool;
 		$this->db->query('UPDATE player SET display_weapons=' . $this->db->escapeBoolean($this->displayWeapons) . ' WHERE ' . $this->SQL);
 	}
@@ -555,8 +575,9 @@ 
 	}
 
 	public function setForceDropMessages($bool) {
-		if ($this->forceDropMessages == $bool)
-			return;
+		if ($this->forceDropMessages == $bool) {
+					return;
+		}
 		$this->forceDropMessages = $bool;
 		$this->hasChanged = true;
 	}
@@ -588,8 +609,9 @@ 
 	}
 
 	public function setLastTurnUpdate($time) {
-		if ($this->lastTurnUpdate == $time)
-			return;
+		if ($this->lastTurnUpdate == $time) {
+					return;
+		}
 		$this->lastTurnUpdate = $time;
 		$this->hasChanged = true;
 //		$sql = $this->db->query('UPDATE player SET last_turn_update = ' . $this->lastTurnUpdate . ' WHERE '. $this->SQL . ' LIMIT 1');
@@ -629,27 +651,33 @@ 
 	}
 
 	public function increaseRelations($relations, $raceID) {
-		if ($relations < 0)
-			throw new Exception('Trying to increase negative relations.');
-		if ($relations == 0)
-			return;
+		if ($relations < 0) {
+					throw new Exception('Trying to increase negative relations.');
+		}
+		if ($relations == 0) {
+					return;
+		}
 		$relations += $this->getPureRelation($raceID);
 		$this->setRelations($relations, $raceID);
 	}
 	public function decreaseRelations($relations, $raceID) {
-		if ($relations < 0)
-			throw new Exception('Trying to decrease negative relations.');
-		if ($relations == 0)
-			return;
+		if ($relations < 0) {
+					throw new Exception('Trying to decrease negative relations.');
+		}
+		if ($relations == 0) {
+					return;
+		}
 		$relations = $this->getPureRelation($raceID) - $relations;
 		$this->setRelations($relations, $raceID);
 	}
 	public function setRelations($relations, $raceID) {
 		$this->getRelations();
-		if ($this->pureRelations[$raceID] == $relations)
-			return;
-		if ($relations < MIN_RELATIONS)
-			$relations = MIN_RELATIONS;
+		if ($this->pureRelations[$raceID] == $relations) {
+					return;
+		}
+		if ($relations < MIN_RELATIONS) {
+					$relations = MIN_RELATIONS;
+		}
 		$relationsDiff = IRound($relations - $this->pureRelations[$raceID]);
 		$this->pureRelations[$raceID] = $relations;
 		$this->relations[$raceID] += $relationsDiff;
@@ -684,8 +712,7 @@ 
 			$this->db->query('SELECT * FROM ship_has_name WHERE ' . $this->SQL . ' LIMIT 1');
 			if ($this->db->nextRecord()) {
 				$this->customShipName = $this->db->getField('ship_name');
-			}
-			else {
+			} else {
 				$this->customShipName = false;
 			}
 		}
@@ -703,8 +730,7 @@ 
 				$this->knowledge['Nyx'] = $this->db->getInt('nyx');
 				$this->knowledge['Federation'] = 0;
 				$this->knowledge['Underground'] = 0;
-			}
-			else {
+			} else {
 				$this->knowledge['Erebus'] = 0;
 				$this->knowledge['Aether'] = 0;
 				$this->knowledge['Tartarus'] = 0;
@@ -713,10 +739,12 @@ 
 				$this->knowledge['Underground'] = 0;
 			}
 		}
-		if ($knowledgeType === false)
-			return $this->knowledge;
-		if (isset($this->knowledge[$knowledgeType]))
-			return $this->knowledge[$knowledgeType];
+		if ($knowledgeType === false) {
+					return $this->knowledge;
+		}
+		if (isset($this->knowledge[$knowledgeType])) {
+					return $this->knowledge[$knowledgeType];
+		}
 		return false;
 	}
 
@@ -729,9 +757,10 @@ 
 		$sector->diedHere($this);
 
 		// if we are in an alliance we increase their deaths
-		if ($this->hasAlliance())
-			$this->db->query('UPDATE alliance SET alliance_deaths = alliance_deaths + 1
+		if ($this->hasAlliance()) {
+					$this->db->query('UPDATE alliance SET alliance_deaths = alliance_deaths + 1
 							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);
@@ -744,8 +773,9 @@ 
 		$newCredits = IRound($this->getShip()->getCost() / 4);
 		$old_speed = $this->getShip()->getSpeed();
 
-		if ($newCredits < 100000)
-			$newCredits = 100000;
+		if ($newCredits < 100000) {
+					$newCredits = 100000;
+		}
 		$this->setCredits($newCredits);
 
 		$this->setSectorID($this::getHome($this->getGameID(), $this->getRaceID()));
@@ -820,14 +850,14 @@ 
 		$relation = $relations[$killer->getRaceID()];
 
 		$alignChangePerRelation = 0.1;
-		if ($relation >= RELATIONS_PEACE || $relation <= RELATIONS_WAR)
-			$alignChangePerRelation = 0.04;
+		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) {
 			$killer->increaseAlignment($return['KillerAlign']);
-		}
-		else {
+		} else {
 			$killer->decreaseAlignment(-$return['KillerAlign']);
 		}
 		// War setting gives them military pay
@@ -861,8 +891,7 @@ 
 			// If the podded players alignment makes them deputy or member then set bounty
 			if ($this->getAlignment() >= 100) {
 				$return['BountyGained']['Type'] = 'HQ';
-			}
-			else if ($this->getAlignment() <= 100) {
+			} else if ($this->getAlignment() <= 100) {
 				$return['BountyGained']['Type'] = 'UG';
 			}
 
@@ -884,16 +913,14 @@ 
 
 			if ($return['KillerAlign'] > 0) {
 				$killer->increaseHOF($return['KillerAlign'], array('Killing', 'NPC', 'Alignment', 'Gain'), HOF_PUBLIC);
-			}
-			else {
+			} else {
 				$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(1, array('Killing', 'NPC Kills'), HOF_PUBLIC);
-		}
-		else {
+		} else {
 			$killer->increaseHOF($return['KillerExp'], array('Killing', 'Experience', 'Gained'), HOF_PUBLIC);
 			$killer->increaseHOF($this->getExperience(), array('Killing', 'Experience', 'Of Traders Killed'), HOF_PUBLIC);
 
@@ -905,8 +932,7 @@ 
 
 			if ($return['KillerAlign'] > 0) {
 				$killer->increaseHOF($return['KillerAlign'], array('Killing', 'Alignment', 'Gain'), HOF_PUBLIC);
-			}
-			else {
+			} else {
 				$killer->increaseHOF(-$return['KillerAlign'], array('Killing', 'Alignment', 'Loss'), HOF_PUBLIC);
 			}
 
@@ -914,8 +940,7 @@ 
 
 			if ($this->getShip()->getAttackRatingWithMaxCDs() <= MAX_ATTACK_RATING_NEWBIE && $this->hasNewbieStatus() && !$killer->hasNewbieStatus()) { //Newbie kill
 				$killer->increaseHOF(1, array('Killing', 'Newbie Kills'), HOF_PUBLIC);
-			}
-			else {
+			} else {
 				$killer->increaseKills(1);
 				$killer->increaseHOF(1, array('Killing', 'Kills'), HOF_PUBLIC);
 
@@ -1097,20 +1122,21 @@ 
 				$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']) . ')');
-				}
-				else {
-					if ($bounty['Amount'] > 0 || $bounty['SmrCredits'] > 0)
-						$this->db->query('UPDATE bounty
+					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) {
+											$this->db->query('UPDATE bounty
 							SET amount=' . $this->db->escapeNumber($bounty['Amount']) . ',
 							smr_credits=' . $this->db->escapeNumber($bounty['SmrCredits']) . ',
 							type=' . $this->db->escapeString($bounty['Type']) . ',
 							claimer_id=' . $this->db->escapeNumber($bounty['Claimer']) . ',
 							time=' . $this->db->escapeNumber($bounty['Time']) . '
 							WHERE bounty_id=' . $this->db->escapeNumber($bounty['ID']) . ' AND ' . $this->SQL . ' LIMIT 1');
-					else
-						$this->db->query('DELETE FROM bounty WHERE bounty_id=' . $this->db->escapeNumber($bounty['ID']) . ' AND ' . $this->SQL . ' LIMIT 1');
+					} else {
+											$this->db->query('DELETE FROM bounty WHERE bounty_id=' . $this->db->escapeNumber($bounty['ID']) . ' AND ' . $this->SQL . ' LIMIT 1');
+					}
 				}
 			}
 		}
@@ -1118,14 +1144,16 @@ 
 	}
 
 	public function saveHOF() {
-		if ($this->hasHOFChanged !== false)
-			$this->doHOFSave($this->hasHOFChanged);
+		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]) . ')');
-				else
-					$this->db->query('UPDATE hof_visibility SET visibility = ' . $this->db->escapeString(self::$HOFVis[$hofType]) . ' WHERE type = ' . $this->db->escapeString($hofType) . ' LIMIT 1');
+				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');
+				}
 				unset(self::$hasHOFVisChanged[$hofType]);
 			}
 		}
@@ -1136,14 +1164,13 @@ 
 			$tempTypeList[] = $type;
 			if (is_array($hofChanged)) {
 				$this->doHOFSave($hofChanged, $tempTypeList);
-			}
-			else {
+			} 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) . ')');
-				}
-				else if ($hofChanged == self::HOF_CHANGED) {
+					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) {
 	//				if($amount > 0)
 						$this->db->query('UPDATE player_hof
 							SET amount=' . $this->db->escapeNumber($amount) . '
@@ -1254,11 +1281,12 @@ 
 			$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'),
+			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'));
+			}
 		}
 		return $this->tickers;
 	}
@@ -1269,8 +1297,9 @@ 
 
 	public function getTicker($tickerType) {
 		$tickers = $this->getTickers();
-		if (isset($tickers[$tickerType]))
-			return $tickers[$tickerType];
+		if (isset($tickers[$tickerType])) {
+					return $tickers[$tickerType];
+		}
 		return false;
 	}
 
@@ -1279,9 +1308,15 @@ 
 	}
 
 	public function getTurnsLevel() {
-		if (!$this->hasTurns()) return 'NONE';
-		if ($this->getTurns() <= 25) return 'LOW';
-		if ($this->getTurns() <= 75) return 'MEDIUM';
+		if (!$this->hasTurns()) {
+			return 'NONE';
+		}
+		if ($this->getTurns() <= 25) {
+			return 'LOW';
+		}
+		if ($this->getTurns() <= 75) {
+			return 'MEDIUM';
+		}
 		return 'HIGH';
 	}
 
@@ -1359,8 +1394,9 @@ 
 
 	public function sendGlobalMessage($message, $canBeIgnored = true) {
 		if ($canBeIgnored) {
-			if ($this->getAccount()->isMailBanned())
-				create_error('You are currently banned from sending messages');
+			if ($this->getAccount()->isMailBanned()) {
+							create_error('You are currently banned from sending messages');
+			}
 		}
 		$this->sendMessageToBox(BOX_GLOBALS, $message);
 
@@ -1383,12 +1419,14 @@ 
 	public function sendMessage($receiverID, $messageTypeID, $message, $canBeIgnored = true, $unread = true, $expires = false, $senderDelete = false) {
 		//get expire time
 		if ($canBeIgnored) {
-			if ($this->getAccount()->isMailBanned())
-				create_error('You are currently banned from sending messages');
+			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())
-				return;
+			if ($this->db->nextRecord()) {
+							return;
+			}
 		}
 
 		$message = word_filter($message);
@@ -1469,32 +1507,36 @@ 
 
 	public static function sendMessageFromAdmin($gameID, $receiverID, $message, $expires = false) {
 		//get expire time
-		if ($expires === false)
-			$expires = TIME + 86400 * 365;
+		if ($expires === false) {
+					$expires = TIME + 86400 * 365;
+		}
 		// send him the message
 		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)
-			$expires = TIME + 86400 * 31;
+		if ($expires === false) {
+					$expires = TIME + 86400 * 31;
+		}
 		// send him the message
 		self::doMessageSending(ACCOUNT_ID_ALLIANCE_AMBASSADOR, $receiverID, $gameID, MSG_ALLIANCE, $message, $expires);
 	}
 
 	public static function sendMessageFromCasino($gameID, $receiverID, $message, $expires = false) {
 		//get expire time
-		if ($expires === false)
-			$expires = TIME + 86400 * 7;
+		if ($expires === false) {
+					$expires = TIME + 86400 * 7;
+		}
 		// send him the message
 		self::doMessageSending(ACCOUNT_ID_CASINO, $receiverID, $gameID, MSG_CASINO, $message, $expires);
 	}
 
 	public static function sendMessageFromRace($raceID, $gameID, $receiverID, $message, $expires = false) {
 		//get expire time
-		if ($expires === false)
-			$expires = TIME + 86400 * 5;
+		if ($expires === false) {
+					$expires = TIME + 86400 * 5;
+		}
 		// send him the message
 		self::doMessageSending(ACCOUNT_ID_GROUP_RACES + $raceID, $receiverID, $gameID, MSG_POLITICAL, $message, $expires);
 	}
@@ -1537,11 +1579,11 @@ 
 	public function setPlottedCourse(Distance $plottedCourse) {
 		$hadPlottedCourse = $this->hasPlottedCourse();
 		$this->plottedCourse = $plottedCourse;
-		if ($this->plottedCourse->getTotalSectors() > 0)
-			$this->db->query('REPLACE INTO player_plotted_course
+		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();
 		}
 	}
@@ -1551,12 +1593,14 @@ 
 	}
 
 	public function isPartOfCourse($sectorOrSectorID) {
-		if (!$this->hasPlottedCourse())
-			return false;
-		if ($sectorOrSectorID instanceof SmrSector)
-			$sectorID = $sectorOrSectorID->getSectorID();
-		else
-			$sectorID = $sectorOrSectorID;
+		if (!$this->hasPlottedCourse()) {
+					return false;
+		}
+		if ($sectorOrSectorID instanceof SmrSector) {
+					$sectorID = $sectorOrSectorID->getSectorID();
+		} else {
+					$sectorID = $sectorOrSectorID;
+		}
 		return $this->getPlottedCourse()->isInPath($sectorID);
 	}
 

lib/Default/message.functions.inc

Braces +18 added lines, -18 removed lines

@@ -26,30 +26,30 @@
 }
 
 function getMessagePlayer($accountID, $gameID, $messageType = false) {
-	if ($accountID == ACCOUNT_ID_PORT)
-		$return = '<span class="yellow">Port Defenses</span>';
-	else if ($accountID == ACCOUNT_ID_ADMIN)
-		$return = '<span class="admin">Administrator</span>';
-	else if ($accountID == ACCOUNT_ID_PLANET)
-		$return = '<span class="yellow">Planetary Defenses</span>';
-	else if ($accountID == ACCOUNT_ID_ALLIANCE_AMBASSADOR)
-		$return = '<span class="green">Alliance Ambassador</span>';
-	else if ($accountID == ACCOUNT_ID_CASINO)
-		$return = '<span class="yellow">Casino</span>';
-	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)
-		$return = '<span class="green">Alliance Command</span>';
-	else {
+	if ($accountID == ACCOUNT_ID_PORT) {
+			$return = '<span class="yellow">Port Defenses</span>';
+	} else if ($accountID == ACCOUNT_ID_ADMIN) {
+			$return = '<span class="admin">Administrator</span>';
+	} else if ($accountID == ACCOUNT_ID_PLANET) {
+			$return = '<span class="yellow">Planetary Defenses</span>';
+	} else if ($accountID == ACCOUNT_ID_ALLIANCE_AMBASSADOR) {
+			$return = '<span class="green">Alliance Ambassador</span>';
+	} else if ($accountID == ACCOUNT_ID_CASINO) {
+			$return = '<span class="yellow">Casino</span>';
+	} 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) {
+			$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>';
 				return $return;
 			}
 		}
-		if (!empty($accountID))
-			$return = SmrPlayer::getPlayer($accountID, $gameID);
-		else {
+		if (!empty($accountID)) {
+					$return = SmrPlayer::getPlayer($accountID, $gameID);
+		} else {
 			switch ($messageType) {
 				case MSG_ADMIN:
 					$return = '<span class="admin">Administrator</span>';

tools/npc/npc.php

Braces +55 added lines, -67 removed lines

@@ -89,12 +89,10 @@ 
 
 	try {
 		changeNPCLogin();
-	}
-	catch (ForwardException $e) {}
+	} catch (ForwardException $e) {}
 
 	NPCStuff();
-}
-catch (Throwable $e) {
+} catch (Throwable $e) {
 	logException($e);
 	// Try to shut down cleanly
 	exitNPC();
@@ -157,8 +155,7 @@ 
 			$fedContainer = null;
 			if ($var['url'] == 'shop_ship_processing.php' && ($fedContainer = plotToFed($player, true)) !== true) { //We just bought a ship, we should head back to our trade gal/uno - we use HQ for now as it's both in our gal and a UNO, plus it's safe which is always a bonus
 				processContainer($fedContainer);
-			}
-			else if ($player->getShip()->isUnderAttack() === true
+			} else if ($player->getShip()->isUnderAttack() === true
 				&&($player->hasPlottedCourse() === false || $player->getPlottedCourse()->getEndSector()->offersFederalProtection() === false)
 				&&($fedContainer == null ? $fedContainer = plotToFed($player, true) : $fedContainer) !== true) { //We're under attack and need to plot course to fed.
 				// Get the lock, remove under attack and update.
@@ -171,20 +168,16 @@ 
 				debug('Under Attack');
 				$underAttack = true;
 				processContainer($fedContainer);
-			}
-			else if ($player->hasPlottedCourse() === true && $player->getPlottedCourse()->getEndSector()->offersFederalProtection()) { //We have a route to fed to follow, figure it's probably a damned sensible thing to follow.
+			} else if ($player->hasPlottedCourse() === true && $player->getPlottedCourse()->getEndSector()->offersFederalProtection()) { //We have a route to fed to follow, figure it's probably a damned sensible thing to follow.
 				debug('Follow Course: ' . $player->getPlottedCourse()->getNextOnPath());
 				processContainer(moveToSector($player, $player->getPlottedCourse()->getNextOnPath()));
-			}
-			else if (($container = canWeUNO($player, true)) !== false) { //We have money and are at a uno, let's uno!
+			} else if (($container = canWeUNO($player, true)) !== false) { //We have money and are at a uno, let's uno!
 				debug('We\'re UNOing');
 				processContainer($container);
-			}
-			else if ($player->hasPlottedCourse() === true) { //We have a route to follow, figure it's probably a sensible thing to follow.
+			} else if ($player->hasPlottedCourse() === true) { //We have a route to follow, figure it's probably a sensible thing to follow.
 				debug('Follow Course: ' . $player->getPlottedCourse()->getNextOnPath());
 				processContainer(moveToSector($player, $player->getPlottedCourse()->getNextOnPath()));
-			}
-			else if ($player->getTurns() < NPC_LOW_TURNS || ($player->getTurns() < $player->getMaxTurns() / 2 && $player->getNewbieTurns() < NPC_LOW_NEWBIE_TURNS) || $underAttack) { //We're low on turns or have been under attack and need to plot course to fed
+			} else if ($player->getTurns() < NPC_LOW_TURNS || ($player->getTurns() < $player->getMaxTurns() / 2 && $player->getNewbieTurns() < NPC_LOW_NEWBIE_TURNS) || $underAttack) { //We're low on turns or have been under attack and need to plot course to fed
 				if ($player->getTurns() < NPC_LOW_TURNS) {
 					debug('Low Turns:' . $player->getTurns());
 				}
@@ -201,16 +194,13 @@ 
 				}
 				$ship = $player->getShip();
 				processContainer(plotToFed($player, !$ship->hasMaxShields() || !$ship->hasMaxArmour() || !$ship->hasMaxCargoHolds()));
-			}
-			else if (($container = checkForShipUpgrade($player)) !== false) { //We have money and are at a uno, let's uno!
+			} else if (($container = checkForShipUpgrade($player)) !== false) { //We have money and are at a uno, let's uno!
 				debug('We\'re reshipping!');
 				processContainer($container);
-			}
-			else if (($container = canWeUNO($player, false)) !== false) { //We need to UNO and have enough money to do it properly so let's do it sooner rather than later.
+			} else if (($container = canWeUNO($player, false)) !== false) { //We need to UNO and have enough money to do it properly so let's do it sooner rather than later.
 				debug('We need to UNO, so off we go!');
 				processContainer($container);
-			}
-			else if ($TRADE_ROUTE instanceof \Routes\Route) {
+			} else if ($TRADE_ROUTE instanceof \Routes\Route) {
 				debug('Trade Route');
 				$forwardRoute = $TRADE_ROUTE->getForwardRoute();
 				$returnRoute = $TRADE_ROUTE->getReturnRoute();
@@ -218,8 +208,7 @@ 
 					if ($forwardRoute->getBuySectorId() == $player->getSectorID()) {
 						$buyRoute = $forwardRoute;
 						$sellRoute = $returnRoute;
-					}
-					else if ($returnRoute->getBuySectorId() == $player->getSectorID()) {
+					} else if ($returnRoute->getBuySectorId() == $player->getSectorID()) {
 						$buyRoute = $returnRoute;
 						$sellRoute = $forwardRoute;
 					}
@@ -236,30 +225,25 @@ 
 								//Sell goods
 								debug('Sell Goods');
 								processContainer(tradeGoods($goodID, $player, $port));
-							}
-							else {
+							} else {
 								//Move to next route or fed.
 								if (($TRADE_ROUTE =& changeRoute($TRADE_ROUTES)) === false) {
 									debug('Changing Route Failed');
 									processContainer(plotToFed($player));
-								}
-								else {
+								} else {
 									debug('Route Changed');
 									continue;
 								}
 							}
-						}
-						else if ($ship->hasCargo($buyRoute->getGoodID()) === true) { //We've bought goods, plot to sell
+						} else if ($ship->hasCargo($buyRoute->getGoodID()) === true) { //We've bought goods, plot to sell
 							debug('Plot To Sell: ' . $buyRoute->getSellSectorId());
 							processContainer(plotToSector($player, $buyRoute->getSellSectorId()));
-						}
-						else {
+						} else {
 							//Dump goods
 							debug('Dump Goods');
 							processContainer(dumpCargo($player));
 						}
-					}
-					else { //Buy goods
+					} else { //Buy goods
 						$goodID = $buyRoute->getGoodID();
 
 						$port = $player->getSector()->getPort();
@@ -268,26 +252,22 @@ 
 						if ($tradeable === true && $port->getGoodAmount($goodID) >= $ship->getEmptyHolds()) { //Buy goods
 							debug('Buy Goods');
 							processContainer(tradeGoods($goodID, $player, $port));
-						}
-						else {
+						} else {
 							//Move to next route or fed.
 							if (($TRADE_ROUTE =& changeRoute($TRADE_ROUTES)) === false) {
 								debug('Changing Route Failed');
 								processContainer(plotToFed($player));
-							}
-							else {
+							} else {
 								debug('Route Changed');
 								continue;
 							}
 						}
 					}
-				}
-				else {
+				} else {
 					debug('Plot To Buy: ' . $forwardRoute->getBuySectorId());
 					processContainer(plotToSector($player, $forwardRoute->getBuySectorId()));
 				}
-			}
-			else { //Something weird is going on.. Let's fed and wait.
+			} else { //Something weird is going on.. Let's fed and wait.
 				debug('No actual action? Wtf?');
 				processContainer(plotToFed($player));
 			}
@@ -299,8 +279,7 @@ 
 				processContainer(moveToSector($player,$moveTo));
 			}
 			*/
-		}
-		catch (ForwardException $e) {
+		} catch (ForwardException $e) {
 			global $lock;
 			if ($lock) { //only save if we have the lock.
 				SmrSector::saveSectors();
@@ -308,8 +287,9 @@ 
 				SmrPlayer::savePlayers();
 				SmrForce::saveForces();
 				SmrPort::savePorts();
-				if (class_exists('WeightedRandom', false))
-					WeightedRandom::saveWeightedRandoms();
+				if (class_exists('WeightedRandom', false)) {
+									WeightedRandom::saveWeightedRandoms();
+				}
 				release_lock();
 			}
 			//Clean up the caches as the data may get changed by other players
@@ -448,11 +428,13 @@ 
 }
 
 function canWeUNO(AbstractSmrPlayer $player, $oppurtunisticOnly) {
-	if ($player->getCredits() < MINUMUM_RESERVE_CREDITS)
-		return false;
+	if ($player->getCredits() < MINUMUM_RESERVE_CREDITS) {
+			return false;
+	}
 	$ship = $player->getShip();
-	if ($ship->hasMaxShields() && $ship->hasMaxArmour() && $ship->hasMaxCargoHolds())
-		return false;
+	if ($ship->hasMaxShields() && $ship->hasMaxArmour() && $ship->hasMaxCargoHolds()) {
+			return false;
+	}
 	$sector = $player->getSector();
 
 	// We buy armour in preference to shields as it's cheaper.
@@ -466,8 +448,7 @@ 
 			$hardwareSold = $location->getHardwareSold();
 			if ($player->getNewbieTurns() > MIN_NEWBIE_TURNS_TO_BUY_CARGO && !$ship->hasMaxCargoHolds() && isset($hardwareSold[HARDWARE_CARGO]) && ($amount = floor(($player->getCredits() - MINUMUM_RESERVE_CREDITS) / Globals::getHardwareCost(HARDWARE_CARGO))) > 0) { // Buy cargo holds first if we have plenty of newbie turns left.
 				$hardwareID = HARDWARE_CARGO;
-			}
-			else {
+			} else {
 				foreach ($hardwareArray as $hardwareArrayID) {
 					if (!$ship->hasMaxHardware($hardwareArrayID) && isset($hardwareSold[$hardwareArrayID]) && ($amount = floor(($player->getCredits() - MINUMUM_RESERVE_CREDITS) / Globals::getHardwareCost($hardwareArrayID))) > 0) {
 						$hardwareID = $hardwareArrayID;
@@ -481,11 +462,14 @@ 
 		}
 	}
 
-	if ($oppurtunisticOnly === true)
-		return false;
+	if ($oppurtunisticOnly === true) {
+			return false;
+	}
 
-	if ($player->getCredits() - $ship->getCostToUNO() < MINUMUM_RESERVE_CREDITS)
-		return false; //Only do non-oppurtunistic UNO if we have the money to do it properly!
+	if ($player->getCredits() - $ship->getCostToUNO() < MINUMUM_RESERVE_CREDITS) {
+			return false;
+	}
+	//Only do non-oppurtunistic UNO if we have the money to do it properly!
 
 	foreach ($hardwareArray as $hardwareArrayID) {
 		if (!$ship->hasMaxHardware($hardwareArrayID)) {
@@ -574,8 +558,10 @@ 
 
 function checkForShipUpgrade(AbstractSmrPlayer $player) {
 	foreach (SHIP_UPGRADE_PATH[$player->getRaceID()] as $upgradeShipID) {
-		if ($player->getShipTypeID() == $upgradeShipID) //We can't upgrade, only downgrade.
+		if ($player->getShipTypeID() == $upgradeShipID) {
+			//We can't upgrade, only downgrade.
 			return false;
+		}
 		$cost = $player->getShip()->getCostToUpgrade($upgradeShipID);
 		if ($cost <= 0 || $player->getCredits() - $cost > MINUMUM_RESERVE_CREDITS) {
 			return doShipUpgrade($player, $upgradeShipID);
@@ -597,8 +583,9 @@ 
 
 function &changeRoute(array &$tradeRoutes) {
 	$false = false;
-	if (count($tradeRoutes) == 0)
-		return $false;
+	if (count($tradeRoutes) == 0) {
+			return $false;
+	}
 	$routeKey = array_rand($tradeRoutes);
 	$tradeRoute =& $tradeRoutes[$routeKey];
 	unset($tradeRoutes[$routeKey]);
@@ -612,10 +599,11 @@ 
 
 	$tradeGoods = array(GOOD_NOTHING => false);
 	foreach (Globals::getGoods() as $goodID => $good) {
-		if ($player->meetsAlignmentRestriction($good['AlignRestriction']))
-			$tradeGoods[$goodID] = true;
-		else
-			$tradeGoods[$goodID] = false;
+		if ($player->meetsAlignmentRestriction($good['AlignRestriction'])) {
+					$tradeGoods[$goodID] = true;
+		} else {
+					$tradeGoods[$goodID] = false;
+		}
 	}
 
 	// Only allow NPCs to trade at ports of their race and neutral ports
@@ -642,8 +630,7 @@ 
 		$routes = unserialize(gzuncompress($db->getField('routes')));
 		debug('Using Cached Routes: #' . count($routes));
 		return $routes;
-	}
-	else {
+	} else {
 		debug('Generating Routes');
 		$allSectors = array();
 		foreach (SmrGalaxy::getGameGalaxies($player->getGameID()) as $galaxy) {
@@ -652,10 +639,11 @@ 
 
 		$distances = Plotter::calculatePortToPortDistances($allSectors, $maxDistance, $startSectorID, $endSectorID);
 
-		if ($maxNumberOfPorts == 1)
-			$allRoutes = \Routes\RouteGenerator::generateOneWayRoutes($allSectors, $distances, $tradeGoods, $tradeRaces, $routesForPort);
-		else
-			$allRoutes = \Routes\RouteGenerator::generateMultiPortRoutes($maxNumberOfPorts, $allSectors, $tradeGoods, $tradeRaces, $distances, $routesForPort, $numberOfRoutes);
+		if ($maxNumberOfPorts == 1) {
+					$allRoutes = \Routes\RouteGenerator::generateOneWayRoutes($allSectors, $distances, $tradeGoods, $tradeRaces, $routesForPort);
+		} else {
+					$allRoutes = \Routes\RouteGenerator::generateMultiPortRoutes($maxNumberOfPorts, $allSectors, $tradeGoods, $tradeRaces, $distances, $routesForPort, $numberOfRoutes);
+		}
 
 		unset($distances);
 

lib/Default/smr.inc

Braces +80 added lines, -58 removed lines

@@ -8,8 +8,9 @@ 
 
 function parseBoolean($check) {
 	// Only negative strings are not implicitly converted to the correct bool
-	if (is_string($check) && (strcasecmp($check, 'NO') == 0 || strcasecmp($check, 'FALSE') == 0))
-		return false;
+	if (is_string($check) && (strcasecmp($check, 'NO') == 0 || strcasecmp($check, 'FALSE') == 0)) {
+			return false;
+	}
 	return (bool)$check;
 }
 
@@ -32,8 +33,9 @@ 
 			break;
 			case 'player':
 				$playerID = $default;
-				if (!is_numeric($playerID))
-					$playerID = $tagParams['id'];
+				if (!is_numeric($playerID)) {
+									$playerID = $tagParams['id'];
+				}
 				$bbPlayer = SmrPlayer::getPlayerByPlayerID($playerID, $overrideGameID);
 				if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 					return true;
@@ -46,8 +48,9 @@ 
 			break;
 			case 'alliance':
 				$allianceID = $default;
-				if (!is_numeric($allianceID))
-					$allianceID = $tagParams['id'];
+				if (!is_numeric($allianceID)) {
+									$allianceID = $tagParams['id'];
+				}
 				$alliance = SmrAlliance::getAlliance($allianceID, $overrideGameID);
 				if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 					return true;
@@ -56,10 +59,11 @@ 
 				if ($disableBBLinks === false && $overrideGameID == SmrSession::getGameID()) {
 					$container = create_container('skeleton.php');
 					$container['alliance_id'] = $alliance->getAllianceID();
-					if (is_object($player) && $alliance->getAllianceID() == $player->getAllianceID())
-						$container['body'] = 'alliance_mod.php';
-					else
-						$container['body'] = 'alliance_roster.php';
+					if (is_object($player) && $alliance->getAllianceID() == $player->getAllianceID()) {
+											$container['body'] = 'alliance_mod.php';
+					} else {
+											$container['body'] = 'alliance_roster.php';
+					}
 					return create_link($container, $alliance->getAllianceDisplayName());
 				}
 				return $alliance->getAllianceDisplayName();
@@ -83,8 +87,9 @@ 
 					return true;
 				}
 				if ($timeString != '' && ($time = strtotime($timeString)) !== false) {
-					if (is_object($account))
-						$time += $account->getOffset() * 3600;
+					if (is_object($account)) {
+											$time += $account->getOffset() * 3600;
+					}
 					return date(DATE_FULL_SHORT, $time);
 				}
 			break;
@@ -127,8 +132,7 @@ 
 				return '<div class="buttonA"><a class="buttonA" href="' . SmrSession::getNewHREF($container) . '">Join ' . $alliance->getAllianceDisplayName() . '</a></div>';
 			break;
 		}
-	}
-	catch (Exception $e) {
+	} catch (Exception $e) {
 	}
 	if ($action == \Nbbc\BBCode::BBCODE_CHECK) {
 		return false;
@@ -173,15 +177,15 @@ 
 		$bbParser->addRule('join_alliance', $smrRule);
 	}
 	global $disableBBLinks;
-	if ($noLinks === true)
-		$disableBBLinks = true;
-	else
-		$disableBBLinks = false;
+	if ($noLinks === true) {
+			$disableBBLinks = true;
+	} else {
+			$disableBBLinks = false;
+	}
 	if (strpos($message, '[') !== false) { //We have BBCode so let's do a full parse.
 		$message = $bbParser->parse($message);
 		$message = str_replace('&lt;br /&gt;', '<br />', $message);
-	}
-	else { //Otherwise just convert newlines
+	} else { //Otherwise just convert newlines
 		$message = nl2br($message, true);
 	}
 	return $message;
@@ -221,8 +225,7 @@ 
 
 	if (!is_array($actions)) {
 		$form['submit'] = '<input class="submit" type="submit" name="action" value="' . htmlspecialchars($actions) . '">';
-	}
-	else {
+	} else {
 		$form['submit'] = array();
 		foreach ($actions as $action) {
 			$form['submit'][$action[0]] = '<input class="submit" type="submit" name="action" value="' . htmlspecialchars($action[1]) . '">';
@@ -267,8 +270,9 @@ 
 }
 
 function forward($new_container) {
-	if (defined('OVERRIDE_FORWARD') && OVERRIDE_FORWARD === true)
-		return overrideForward($new_container);
+	if (defined('OVERRIDE_FORWARD') && OVERRIDE_FORWARD === true) {
+			return overrideForward($new_container);
+	}
 	resetContainer($new_container);
 	do_voodoo();
 }
@@ -284,8 +288,9 @@ 
 	global $var, $container;
 
 	// transfer this value to next container
-	if (isset($var[$what]))
-		$container[$what] = $var[$what];
+	if (isset($var[$what])) {
+			$container[$what] = $var[$what];
+	}
 
 }
 
@@ -313,8 +318,7 @@ 
 	}
 	if ($maxValue - $minValue == 0) {
 		return $text;
-	}
-	else {
+	} else {
 		$normalisedValue = round(510 * max(0, min($maxValue, $value) - $minValue) / ($maxValue - $minValue)) - 255;
 	}
 	if ($type == 'Game') {
@@ -324,28 +328,33 @@ 
 			if (strlen($g_component) == 1) {
 				$g_component = '0' . $g_component;
 			}
-		}
-		else if ($normalisedValue > 0) {
+		} else if ($normalisedValue > 0) {
 			$g_component = 'ff';
 			$r_component = dechex(255 - $normalisedValue);
 			if (strlen($r_component) == 1) {
 				$r_component = '0' . $r_component;
 			}
-		}
-		else {
+		} else {
 			$r_component = 'ff';
 			$g_component = 'ff';
 		}
 		$colour = $r_component . $g_component . '00';
-		if ($return_type == 'Colour') return $colour;
+		if ($return_type == 'Colour') {
+			return $colour;
+		}
 		return '<span style="color:#' . $colour . '">' . $text . '</span>';
-	}
-	elseif ($type == 'IRC') {
+	} elseif ($type == 'IRC') {
 		//IRC color codes
-		if ($normalisedValue == 255) $colour = '[k03]';
-		elseif ($normalisedValue == -255) $colour = '[k04]';
-		else $colour = '[k08]';
-		if ($return_type == 'Colour') return $colour;
+		if ($normalisedValue == 255) {
+			$colour = '[k03]';
+		} elseif ($normalisedValue == -255) {
+			$colour = '[k04]';
+		} else {
+			$colour = '[k08]';
+		}
+		if ($return_type == 'Colour') {
+			return $colour;
+		}
 		return $colour . $text;
 	}
 }
@@ -404,10 +413,18 @@ 
 	// create account object
 	$account = SmrSession::getAccount();
 
-	if (!defined('DATE_DATE_SHORT')) define('DATE_DATE_SHORT', $account->getShortDateFormat());
-	if (!defined('DATE_TIME_SHORT')) define('DATE_TIME_SHORT', $account->getShortTimeFormat());
-	if (!defined('DATE_FULL_SHORT')) define('DATE_FULL_SHORT', DATE_DATE_SHORT . ' ' . DATE_TIME_SHORT);
-	if (!defined('DATE_FULL_SHORT_SPLIT')) define('DATE_FULL_SHORT_SPLIT', DATE_DATE_SHORT . '\<b\r /\>' . DATE_TIME_SHORT);
+	if (!defined('DATE_DATE_SHORT')) {
+		define('DATE_DATE_SHORT', $account->getShortDateFormat());
+	}
+	if (!defined('DATE_TIME_SHORT')) {
+		define('DATE_TIME_SHORT', $account->getShortTimeFormat());
+	}
+	if (!defined('DATE_FULL_SHORT')) {
+		define('DATE_FULL_SHORT', DATE_DATE_SHORT . ' ' . DATE_TIME_SHORT);
+	}
+	if (!defined('DATE_FULL_SHORT_SPLIT')) {
+		define('DATE_FULL_SHORT_SPLIT', DATE_DATE_SHORT . '\<b\r /\>' . DATE_TIME_SHORT);
+	}
 
 	// initialize objects we usually need, like player, ship
 	if (SmrSession::hasGame()) {
@@ -454,8 +471,9 @@ 
 
 		if (!$player->isDead() && $player->getNewbieTurns() <= NEWBIE_TURNS_WARNING_LIMIT &&
 			$player->getNewbieWarning() &&
-			$var['url'] != 'newbie_warning_processing.php')
-			forward(create_container('newbie_warning_processing.php'));
+			$var['url'] != 'newbie_warning_processing.php') {
+					forward(create_container('newbie_warning_processing.php'));
+		}
 	}
 
 	// Initialize the template
@@ -533,8 +551,9 @@ 
 function acquire_lock($sector) {
 	global $db, $lock, $locksFailed;
 
-	if ($lock)
-		return true;
+	if ($lock) {
+			return true;
+	}
 
 	// Insert ourselves into the queue.
 	$db->query('INSERT INTO locks_queue (game_id,account_id,sector_id,timestamp) VALUES(' . $db->escapeNumber(SmrSession::getGameID()) . ',' . $db->escapeNumber(SmrSession::getAccountID()) . ',' . $db->escapeNumber($sector) . ',' . $db->escapeNumber(TIME) . ')');
@@ -560,8 +579,7 @@ 
 
 			usleep(25000 * $locksInQueue);
 			continue;
-		}
-		else {
+		} else {
 			return true;
 		}
 	}
@@ -758,7 +776,9 @@ 
 		$container['player_id'] = $player->getPlayerID();
 		$template->assign('PlayerNameLink', SmrSession::getNewHREF($container));
 
-		if (is_array(Globals::getHiddenPlayers()) && in_array($player->getAccountID(), Globals::getHiddenPlayers())) $template->assign('PlayerInvisible', true);
+		if (is_array(Globals::getHiddenPlayers()) && in_array($player->getAccountID(), Globals::getHiddenPlayers())) {
+			$template->assign('PlayerInvisible', true);
+		}
 
 		// ******* Hardware *******
 		$container = create_container('skeleton.php', 'configure_hardware.php');
@@ -898,16 +918,18 @@ 
 
 function number_colour_format($number, $justSign = false) {
 	$formatted = '<span';
-	if ($number > 0)
-		$formatted .= ' class="green">+';
-	else if ($number < 0)
-		$formatted .= ' class="red">-';
-	else
-		$formatted .= '>';
+	if ($number > 0) {
+			$formatted .= ' class="green">+';
+	} else if ($number < 0) {
+			$formatted .= ' class="red">-';
+	} else {
+			$formatted .= '>';
+	}
 	if ($justSign === false) {
 		$decimalPlaces = 0;
-		if (($pos = strpos((string)$number, '.')) !== false)
-			$decimalPlaces = strlen(substr((string)$number, $pos + 1));
+		if (($pos = strpos((string)$number, '.')) !== false) {
+					$decimalPlaces = strlen(substr((string)$number, $pos + 1));
+		}
 		$formatted .= number_format(abs($number), $decimalPlaces);
 	}
 	$formatted .= '</span>';