smrealms / smr

lib/Default/SmrPlanet.class.php

Braces +47 added lines, -54 removed lines

@@ -151,26 +151,19 @@ 
 		$level = $this->getLevel();
 		if ($level < 9) {
 			return .0404;
-		}
-		elseif ($level < 19) {
+		} elseif ($level < 19) {
 			return .0609;
-		}
-		elseif ($level < 29) {
+		} elseif ($level < 29) {
 			return .1236;
-		}
-		elseif ($level < 39) {
+		} elseif ($level < 39) {
 			return .050625;
-		}
-		elseif ($level < 49) {
+		} elseif ($level < 49) {
 			return .0404;
-		}
-		elseif ($level < 59) {
+		} elseif ($level < 59) {
 			return .030225;
-		}
-		elseif ($level < 69) {
+		} elseif ($level < 69) {
 			return .0201;
-		}
-		else {
+		} else {
 			return .018081;
 		}
 	}
@@ -383,8 +376,7 @@ 
 		}
 		if ($delayed === false) {
 			$this->setShields($this->getShields() - $number);
-		}
-		else {
+		} else {
 			$this->delayedShieldsDelta -= $number;
 		}
 	}
@@ -395,8 +387,7 @@ 
 		}
 		if ($delayed === false) {
 			$this->setShields($this->getShields() + $number);
-		}
-		else {
+		} else {
 			$this->delayedShieldsDelta += $number;
 		}
 	}
@@ -428,8 +419,7 @@ 
 		}
 		if ($delayed === false) {
 			$this->setArmour($this->getArmour() - $number);
-		}
-		else {
+		} else {
 			$this->delayedArmourDelta -= $number;
 		}
 	}
@@ -440,8 +430,7 @@ 
 		}
 		if ($delayed === false) {
 			$this->setArmour($this->getArmour() + $number);
-		}
-		else {
+		} else {
 			$this->delayedArmourDelta += $number;
 		}
 	}
@@ -473,8 +462,7 @@ 
 		}
 		if ($delayed === false) {
 			$this->setCDs($this->getCDs() - $number);
-		}
-		else {
+		} else {
 			$this->delayedCDsDelta -= $number;
 		}
 	}
@@ -485,8 +473,7 @@ 
 		}
 		if ($delayed === false) {
 			$this->setCDs($this->getCDs() + $number);
-		}
-		else {
+		} else {
 			$this->delayedCDsDelta += $number;
 		}
 	}
@@ -580,13 +567,16 @@ 
 			// get supplies from db
 			$this->db->query('SELECT good_id, amount FROM planet_has_cargo WHERE ' . $this->SQL);
 			// adding cargo and amount to array
-			while ($this->db->nextRecord())
-				$this->stockpile[$this->db->getInt('good_id')] = $this->db->getInt('amount');
+			while ($this->db->nextRecord()) {
+							$this->stockpile[$this->db->getInt('good_id')] = $this->db->getInt('amount');
+			}
+		}
+		if ($goodID === false) {
+					return $this->stockpile;
+		}
+		if (isset($this->stockpile[$goodID])) {
+					return $this->stockpile[$goodID];
 		}
-		if ($goodID === false)
-			return $this->stockpile;
-		if (isset($this->stockpile[$goodID]))
-			return $this->stockpile[$goodID];
 		return 0;
 	}
 
@@ -594,8 +584,7 @@ 
 		if ($goodID === false) {
 			$stockpile = $this->getStockpile($goodID);
 			return count($stockpile) > 0 && max($stockpile) > 0;
-		}
-		else {
+		} else {
 			return $this->getStockpile($goodID) > 0;
 		}
 	}
@@ -612,14 +601,16 @@ 
 	}
 
 	public function decreaseStockpile($goodID, $amount) {
-		if ($amount < 0)
-			throw new Exception('Trying to decrease negative stockpile.');
+		if ($amount < 0) {
+					throw new Exception('Trying to decrease negative stockpile.');
+		}
 		$this->setStockpile($goodID, $this->getStockpile($goodID) - $amount);
 	}
 
 	public function increaseStockpile($goodID, $amount) {
-		if ($amount < 0)
-			throw new Exception('Trying to increase negative stockpile.');
+		if ($amount < 0) {
+					throw new Exception('Trying to increase negative stockpile.');
+		}
 		$this->setStockpile($goodID, $this->getStockpile($goodID) + $amount);
 	}
 
@@ -653,8 +644,9 @@ 
 	}
 
 	public function setBuilding($buildingTypeID, $number) {
-		if ($this->getBuilding($buildingTypeID) == $number)
-			return;
+		if ($this->getBuilding($buildingTypeID) == $number) {
+					return;
+		}
 
 		$this->buildings[$buildingTypeID] = $number;
 		$this->hasChangedBuildings[$buildingTypeID] = true;
@@ -826,8 +818,7 @@ 
 				if ($amount != 0) {
 					$this->db->query('REPLACE INTO planet_has_cargo (game_id, sector_id, good_id, amount) ' .
 										 'VALUES(' . $this->db->escapeNumber($this->getGameID()) . ', ' . $this->db->escapeNumber($this->getSectorID()) . ', ' . $this->db->escapeNumber($id) . ', ' . $this->db->escapeNumber($amount) . ')');
-				}
-				else {
+				} else {
 					$this->db->query('DELETE FROM planet_has_cargo WHERE ' . $this->SQL . '
 										AND good_id = ' . $this->db->escapeNumber($id));
 				}
@@ -856,8 +847,7 @@ 
 				if ($this->hasBuilding($id)) {
 					$this->db->query('REPLACE INTO planet_has_building (game_id, sector_id, construction_id, amount) ' .
 										'VALUES(' . $this->db->escapeNumber($this->gameID) . ', ' . $this->db->escapeNumber($this->sectorID) . ', ' . $this->db->escapeNumber($id) . ', ' . $this->db->escapeNumber($this->getBuilding($id)) . ')');
-				}
-				else {
+				} else {
 					$this->db->query('DELETE FROM planet_has_building WHERE ' . $this->SQL . '
 										AND construction_id = ' . $this->db->escapeNumber($id));
 				}
@@ -1106,23 +1096,27 @@ 
 	}
 
 	public function hasEnemyTraders(AbstractSmrPlayer $player) {
-		if (!$this->hasOtherTraders($player))
-			return false;
+		if (!$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;
 	}
 
 	public function hasFriendlyTraders(AbstractSmrPlayer $player) {
-		if (!$this->hasOtherTraders($player))
-			return false;
+		if (!$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;
 	}
@@ -1227,8 +1221,7 @@ 
 					}
 				}
 
-			}
-			else { // hit drones behind shields - we should only use this reduced damage branch if we cannot hit shields.
+			} else { // hit drones behind shields - we should only use this reduced damage branch if we cannot hit shields.
 				$cdDamage = $this->doCDDamage(IFloor(min($damage['MaxDamage'], $damage['Armour']) * DRONES_BEHIND_SHIELDS_DAMAGE_PERCENT), $delayed);
 			}
 		}

lib/Default/SmrCombatDrones.class.php

Braces +13 added lines, -7 removed lines

@@ -13,8 +13,7 @@ 
 			$this->maxDamage = 2;
 			$this->shieldDamage = 2;
 			$this->armourDamage = 2;
-		}
-		else {
+		} else {
 			$this->maxDamage = 1;
 			$this->shieldDamage = 1;
 			$this->armourDamage = 1;
@@ -84,8 +83,9 @@ 
 		$weaponShip = $weaponPlayer->getShip();
 		$targetShip = $targetPlayer->getShip();
 		$mrDiff = $targetShip->getMR() - $weaponShip->getMR();
-		if ($mrDiff > 0)
-			$modifiedAccuracy -= $this->getBaseAccuracy() * ($mrDiff / MR_FACTOR) / 100;
+		if ($mrDiff > 0) {
+					$modifiedAccuracy -= $this->getBaseAccuracy() * ($mrDiff / MR_FACTOR) / 100;
+		}
 	
 		return max(0, min(100, $modifiedAccuracy));
 	}
@@ -127,8 +127,10 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		if (!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootForces()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		$damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstForces($weaponPlayer, $forces) / 100);
 		$damage['Kamikaze'] = 0;
@@ -149,8 +151,10 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		if (!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPorts()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		$damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPort($weaponPlayer, $port) / 100);
 		$damage['MaxDamage'] = ICeil($damage['Launched'] * $damage['MaxDamage']);
@@ -161,8 +165,10 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) {
-		if (!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPlanets()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		$damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPlanet($weaponPlayer, $planet) / 100);
 		$planetMod = self::PLANET_DAMAGE_MOD;

lib/Default/AbstractSmrPort.class.php

Braces +131 added lines, -97 removed lines

@@ -153,8 +153,7 @@ 
 			$this->checkDefenses();
 			$this->getGoods();
 			$this->checkForUpgrade();
-		}
-		else {
+		} else {
 			$this->shields = 0;
 			$this->combatDrones = 0;
 			$this->armour = 0;
@@ -302,8 +301,9 @@ 
 				$x['TransactionType'] = 'Buy';
 			}
 			$di = Plotter::findDistanceToX($x, $this->getSector(), true);
-			if (is_object($di))
-				$di = $di->getRelativeDistance();
+			if (is_object($di)) {
+							$di = $di->getRelativeDistance();
+			}
 			$this->goodDistances[$goodID] = max(1, $di);
 		}
 		return $this->goodDistances[$goodID];
@@ -329,12 +329,14 @@ 
 	}
 	
 	private function setGoodAmount($goodID, $amount, $doUpdate = true) {
-		if ($this->isCachedVersion())
-			throw new Exception('Cannot update a cached port!');
+		if ($this->isCachedVersion()) {
+					throw new Exception('Cannot update a cached port!');
+		}
 		// The new amount must be between 0 and the max for this good
 		$amount = max(0, min($amount, $this->getGood($goodID)['Max']));
-		if ($this->getGoodAmount($goodID) == $amount)
-			return;
+		if ($this->getGoodAmount($goodID) == $amount) {
+					return;
+		}
 		$this->goodAmounts[$goodID] = $amount;
 
 		if ($doUpdate) {
@@ -401,8 +403,9 @@ 
 	}
 	
 	public function checkForUpgrade() {
-		if ($this->isCachedVersion())
-			throw new Exception('Cannot upgrade a cached port!');
+		if ($this->isCachedVersion()) {
+					throw new Exception('Cannot upgrade a cached port!');
+		}
 		$upgrades = 0;
 		while ($this->upgrade >= $this->getUpgradeRequirement() && $this->level < 9) {
 			++$upgrades;
@@ -418,8 +421,9 @@ 
 	 * ports to a specific level.
 	 */
 	public function upgradeToLevel($level) {
-		if ($this->isCachedVersion())
-			throw new Exception('Cannot upgrade a cached port!');
+		if ($this->isCachedVersion()) {
+					throw new Exception('Cannot upgrade a cached port!');
+		}
 		while ($this->getLevel() < $level) {
 			$this->doUpgrade();
 		}
@@ -523,8 +527,9 @@ 
 	 * calling this function directly.
 	 */
 	public function addPortGood($goodID, $type) {
-		if ($this->isCachedVersion())
-			throw new Exception('Cannot update a cached port!');
+		if ($this->isCachedVersion()) {
+					throw new Exception('Cannot update a cached port!');
+		}
 		if ($this->hasGood($goodID, $type)) {
 			return;
 		}
@@ -549,8 +554,9 @@ 
 	 * calling this function directly.
 	 */
 	public function removePortGood($goodID) {
-		if ($this->isCachedVersion())
-			throw new Exception('Cannot update a cached port!');
+		if ($this->isCachedVersion()) {
+					throw new Exception('Cannot update a cached port!');
+		}
 		if (!$this->hasGood($goodID)) {
 			return;
 		}
@@ -559,8 +565,7 @@ 
 		}
 		if (($key = array_search($goodID, $this->goodIDs['Buy'])) !== false) {
 			array_splice($this->goodIDs['Buy'], $key, 1);
-		}
-		elseif (($key = array_search($goodID, $this->goodIDs['Sell'])) !== false) {
+		} elseif (($key = array_search($goodID, $this->goodIDs['Sell'])) !== false) {
 			array_splice($this->goodIDs['Sell'], $key, 1);
 		}
 		
@@ -600,8 +605,9 @@ 
 	}
 
 	protected function doDowngrade() {
-		if ($this->isCachedVersion())
-			throw new Exception('Cannot downgrade a cached port!');
+		if ($this->isCachedVersion()) {
+					throw new Exception('Cannot downgrade a cached port!');
+		}
 
 		$goodClass = $this->getGoodClassAtLevel();
 		$this->selectAndRemoveGood($goodClass);
@@ -620,8 +626,9 @@ 
 	}
 	
 	public function attackedBy(AbstractSmrPlayer $trigger, array $attackers) {
-		if ($this->isCachedVersion())
-			throw new Exception('Cannot attack a cached port!');
+		if ($this->isCachedVersion()) {
+					throw new Exception('Cannot attack a cached port!');
+		}
 			
 		$trigger->increaseHOF(1, array('Combat', 'Port', 'Number Of Triggers'), HOF_PUBLIC);
 		foreach ($attackers as $attacker) {
@@ -640,8 +647,7 @@ 
 			$newsMessage = '<span class="red bold">*MAYDAY* *MAYDAY*</span> A distress beacon has been activated by the port in sector ' . Globals::getSectorBBLink($this->getSectorID()) . '. It is under attack by ';
 			if ($trigger->hasAlliance()) {
 				$newsMessage .= 'members of ' . $trigger->getAllianceBBLink();
-			}
-			else {
+			} else {
 				$newsMessage .= $trigger->getBBLink();
 			}
 			
@@ -650,8 +656,7 @@ 
 
 			if ($trigger->hasAlliance()) {
 				$newsMessage .= 'bounties of <span class="creds">' . $bounty . '</span> credits for the deaths of any raiding members of ' . $trigger->getAllianceBBLink();
-			}
-			else {
+			} else {
 				$newsMessage .= 'a bounty of <span class="creds">' . $bounty . '</span> credits for the death of ' . $trigger->getBBLink();
 			}
 			$newsMessage .= ' prior to the destruction of the port, or until federal forces arrive to defend the port.';
@@ -665,34 +670,43 @@ 
 	}
 	
 	public function setShields($shields) {
-		if ($this->isCachedVersion())
-			throw new Exception('Cannot update a cached port!');
-		if ($shields < 0)
-			$shields = 0;
-		if ($this->shields == $shields)
-			return;
+		if ($this->isCachedVersion()) {
+					throw new Exception('Cannot update a cached port!');
+		}
+		if ($shields < 0) {
+					$shields = 0;
+		}
+		if ($this->shields == $shields) {
+					return;
+		}
 		$this->shields = $shields;
 		$this->hasChanged = true;
 	}
 	
 	public function setArmour($armour) {
-		if ($this->isCachedVersion())
-			throw new Exception('Cannot update a cached port!');
-		if ($armour < 0)
-			$armour = 0;
-		if ($this->armour == $armour)
-			return;
+		if ($this->isCachedVersion()) {
+					throw new Exception('Cannot update a cached port!');
+		}
+		if ($armour < 0) {
+					$armour = 0;
+		}
+		if ($this->armour == $armour) {
+					return;
+		}
 		$this->armour = $armour;
 		$this->hasChanged = true;
 	}
 	
 	public function setCDs($combatDrones) {
-		if ($this->isCachedVersion())
-			throw new Exception('Cannot update a cached port!');
-		if ($combatDrones < 0)
-			$combatDrones = 0;
-		if ($this->combatDrones == $combatDrones)
-			return;
+		if ($this->isCachedVersion()) {
+					throw new Exception('Cannot update a cached port!');
+		}
+		if ($combatDrones < 0) {
+					$combatDrones = 0;
+		}
+		if ($this->combatDrones == $combatDrones) {
+					return;
+		}
 		$this->combatDrones = $combatDrones;
 		$this->hasChanged = true;
 	}
@@ -702,84 +716,99 @@ 
 	}
 
 	public function setCredits($credits) {
-		if ($this->isCachedVersion())
-			throw new Exception('Cannot update a cached port!');
-		if ($this->credits == $credits)
-			return;
+		if ($this->isCachedVersion()) {
+					throw new Exception('Cannot update a cached port!');
+		}
+		if ($this->credits == $credits) {
+					return;
+		}
 		$this->credits = $credits;
 		$this->hasChanged = true;
 	}
 	
 	public function decreaseCredits($credits) {
-		if ($credits < 0)
-			throw new Exception('Cannot decrease negative credits.');
+		if ($credits < 0) {
+					throw new Exception('Cannot decrease negative credits.');
+		}
 		$this->setCredits($this->getCredits() - $credits);
 	}
 	
 	public function increaseCredits($credits) {
-		if ($credits < 0)
-			throw new Exception('Cannot increase negative credits.');
+		if ($credits < 0) {
+					throw new Exception('Cannot increase negative credits.');
+		}
 		$this->setCredits($this->getCredits() + $credits);
 	}
 	
 	public function setUpgrade($upgrade) {
-		if ($this->isCachedVersion())
-			throw new Exception('Cannot update a cached port!');
+		if ($this->isCachedVersion()) {
+					throw new Exception('Cannot update a cached port!');
+		}
 		if ($this->getLevel() == $this->getMaxLevel()) {
 			$upgrade = 0;
 		}
-		if ($this->upgrade == $upgrade)
-			return;
+		if ($this->upgrade == $upgrade) {
+					return;
+		}
 		$this->upgrade = $upgrade;
 		$this->hasChanged = true;
 		$this->checkForUpgrade();
 	}
 	
 	public function decreaseUpgrade($upgrade) {
-		if ($upgrade < 0)
-			throw new Exception('Cannot decrease negative upgrade.');
+		if ($upgrade < 0) {
+					throw new Exception('Cannot decrease negative upgrade.');
+		}
 		$this->setUpgrade($this->getUpgrade() - $upgrade);
 	}
 	
 	public function increaseUpgrade($upgrade) {
-		if ($upgrade < 0)
-			throw new Exception('Cannot increase negative upgrade.');
+		if ($upgrade < 0) {
+					throw new Exception('Cannot increase negative upgrade.');
+		}
 		$this->setUpgrade($this->getUpgrade() + $upgrade);
 	}
 	
 	public function setLevel($level) {
-		if ($this->isCachedVersion())
-			throw new Exception('Cannot update a cached port!');
-		if ($this->level == $level)
-			return;
+		if ($this->isCachedVersion()) {
+					throw new Exception('Cannot update a cached port!');
+		}
+		if ($this->level == $level) {
+					return;
+		}
 		$this->level = $level;
 		$this->hasChanged = true;
 	}
 	
 	public function increaseLevel($level) {
-		if ($level < 0)
-			throw new Exception('Cannot increase negative level.');
+		if ($level < 0) {
+					throw new Exception('Cannot increase negative level.');
+		}
 		$this->setLevel($this->getLevel() + $level);
 	}
 	
 	public function decreaseLevel($level) {
-		if ($level < 0)
-			throw new Exception('Cannot increase negative level.');
+		if ($level < 0) {
+					throw new Exception('Cannot increase negative level.');
+		}
 		$this->setLevel($this->getLevel() - $level);
 	}
 	
 	public function setExperience($experience) {
-		if ($this->isCachedVersion())
-			throw new Exception('Cannot update a cached port!');
-		if ($this->experience == $experience)
-			return;
+		if ($this->isCachedVersion()) {
+					throw new Exception('Cannot update a cached port!');
+		}
+		if ($this->experience == $experience) {
+					return;
+		}
 		$this->experience = $experience;
 		$this->hasChanged = true;
 	}
 	
 	public function increaseExperience($experience) {
-		if ($experience < 0)
-			throw new Exception('Cannot increase negative experience.');
+		if ($experience < 0) {
+					throw new Exception('Cannot increase negative experience.');
+		}
 		$this->setExperience($this->getExperience() + $experience);
 	}
 	
@@ -804,8 +833,9 @@ 
 	}
 	
 	public function setRaceID($raceID) {
-		if ($this->raceID == $raceID)
-			return;
+		if ($this->raceID == $raceID) {
+					return;
+		}
 		$this->raceID = $raceID;
 		$this->hasChanged = true;
 		$this->cacheIsValid = false;
@@ -883,8 +913,9 @@ 
 	}
 	
 	public function getReinforcePercent() {
-		if (!$this->isUnderAttack())
-			return 0;
+		if (!$this->isUnderAttack()) {
+					return 0;
+		}
 		return min(1, max(0, ($this->getReinforceTime() - TIME) / ($this->getReinforceTime() - $this->getAttackStarted())));
 	}
 	
@@ -905,8 +936,9 @@ 
 	}
 	
 	private function setAttackStarted($time) {
-		if ($this->attackStarted == $time)
-			return;
+		if ($this->attackStarted == $time) {
+					return;
+		}
 		$this->attackStarted = TIME;
 		$this->hasChanged = true;
 	}
@@ -970,10 +1002,10 @@ 
 		 {
 			$relationsEffect = 2 - $relationsEffect;
 			return max($idealPrice, IFloor($idealPrice * $relationsEffect));
+		 } else {
+		 			return min($idealPrice, ICeil($idealPrice * $relationsEffect));
 		 }
-		 else
-			return min($idealPrice, ICeil($idealPrice * $relationsEffect));
-//		$range = .11 - .095;
+		 //		$range = .11 - .095;
 //		$rand = .095 + $range * mt_rand(0, 32767)/32767;
 //
 //		if($transactionType == 'Buy')
@@ -1034,8 +1066,7 @@ 
 		if ($this->getCredits() > 0) {
 			$container = create_container('skeleton.php', 'port_payout_processing.php');
 			$container['PayoutType'] = 'Loot';
-		}
-		else {
+		} else {
 			$container = create_container('skeleton.php', 'current_sector.php');
 			$container['msg'] = 'This port has already been looted.';
 		}
@@ -1106,9 +1137,9 @@ 
 			if ($db->nextRecord()) {
 				self::$CACHE_CACHED_PORTS[$gameID][$sectorID][$accountID] = unserialize(gzuncompress($db->getField('port_info')));
 				self::$CACHE_CACHED_PORTS[$gameID][$sectorID][$accountID]->setCachedTime($db->getInt('visited'));
+			} else {
+							self::$CACHE_CACHED_PORTS[$gameID][$sectorID][$accountID] = false;
 			}
-			else
-				self::$CACHE_CACHED_PORTS[$gameID][$sectorID][$accountID] = false;
 		}
 		return self::$CACHE_CACHED_PORTS[$gameID][$sectorID][$accountID];
 	}
@@ -1154,8 +1185,7 @@ 
 								', attack_started = ' . $this->db->escapeNumber($this->getAttackStarted()) .
 								', race_id = ' . $this->db->escapeNumber($this->getRaceID()) . '
 								WHERE ' . $this->SQL . ' LIMIT 1');
-			}
-			else {
+			} else {
 				$this->db->query('INSERT INTO port (game_id,sector_id,experience,shields,armour,combat_drones,level,credits,upgrade,reinforce_time,attack_started,race_id)
 								values
 								(' . $this->db->escapeNumber($this->getGameID()) .
@@ -1234,11 +1264,11 @@ 
 					$cdDamage = $this->doCDDamage(min($damage['MaxDamage'], $damage['Armour']));
 					$damage['Armour'] -= $cdDamage;
 					$damage['MaxDamage'] -= $cdDamage;
-					if (!$this->hasCDs() && ($cdDamage == 0 || $damage['Rollover']))
-						$armourDamage = $this->doArmourDamage(min($damage['MaxDamage'], $damage['Armour']));
+					if (!$this->hasCDs() && ($cdDamage == 0 || $damage['Rollover'])) {
+											$armourDamage = $this->doArmourDamage(min($damage['MaxDamage'], $damage['Armour']));
+					}
 				}
-			}
-			else { //hit drones behind shields
+			} else { //hit drones behind shields
 				$cdDamage = $this->doCDDamage(IFloor(min($damage['MaxDamage'], $damage['Armour']) * DRONES_BEHIND_SHIELDS_DAMAGE_PERCENT));
 			}
 		}
@@ -1334,8 +1364,11 @@ 
 		
 		// News Entry
 		$news = $this->getDisplayName() . ' has been successfully raided by ';
-		if ($killer->hasAlliance()) $news .= 'the members of <span class="yellow">' . $killer->getAllianceBBLink() . '</span>';
-		else $news .= $killer->getBBLink();
+		if ($killer->hasAlliance()) {
+			$news .= 'the members of <span class="yellow">' . $killer->getAllianceBBLink() . '</span>';
+		} else {
+			$news .= $killer->getBBLink();
+		}
 		$this->db->query('INSERT INTO news (game_id, time, news_message, type,killer_id,killer_alliance,dead_id) VALUES (' . $this->db->escapeNumber($this->getGameID()) . ', ' . $this->db->escapeNumber(TIME) . ', ' . $this->db->escapeString($news) . ', \'REGULAR\',' . $this->db->escapeNumber($killer->getAccountID()) . ',' . $this->db->escapeNumber($killer->getAllianceID()) . ',' . $this->db->escapeNumber(ACCOUNT_ID_PORT) . ')');
 		// Killer gets a relations change and a bounty if port is taken
 		$return['KillerBounty'] = $killer->getExperience() * $this->getLevel();
@@ -1351,8 +1384,9 @@ 
 
 	public function hasX(/*Object*/ $x) {
 		if (is_array($x) && $x['Type'] == 'Good') { // instanceof Good) - No Good class yet, so array is the best we can do
-			if (isset($x['ID']))
-				return $this->hasGood($x['ID'], isset($x['TransactionType']) ? $x['TransactionType'] : false);
+			if (isset($x['ID'])) {
+							return $this->hasGood($x['ID'], isset($x['TransactionType']) ? $x['TransactionType'] : false);
+			}
 		}
 		return false;
 	}

engine/Default/rankings_alliance_vs_alliance.php

Braces +17 added lines, -10 removed lines

@@ -62,8 +62,7 @@ 
 			} elseif ($showBold) {
 				$style = 'class="bold"';
 			}
-		}
-		else {
+		} else {
 			$db2->query('SELECT kills FROM alliance_vs_alliance
 						WHERE alliance_id_2 = ' . $db2->escapeNumber($curr_id) . '
 							AND alliance_id_1 = ' . $db2->escapeNumber($id) . '
@@ -104,11 +103,15 @@ 
 	if ($id > 0) {
 		$killer_alliance = SmrAlliance::getAlliance($id, $player->getGameID());
 		$alliance_name = $killer_alliance->getAllianceDisplayName();
+	} elseif ($id == 0) {
+		$alliance_name = 'No Alliance';
+	} elseif ($id == ALLIANCE_VS_FORCES) {
+		$alliance_name = '<span class="yellow">Forces</span>';
+	} elseif ($id == ALLIANCE_VS_PLANETS) {
+		$alliance_name = '<span class="yellow">Planets</span>';
+	} elseif ($id == ALLIANCE_VS_PORTS) {
+		$alliance_name = '<span class="yellow">Ports</span>';
 	}
-	elseif ($id == 0) $alliance_name = 'No Alliance';
-	elseif ($id == ALLIANCE_VS_FORCES) $alliance_name = '<span class="yellow">Forces</span>';
-	elseif ($id == ALLIANCE_VS_PLANETS) $alliance_name = '<span class="yellow">Planets</span>';
-	elseif ($id == ALLIANCE_VS_PORTS) $alliance_name = '<span class="yellow">Ports</span>';
 
 	$kills[] = [
 		'Name' => $alliance_name,
@@ -126,11 +129,15 @@ 
 	if ($id > 0) {
 		$killer_alliance = SmrAlliance::getAlliance($id, $player->getGameID());
 		$alliance_name = $killer_alliance->getAllianceDisplayName();
+	} elseif ($id == 0) {
+		$alliance_name = 'No Alliance';
+	} elseif ($id == ALLIANCE_VS_FORCES) {
+		$alliance_name = '<span class="yellow">Forces</span>';
+	} elseif ($id == ALLIANCE_VS_PLANETS) {
+		$alliance_name = '<span class="yellow">Planets</span>';
+	} elseif ($id == ALLIANCE_VS_PORTS) {
+		$alliance_name = '<span class="yellow">Ports</span>';
 	}
-	elseif ($id == 0) $alliance_name = 'No Alliance';
-	elseif ($id == ALLIANCE_VS_FORCES) $alliance_name = '<span class="yellow">Forces</span>';
-	elseif ($id == ALLIANCE_VS_PLANETS) $alliance_name = '<span class="yellow">Planets</span>';
-	elseif ($id == ALLIANCE_VS_PORTS) $alliance_name = '<span class="yellow">Ports</span>';
 
 	$deaths[] = [
 		'Name' => $alliance_name,

lib/Default/AbstractSmrPlayer.class.php

Braces +214 added lines, -147 removed lines

@@ -76,8 +76,9 @@ 
 		return $this->getNewbieTurns() > 0;
 	}
 	public function setNewbieTurns($newbieTurns) {
-		if ($this->newbieTurns == $newbieTurns)
-			return;
+		if ($this->newbieTurns == $newbieTurns) {
+					return;
+		}
 		$this->newbieTurns = $newbieTurns;
 		$this->hasChanged = true;
 	}
@@ -87,8 +88,9 @@ 
 	}
 
 	public function setShipTypeID($shipID) {
-		if ($this->shipID == $shipID)
-			return;
+		if ($this->shipID == $shipID) {
+					return;
+		}
 		$this->shipID = $shipID;
 		$this->hasChanged = true;
 	}
@@ -198,8 +200,9 @@ 
 		}
 
 		$ship = $this->getShip();
-		if ($ship->hasIllegalGoods())
-			return false;
+		if ($ship->hasIllegalGoods()) {
+					return false;
+		}
 
 		if ($ship->getAttackRating() <= $this->getSafeAttackRating()) {
 			foreach ($sector->getFedRaceIDs() as $fedRaceID) {
@@ -240,8 +243,9 @@ 
 	}
 
 	public function setDead($bool) {
-		if ($this->dead == $bool)
-			return;
+		if ($this->dead == $bool) {
+					return;
+		}
 		$this->dead = $bool;
 		$this->hasChanged = true;
 	}
@@ -251,14 +255,16 @@ 
 	}
 
 	public function increaseKills($kills) {
-		if ($kills < 0)
-			throw new Exception('Trying to increase negative kills.');
+		if ($kills < 0) {
+					throw new Exception('Trying to increase negative kills.');
+		}
 		$this->setKills($this->kills + $kills);
 	}
 
 	public function setKills($kills) {
-		if ($this->kills == $kills)
-			return;
+		if ($this->kills == $kills) {
+					return;
+		}
 		$this->kills = $kills;
 		$this->hasChanged = true;
 	}
@@ -268,14 +274,16 @@ 
 	}
 
 	public function increaseDeaths($deaths) {
-		if ($deaths < 0)
-			throw new Exception('Trying to increase negative deaths.');
+		if ($deaths < 0) {
+					throw new Exception('Trying to increase negative deaths.');
+		}
 		$this->setDeaths($this->getDeaths() + $deaths);
 	}
 
 	public function setDeaths($deaths) {
-		if ($this->deaths == $deaths)
-			return;
+		if ($this->deaths == $deaths) {
+					return;
+		}
 		$this->deaths = $deaths;
 		$this->hasChanged = true;
 	}
@@ -297,24 +305,29 @@ 
 	}
 
 	public function increaseAlignment($align) {
-		if ($align < 0)
-			throw new Exception('Trying to increase negative align.');
-		if ($align == 0)
-			return;
+		if ($align < 0) {
+					throw new Exception('Trying to increase negative align.');
+		}
+		if ($align == 0) {
+					return;
+		}
 		$align += $this->alignment;
 		$this->setAlignment($align);
 	}
 	public function decreaseAlignment($align) {
-		if ($align < 0)
-			throw new Exception('Trying to decrease negative align.');
-		if ($align == 0)
-			return;
+		if ($align < 0) {
+					throw new Exception('Trying to decrease negative align.');
+		}
+		if ($align == 0) {
+					return;
+		}
 		$align = $this->alignment - $align;
 		$this->setAlignment($align);
 	}
 	public function setAlignment($align) {
-		if ($this->alignment == $align)
-			return;
+		if ($this->alignment == $align) {
+					return;
+		}
 		$this->alignment = $align;
 		$this->hasChanged = true;
 	}
@@ -332,8 +345,9 @@ 
 	 * This value is rounded because it is used primarily in HTML img widths.
 	 */
 	public function getNextLevelPercentAcquired() : int {
-		if ($this->getNextLevelExperience() == $this->getThisLevelExperience())
-			return 100;
+		if ($this->getNextLevelExperience() == $this->getThisLevelExperience()) {
+					return 100;
+		}
 		return max(0, min(100, IRound(($this->getExperience() - $this->getThisLevelExperience()) / ($this->getNextLevelExperience() - $this->getThisLevelExperience()) * 100)));
 	}
 
@@ -343,8 +357,10 @@ 
 
 	public function getNextLevelExperience() {
 		$LEVELS_REQUIREMENTS = Globals::getLevelRequirements();
-		if (!isset($LEVELS_REQUIREMENTS[$this->getLevelID() + 1]))
-			return $this->getThisLevelExperience(); //Return current level experience if on last level.
+		if (!isset($LEVELS_REQUIREMENTS[$this->getLevelID() + 1])) {
+					return $this->getThisLevelExperience();
+		}
+		//Return current level experience if on last level.
 		return $LEVELS_REQUIREMENTS[$this->getLevelID() + 1]['Requirement'];
 	}
 
@@ -354,12 +370,15 @@ 
 	}
 
 	public function setExperience($experience) {
-		if ($this->experience == $experience)
-			return;
-		if ($experience < MIN_EXPERIENCE)
-			$experience = MIN_EXPERIENCE;
-		if ($experience > MAX_EXPERIENCE)
-			$experience = MAX_EXPERIENCE;
+		if ($this->experience == $experience) {
+					return;
+		}
+		if ($experience < MIN_EXPERIENCE) {
+					$experience = MIN_EXPERIENCE;
+		}
+		if ($experience > MAX_EXPERIENCE) {
+					$experience = MAX_EXPERIENCE;
+		}
 		$this->experience = $experience;
 		$this->hasChanged = true;
 
@@ -369,46 +388,57 @@ 
 	}
 
 	public function increaseCredits($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->credits;
 		$this->setCredits($credits);
 	}
 	public function decreaseCredits($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->credits - $credits;
 		$this->setCredits($credits);
 	}
 	public function setCredits($credits) {
-		if ($this->credits == $credits)
-			return;
-		if ($credits < 0)
-			throw new Exception('Trying to set negative credits.');
-		if ($credits > MAX_MONEY)
-			$credits = MAX_MONEY;
+		if ($this->credits == $credits) {
+					return;
+		}
+		if ($credits < 0) {
+					throw new Exception('Trying to set negative credits.');
+		}
+		if ($credits > MAX_MONEY) {
+					$credits = MAX_MONEY;
+		}
 		$this->credits = $credits;
 		$this->hasChanged = true;
 	}
 
 	public function increaseExperience($experience) {
-		if ($experience < 0)
-			throw new Exception('Trying to increase negative experience.');
-		if ($experience == 0)
-			return;
+		if ($experience < 0) {
+					throw new Exception('Trying to increase negative experience.');
+		}
+		if ($experience == 0) {
+					return;
+		}
 		$newExperience = $this->experience + $experience;
 		$this->setExperience($newExperience);
 		$this->increaseHOF($experience, array('Experience', 'Total', 'Gain'), HOF_PUBLIC);
 	}
 	public function decreaseExperience($experience) {
-		if ($experience < 0)
-			throw new Exception('Trying to decrease negative experience.');
-		if ($experience == 0)
-			return;
+		if ($experience < 0) {
+					throw new Exception('Trying to decrease negative experience.');
+		}
+		if ($experience == 0) {
+					return;
+		}
 		$newExperience = $this->experience - $experience;
 		$this->setExperience($newExperience);
 		$this->decreaseHOF($experience, array('Experience', 'Total', 'Loss'), HOF_PUBLIC);
@@ -419,8 +449,9 @@ 
 	}
 
 	public function setLandedOnPlanet($bool) {
-		if ($this->landedOnPlanet == $bool)
-			return;
+		if ($this->landedOnPlanet == $bool) {
+					return;
+		}
 		$this->landedOnPlanet = $bool;
 		$this->hasChanged = true;
 	}
@@ -434,7 +465,9 @@ 
 		if ($this->level === null) {
 			$LEVELS_REQUIREMENTS = Globals::getLevelRequirements();
 			foreach ($LEVELS_REQUIREMENTS as $level_id => $require) {
-				if ($this->getExperience() >= $require['Requirement']) continue;
+				if ($this->getExperience() >= $require['Requirement']) {
+					continue;
+				}
 				$this->level = $level_id - 1;
 				return $this->level;
 			}
@@ -512,8 +545,9 @@ 
 	}
 
 	public function setRaceID($raceID) {
-		if ($this->raceID == $raceID)
-			return;
+		if ($this->raceID == $raceID) {
+					return;
+		}
 		$this->raceID = $raceID;
 		$this->hasChanged = true;
 	}
@@ -535,8 +569,9 @@ 
 	}
 
 	protected function setAllianceID($ID) {
-		if ($this->allianceID == $ID)
-			return;
+		if ($this->allianceID == $ID) {
+					return;
+		}
 		$this->allianceID = $ID;
 		if ($this->allianceID != 0) {
 			$status = $this->hasNewbieStatus() ? 'NEWBIE' : 'VETERAN';
@@ -553,8 +588,7 @@ 
 	public function getAllianceDisplayName($linked = false, $includeAllianceID = false) {
 		if ($this->hasAlliance()) {
 			return $this->getAlliance()->getAllianceDisplayName($linked, $includeAllianceID);
-		}
-		else {
+		} else {
 			return 'No Alliance';
 		}
 	}
@@ -582,8 +616,9 @@ 
 	}
 
 	public function setCombatDronesKamikazeOnMines($bool) {
-		if ($this->combatDronesKamikazeOnMines == $bool)
-			return;
+		if ($this->combatDronesKamikazeOnMines == $bool) {
+					return;
+		}
 		$this->combatDronesKamikazeOnMines = $bool;
 		$this->hasChanged = true;
 	}
@@ -656,21 +691,24 @@ 
 	}
 
 	public function setMilitaryPayment($amount) {
-		if ($this->militaryPayment == $amount)
-			return;
+		if ($this->militaryPayment == $amount) {
+					return;
+		}
 		$this->militaryPayment = $amount;
 		$this->hasChanged = true;
 	}
 
 	public function increaseMilitaryPayment($amount) {
-		if ($amount < 0)
-			throw new Exception('Trying to increase negative military payment.');
+		if ($amount < 0) {
+					throw new Exception('Trying to increase negative military payment.');
+		}
 		$this->setMilitaryPayment($this->getMilitaryPayment() + $amount);
 	}
 
 	public function decreaseMilitaryPayment($amount) {
-		if ($amount < 0)
-			throw new Exception('Trying to decrease negative military payment.');
+		if ($amount < 0) {
+					throw new Exception('Trying to decrease negative military payment.');
+		}
 		$this->setMilitaryPayment($this->getMilitaryPayment() - $amount);
 	}
 
@@ -713,10 +751,11 @@ 
 
 	protected function getNextBountyID() : int {
 		$keys = array_keys($this->getBounties());
-		if (count($keys) > 0)
-			return max($keys) + 1;
-		else
-			return 0;
+		if (count($keys) > 0) {
+					return max($keys) + 1;
+		} else {
+					return 0;
+		}
 	}
 
 	protected function setBounty(array $bounty) : void {
@@ -731,22 +770,25 @@ 
 	}
 
 	public function increaseBountyAmount(int $bountyID, int $amount) : void {
-		if ($amount < 0)
-			throw new Exception('Trying to increase negative bounty.');
+		if ($amount < 0) {
+					throw new Exception('Trying to increase negative bounty.');
+		}
 		$this->setBountyAmount($this->getBountyAmount($bountyID) + $amount);
 	}
 
 	public function decreaseBountyAmount(int $bountyID, int $amount) : void {
-		if ($amount < 0)
-			throw new Exception('Trying to decrease negative bounty.');
+		if ($amount < 0) {
+					throw new Exception('Trying to decrease negative bounty.');
+		}
 		$this->setBountyAmount($this->getBountyAmount($bountyID) + $amount);
 	}
 
 	public function getCurrentBounty(string $type) : array {
 		$bounties = $this->getBounties();
 		foreach ($bounties as $bounty) {
-			if ($bounty['Claimer'] == 0 && $bounty['Type'] == $type)
-				return $bounty;
+			if ($bounty['Claimer'] == 0 && $bounty['Type'] == $type) {
+							return $bounty;
+			}
 		}
 		return $this->createBounty($type);
 	}
@@ -754,8 +796,9 @@ 
 	public function hasCurrentBounty(string $type) : bool {
 		$bounties = $this->getBounties();
 		foreach ($bounties as $bounty) {
-			if ($bounty['Claimer'] == 0 && $bounty['Type'] == $type)
-				return true;
+			if ($bounty['Claimer'] == 0 && $bounty['Type'] == $type) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -767,21 +810,24 @@ 
 
 	protected function setCurrentBountyAmount(string $type, int $amount) : void {
 		$bounty = $this->getCurrentBounty($type);
-		if ($bounty['Amount'] == $amount)
-			return;
+		if ($bounty['Amount'] == $amount) {
+					return;
+		}
 		$bounty['Amount'] = $amount;
 		$this->setBounty($bounty);
 	}
 
 	public function increaseCurrentBountyAmount(string $type, int $amount) : void {
-		if ($amount < 0)
-			throw new Exception('Trying to increase negative current bounty.');
+		if ($amount < 0) {
+					throw new Exception('Trying to increase negative current bounty.');
+		}
 		$this->setCurrentBountyAmount($type, $this->getCurrentBountyAmount($type) + $amount);
 	}
 
 	public function decreaseCurrentBountyAmount(string $type, int $amount) : void {
-		if ($amount < 0)
-			throw new Exception('Trying to decrease negative current bounty.');
+		if ($amount < 0) {
+					throw new Exception('Trying to decrease negative current bounty.');
+		}
 		$this->setCurrentBountyAmount($type, $this->getCurrentBountyAmount($type) - $amount);
 	}
 
@@ -792,21 +838,24 @@ 
 
 	protected function setCurrentBountySmrCredits(string $type, int $credits) : void {
 		$bounty = $this->getCurrentBounty($type);
-		if ($bounty['SmrCredits'] == $credits)
-			return;
+		if ($bounty['SmrCredits'] == $credits) {
+					return;
+		}
 		$bounty['SmrCredits'] = $credits;
 		$this->setBounty($bounty);
 	}
 
 	public function increaseCurrentBountySmrCredits(string $type, int $credits) : void {
-		if ($credits < 0)
-			throw new Exception('Trying to increase negative current bounty.');
+		if ($credits < 0) {
+					throw new Exception('Trying to increase negative current bounty.');
+		}
 		$this->setCurrentBountySmrCredits($type, $this->getCurrentBountySmrCredits($type) + $credits);
 	}
 
 	public function decreaseCurrentBountySmrCredits(string $type, int $credits) : void {
-		if ($credits < 0)
-			throw new Exception('Trying to decrease negative current bounty.');
+		if ($credits < 0) {
+					throw new Exception('Trying to decrease negative current bounty.');
+		}
 		$this->setCurrentBountySmrCredits($type, $this->getCurrentBountySmrCredits($type) - $credits);
 	}
 
@@ -824,51 +873,59 @@ 
 
 	public function getHOF(array $typeList = null) {
 		$this->getHOFData();
-		if ($typeList == null)
-			return $this->HOF;
+		if ($typeList == null) {
+					return $this->HOF;
+		}
 		$hof = $this->HOF;
 		foreach ($typeList as $type) {
-			if (!isset($hof[$type]))
-				return 0;
+			if (!isset($hof[$type])) {
+							return 0;
+			}
 			$hof = $hof[$type];
 		}
 		return $hof;
 	}
 
 	public function increaseHOF($amount, array $typeList, $visibility) {
-		if ($amount < 0)
-			throw new Exception('Trying to increase negative HOF: ' . implode(':', $typeList));
-		if ($amount == 0)
-			return;
+		if ($amount < 0) {
+					throw new Exception('Trying to increase negative HOF: ' . implode(':', $typeList));
+		}
+		if ($amount == 0) {
+					return;
+		}
 		$this->setHOF($this->getHOF($typeList) + $amount, $typeList, $visibility);
 	}
 
 	public function decreaseHOF($amount, array $typeList, $visibility) {
-		if ($amount < 0)
-			throw new Exception('Trying to decrease negative HOF: ' . implode(':', $typeList));
-		if ($amount == 0)
-			return;
+		if ($amount < 0) {
+					throw new Exception('Trying to decrease negative HOF: ' . implode(':', $typeList));
+		}
+		if ($amount == 0) {
+					return;
+		}
 		$this->setHOF($this->getHOF($typeList) - $amount, $typeList, $visibility);
 	}
 
 	public function setHOF($amount, array $typeList, $visibility) {
-		if (is_array($this->getHOF($typeList)))
-			throw new Exception('Trying to overwrite a HOF type: ' . implode(':', $typeList));
+		if (is_array($this->getHOF($typeList))) {
+					throw new Exception('Trying to overwrite a HOF type: ' . implode(':', $typeList));
+		}
 		if ($this->isNPC()) {
 			// Don't store HOF for NPCs.
 			return;
 		}
-		if ($this->getHOF($typeList) == $amount)
-			return;
-		if ($amount < 0)
-			$amount = 0;
+		if ($this->getHOF($typeList) == $amount) {
+					return;
+		}
+		if ($amount < 0) {
+					$amount = 0;
+		}
 		$this->getHOF();
 
 		$hofType = implode(':', $typeList);
 		if (!isset(self::$HOFVis[$hofType])) {
 			self::$hasHOFVisChanged[$hofType] = self::HOF_NEW;
-		}
-		else if (self::$HOFVis[$hofType] != $visibility) {
+		} else if (self::$HOFVis[$hofType] != $visibility) {
 			self::$hasHOFVisChanged[$hofType] = self::HOF_CHANGED;
 		}
 		self::$HOFVis[$hofType] = $visibility;
@@ -877,8 +934,9 @@ 
 		$hofChanged =& $this->hasHOFChanged;
 		$new = false;
 		foreach ($typeList as $type) {
-			if (!isset($hofChanged[$type]))
-				$hofChanged[$type] = array();
+			if (!isset($hofChanged[$type])) {
+							$hofChanged[$type] = array();
+			}
 			if (!isset($hof[$type])) {
 				$hof[$type] = array();
 				$new = true;
@@ -888,8 +946,9 @@ 
 		}
 		if ($hofChanged == null) {
 			$hofChanged = self::HOF_CHANGED;
-			if ($new)
-				$hofChanged = self::HOF_NEW;
+			if ($new) {
+							$hofChanged = self::HOF_NEW;
+			}
 		}
 		$hof = $amount;
 	}
@@ -954,8 +1013,9 @@ 
 	}
 
 	public function setLastActive($lastActive) {
-		if ($this->lastActive == $lastActive)
-			return;
+		if ($this->lastActive == $lastActive) {
+					return;
+		}
 		$this->lastActive = $lastActive;
 		$this->hasChanged = true;
 	}
@@ -965,8 +1025,9 @@ 
 	}
 
 	public function setLastCPLAction($time) {
-		if ($this->lastCPLAction == $time)
-			return;
+		if ($this->lastCPLAction == $time) {
+					return;
+		}
 		$this->lastCPLAction = $time;
 		$this->hasChanged = true;
 	}
@@ -1007,8 +1068,9 @@ 
 
 	protected function getMission($missionID) {
 		$missions = $this->getMissions();
-		if (isset($missions[$missionID]))
-			return $missions[$missionID];
+		if (isset($missions[$missionID])) {
+					return $missions[$missionID];
+		}
 		return false;
 	}
 
@@ -1067,8 +1129,9 @@ 
 	public function addMission($missionID, $step = 0) {
 		$this->getMissions();
 
-		if (isset($this->missions[$missionID]))
-			return;
+		if (isset($this->missions[$missionID])) {
+					return;
+		}
 		$sector = 0;
 
 		$mission = array(
@@ -1097,8 +1160,7 @@ 
 		if ($mission['On Step'] >= count(MISSIONS[$missionID]['Steps'])) {
 			// If we have completed this mission just use false to indicate no current task.
 			$currentStep = false;
-		}
-		else {
+		} else {
 			$currentStep = MISSIONS[$missionID]['Steps'][$mission['On Step']];
 			$currentStep['Text'] = str_replace(array('<Race>', '<Sector>', '<Starting Sector>', '<trader>'), array($this->getRaceID(), $mission['Sector'], $mission['Starting Sector'], $this->playerName), $currentStep['Text']);
 			if (isset($currentStep['Task'])) {
@@ -1106,8 +1168,7 @@ 
 			}
 			if (isset($currentStep['Level'])) {
 				$currentStep['Level'] = str_replace('<Player Level>', $this->getLevelID(), $currentStep['Level']);
-			}
-			else {
+			} else {
 				$currentStep['Level'] = 0;
 			}
 		}
@@ -1235,12 +1296,15 @@ 
 	}
 
 	public function canSee(AbstractSmrPlayer $otherPlayer) {
-		if (!$otherPlayer->getShip()->isCloaked())
-			return true;
-		if ($this->sameAlliance($otherPlayer))
-			return true;
-		if ($this->getExperience() >= $otherPlayer->getExperience())
-			return true;
+		if (!$otherPlayer->getShip()->isCloaked()) {
+					return true;
+		}
+		if ($this->sameAlliance($otherPlayer)) {
+					return true;
+		}
+		if ($this->getExperience() >= $otherPlayer->getExperience()) {
+					return true;
+		}
 		return false;
 	}
 
@@ -1293,10 +1357,12 @@ 
 	}
 
 	public function meetsAlignmentRestriction($restriction) {
-		if ($restriction < 0)
-			return $this->getAlignment() <= $restriction;
-		if ($restriction > 0)
-			return $this->getAlignment() >= $restriction;
+		if ($restriction < 0) {
+					return $this->getAlignment() <= $restriction;
+		}
+		if ($restriction > 0) {
+					return $this->getAlignment() >= $restriction;
+		}
 		return true;
 	}
 
@@ -1319,8 +1385,9 @@ 
 		if (!isset($this->visitedSectors)) {
 			$this->visitedSectors = array();
 			$this->db->query('SELECT sector_id FROM player_visited_sector WHERE ' . $this->SQL);
-			while ($this->db->nextRecord())
-				$this->visitedSectors[$this->db->getInt('sector_id')] = false;
+			while ($this->db->nextRecord()) {
+							$this->visitedSectors[$this->db->getInt('sector_id')] = false;
+			}
 		}
 		return !isset($this->visitedSectors[$sectorID]);
 	}

lib/Default/Routes/RouteGenerator.class.php

Braces +36 added lines, -30 removed lines

@@ -52,15 +52,16 @@ 
 	private static function getContinueRoutes(int $maxNumPorts, int $startSectorId, Route $routeToContinue, array $forwardRoutes, array $routeLists, bool $lastGoodIsNothing) : void {
 		foreach ($forwardRoutes as $currentStepRoute) {
 			$currentStepBuySector = $currentStepRoute->getBuySectorId();
-			if ($lastGoodIsNothing && ($lastGoodIsNothing = GOOD_NOTHING === $currentStepRoute->getGoodID()))
-				continue; // Don't do two nothings in a row
+			if ($lastGoodIsNothing && ($lastGoodIsNothing = GOOD_NOTHING === $currentStepRoute->getGoodID())) {
+							continue;
+			}
+			// Don't do two nothings in a row
 			if ($currentStepBuySector >= $startSectorId) { // Not already checked or back to start
 				if ($currentStepBuySector === $startSectorId) { // Route returns to start
 					$mpr = new MultiplePortRoute($routeToContinue, $currentStepRoute);
 					self::addExpRoute($mpr);
 					self::addMoneyRoute($mpr);
-				}
-				else if ($maxNumPorts > 1 && !$routeToContinue->containsPort($currentStepBuySector)) {
+				} else if ($maxNumPorts > 1 && !$routeToContinue->containsPort($currentStepBuySector)) {
 					$mpr = new MultiplePortRoute($routeToContinue, $currentStepRoute);
 					self::getContinueRoutes($maxNumPorts - 1, $startSectorId, $mpr, $routeLists[$currentStepBuySector], $routeLists, $lastGoodIsNothing);
 				}
@@ -76,17 +77,21 @@ 
 				echo 'Error with Race ID: '.$sectors[$currentSectorId]->getPort()->getRaceID();
 				continue;
 			}
-			if($races[$raceID]===false)
-				continue;
+			if($races[$raceID]===false) {
+							continue;
+			}
 			$rl = array();
 			foreach ($d as $targetSectorId => $distance) {
-				if (!$races[$sectors[$targetSectorId]->getPort()->getRaceID()])
-					continue;
-				if($routesForPort!==-1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort)
-					continue;
+				if (!$races[$sectors[$targetSectorId]->getPort()->getRaceID()]) {
+									continue;
+				}
+				if($routesForPort!==-1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort) {
+									continue;
+				}
 
-				if ($goods[GOOD_NOTHING]===true)
-					$rl[] = new OneWayRoute($currentSectorId, $targetSectorId, $raceID, $sectors[$targetSectorId]->getPort()->getRaceID(), 0, 0, $distance, GOOD_NOTHING);
+				if ($goods[GOOD_NOTHING]===true) {
+									$rl[] = new OneWayRoute($currentSectorId, $targetSectorId, $raceID, $sectors[$targetSectorId]->getPort()->getRaceID(), 0, 0, $distance, GOOD_NOTHING);
+				}
 
 				foreach (\Globals::getGoods() as $goodId => $value) {
 					if ($goods[$goodId]===true) {
@@ -105,13 +110,16 @@ 
 	public static function generateOneWayRoutes(array $sectors, array $distances, array $goods, array $races, int $routesForPort) : array {
 		self::initialize();
 		foreach ($distances as $currentSectorId => $d) {
-			if ($races[$sectors[$currentSectorId]->getPort()->getRaceID()]===false)
-				continue;
+			if ($races[$sectors[$currentSectorId]->getPort()->getRaceID()]===false) {
+							continue;
+			}
 			foreach ($d as $targetSectorId => $distance) {
-				if ($races[$sectors[$targetSectorId]->getPort()->getRaceID()]===false)
-					continue;
-				if($routesForPort!==-1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort)
-					continue;
+				if ($races[$sectors[$targetSectorId]->getPort()->getRaceID()]===false) {
+									continue;
+				}
+				if($routesForPort!==-1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort) {
+									continue;
+				}
 
 				foreach (\Globals::getGoods() as $goodId => $value) {
 					if ($goods[$goodId]===true) {
@@ -162,15 +170,14 @@ 
 		foreach (self::$expRoutes as $multi => $routesByMulti) {
 			if(count($routesByMulti)+$i < $trimToBestXRoutes) {
 				$i += count($routesByMulti);
-			}
-			else if($i > $trimToBestXRoutes) {
+			} else if($i > $trimToBestXRoutes) {
 				unset(self::$expRoutes[$multi]);
-			}
-			else {
+			} else {
 				foreach($routesByMulti as $key => $value) {
 					$i++;
-					if($i < $trimToBestXRoutes)
-						continue;
+					if($i < $trimToBestXRoutes) {
+											continue;
+					}
 					if($i === $trimToBestXRoutes) {
 						self::$dontAddWorseThan[self::EXP_ROUTE] = $multi;
 						continue;
@@ -185,16 +192,15 @@ 
 		foreach (self::$moneyRoutes as $multi => $routesByMulti) {
 			if(count($routesByMulti)+$i < $trimToBestXRoutes) {
 				$i += count($routesByMulti);
-			}
-			else if($i > $trimToBestXRoutes) {
+			} else if($i > $trimToBestXRoutes) {
 				unset(self::$moneyRoutes[$multi]);
 				continue;
-			}
-			else {
+			} else {
 				foreach($routesByMulti as $key => $value) {
 					$i++;
-					if($i < $trimToBestXRoutes)
-						continue;
+					if($i < $trimToBestXRoutes) {
+											continue;
+					}
 					if($i === $trimToBestXRoutes) {
 						self::$dontAddWorseThan[self::MONEY_ROUTE] = $multi;
 						continue;

lib/Default/Routes/OneWayRoute.class.php

Braces +5 added lines, -4 removed lines

@@ -82,10 +82,11 @@
 	}
 
 	public function getTurnsForRoute() : int {
-		if ($this->goodId === GOOD_NOTHING)
-			$tradeTurns = 0;
-		else
-			$tradeTurns = 2 * TURNS_PER_TRADE;
+		if ($this->goodId === GOOD_NOTHING) {
+					$tradeTurns = 0;
+		} else {
+					$tradeTurns = 2 * TURNS_PER_TRADE;
+		}
 		return $this->distance->getTurns() + $tradeTurns;
 	}
 

lib/Default/AbstractSmrAccount.class.php

Braces +226 added lines, -165 removed lines

@@ -99,8 +99,9 @@ 
 		if (empty($login)) { return null; }
 		$db = new SmrMySqlDatabase();
 		$db->query('SELECT account_id FROM account WHERE login = '.$db->escapeString($login).' LIMIT 1');
-		if($db->nextRecord())
-			return self::getAccount($db->getInt('account_id'), $forceUpdate);
+		if($db->nextRecord()) {
+					return self::getAccount($db->getInt('account_id'), $forceUpdate);
+		}
 		$return = null;
 		return $return;
 	}
@@ -235,10 +236,10 @@ 
 			$this->template			= $row['template'];
 			$this->colourScheme		= $row['colour_scheme'];
 
-			if(empty($this->hofName))
-				$this->hofName=$this->login;
-		}
-		else {
+			if(empty($this->hofName)) {
+							$this->hofName=$this->login;
+			}
+		} else {
 			throw new AccountNotFoundException('Account ID '.$accountID.' does not exist!');
 		}
 	}
@@ -260,8 +261,7 @@ 
 				'Reason' => $this->db->getField('reason'),
 				'ReasonID' => $this->db->getInt('reason_id')
 			);
-		}
-		else {
+		} else {
 			return false;
 		}
 	}
@@ -317,15 +317,18 @@ 
 		if ($curr_ip != 'unknown' && $curr_ip != 'unknown...' && $curr_ip != 'unknown, unknown') {
 			$curr_ip = $fi.'.'.$se.'.'.$th.'.'.$fo;
 			$host = gethostbyaddr($curr_ip);
-		} else $host = 'unknown';
+		} else {
+			$host = 'unknown';
+		}
 
 		// save...first make sure there isn't one for these keys (someone could double click and get error)
 		$this->db->query('REPLACE INTO account_has_ip (account_id, time, ip, host) VALUES ('.$this->db->escapeNumber($this->account_id).', '.$this->db->escapeNumber(TIME).', '.$this->db->escapeString($curr_ip).', '.$this->db->escapeString($host).')');
 	}
 
 	public function updateLastLogin() {
-		if($this->last_login == TIME)
-			return;
+		if($this->last_login == TIME) {
+					return;
+		}
 		$this->last_login = TIME;
 		$this->hasChanged = true;
 		$this->update();
@@ -336,8 +339,9 @@ 
 	}
 
 	public function setLoggingEnabled($bool) {
-		if($this->logging==$bool)
-			return;
+		if($this->logging==$bool) {
+					return;
+		}
 		$this->logging=$bool;
 		$this->hasChanged = true;
 		$this->update();
@@ -386,12 +390,14 @@ 
 
 	public function getHOF(array $typeList = null) {
 		$this->getHOFData();
-		if($typeList==null)
-			return $this->HOF;
+		if($typeList==null) {
+					return $this->HOF;
+		}
 		$hof=$this->HOF;
 		foreach($typeList as $type) {
-			if(!isset($hof[$type]))
-				return 0;
+			if(!isset($hof[$type])) {
+							return 0;
+			}
 			$hof = $hof[$type];
 		}
 		return $hof;
@@ -399,10 +405,11 @@ 
 
 	public function getRankName() {
 		$rankings = Globals::getUserRanking();
-		if(isset($rankings[$this->getRank()]))
-			return $rankings[$this->getRank()];
-		else
-			return end($rankings);
+		if(isset($rankings[$this->getRank()])) {
+					return $rankings[$this->getRank()];
+		} else {
+					return end($rankings);
+		}
 	}
 
 	public function getScore() {
@@ -418,15 +425,17 @@ 
 
 	public function getIndividualScores(SmrPlayer $player = null) {
 		$gameID=0;
-		if($player!=null)
-			$gameID = $player->getGameID();
+		if($player!=null) {
+					$gameID = $player->getGameID();
+		}
 		if(!isset($this->individualScores[$gameID])) {
 			$this->individualScores[$gameID] = array();
 			foreach(self::USER_RANKINGS_SCORE as $statScore) {
-				if($player==null)
-					$stat = $this->getHOF($statScore[0]);
-				else
-					$stat = $player->getHOF($statScore[0]);
+				if($player==null) {
+									$stat = $this->getHOF($statScore[0]);
+				} else {
+									$stat = $player->getHOF($statScore[0]);
+				}
 				$this->individualScores[$gameID][]=array('Stat'=>$statScore[0],'Score'=>pow($stat*$statScore[1],self::USER_RANKINGS_EACH_STAT_POW)*$statScore[2]);
 			}
 		}
@@ -435,16 +444,19 @@ 
 
 	public function getRank() : int {
 		$rank = ICeil(pow($this->getScore(),self::USER_RANKINGS_TOTAL_SCORE_POW)/self::USER_RANKINGS_RANK_BOUNDARY);
-		if($rank<1)
-			$rank=1;
-		if($rank > $this->maxRankAchieved)
-			$this->updateMaxRankAchieved($rank);
+		if($rank<1) {
+					$rank=1;
+		}
+		if($rank > $this->maxRankAchieved) {
+					$this->updateMaxRankAchieved($rank);
+		}
 		return $rank;
 	}
 
 	protected function updateMaxRankAchieved($rank) {
-		if($rank <= $this->maxRankAchieved)
-			throw new Exception('Trying to set max rank achieved to a lower value: ' . $rank);
+		if($rank <= $this->maxRankAchieved) {
+					throw new Exception('Trying to set max rank achieved to a lower value: ' . $rank);
+		}
 		$delta = $rank - $this->maxRankAchieved;
 		if($this->hasReferrer()) {
 			$this->getReferrer()->increaseSmrRewardCredits($delta * CREDITS_PER_DOLLAR);
@@ -491,12 +503,15 @@ 
 	}
 
 	public function decreaseTotalSmrCredits($totalCredits) {
-		if($totalCredits==0)
-			return;
-		if($totalCredits<0)
-			throw new Exception('You cannot use negative total credits');
-		if($totalCredits>$this->getTotalSmrCredits())
-			throw new Exception('You do not have that many credits in total to use');
+		if($totalCredits==0) {
+					return;
+		}
+		if($totalCredits<0) {
+					throw new Exception('You cannot use negative total credits');
+		}
+		if($totalCredits>$this->getTotalSmrCredits()) {
+					throw new Exception('You do not have that many credits in total to use');
+		}
 
 		$rewardCredits=$this->rewardCredits;
 		$credits=$this->credits;
@@ -505,10 +520,11 @@ 
 			$credits+=$rewardCredits;
 			$rewardCredits=0;
 		}
-		if($this->credits==0 && $this->rewardCredits==0)
-			$this->db->query('REPLACE INTO account_has_credits (account_id, credits_left, reward_credits) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).','.$this->db->escapeNumber($rewardCredits).')');
-		else
-			$this->db->query('UPDATE account_has_credits SET credits_left='.$this->db->escapeNumber($credits).', reward_credits='.$this->db->escapeNumber($rewardCredits).' WHERE '.$this->SQL.' LIMIT 1');
+		if($this->credits==0 && $this->rewardCredits==0) {
+					$this->db->query('REPLACE INTO account_has_credits (account_id, credits_left, reward_credits) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).','.$this->db->escapeNumber($rewardCredits).')');
+		} else {
+					$this->db->query('UPDATE account_has_credits SET credits_left='.$this->db->escapeNumber($credits).', reward_credits='.$this->db->escapeNumber($rewardCredits).' WHERE '.$this->SQL.' LIMIT 1');
+		}
 		$this->credits=$credits;
 		$this->rewardCredits=$rewardCredits;
 	}
@@ -524,48 +540,59 @@ 
 	}
 
 	public function setSmrCredits($credits) {
-		if($this->getSmrCredits()==$credits)
-			return;
-		if($this->credits==0 && $this->rewardCredits==0)
-			$this->db->query('REPLACE INTO account_has_credits (account_id, credits_left) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).')');
-		else
-			$this->db->query('UPDATE account_has_credits SET credits_left='.$this->db->escapeNumber($credits).' WHERE '.$this->SQL.' LIMIT 1');
+		if($this->getSmrCredits()==$credits) {
+					return;
+		}
+		if($this->credits==0 && $this->rewardCredits==0) {
+					$this->db->query('REPLACE INTO account_has_credits (account_id, credits_left) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).')');
+		} else {
+					$this->db->query('UPDATE account_has_credits SET credits_left='.$this->db->escapeNumber($credits).' WHERE '.$this->SQL.' LIMIT 1');
+		}
 		$this->credits=$credits;
 	}
 
 	public function increaseSmrCredits($credits) {
-		if($credits==0)
-			return;
-		if($credits<0)
-			throw new Exception('You cannot gain negative credits');
+		if($credits==0) {
+					return;
+		}
+		if($credits<0) {
+					throw new Exception('You cannot gain negative credits');
+		}
 		$this->setSmrCredits($this->getSmrCredits()+$credits);
 	}
 
 	public function decreaseSmrCredits($credits) {
-		if($credits==0)
-			return;
-		if($credits<0)
-			throw new Exception('You cannot use negative credits');
-		if($credits>$this->getSmrCredits())
-			throw new Exception('You cannot use more credits than you have');
+		if($credits==0) {
+					return;
+		}
+		if($credits<0) {
+					throw new Exception('You cannot use negative credits');
+		}
+		if($credits>$this->getSmrCredits()) {
+					throw new Exception('You cannot use more credits than you have');
+		}
 		$this->setSmrCredits($this->getSmrCredits()-$credits);
 	}
 
 	public function setSmrRewardCredits($credits) {
-		if($this->getSmrRewardCredits()==$credits)
-			return;
-		if($this->credits==0 && $this->rewardCredits==0)
-			$this->db->query('REPLACE INTO account_has_credits (account_id, reward_credits) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).')');
-		else
-			$this->db->query('UPDATE account_has_credits SET reward_credits='.$this->db->escapeNumber($credits).' WHERE '.$this->SQL.' LIMIT 1');
+		if($this->getSmrRewardCredits()==$credits) {
+					return;
+		}
+		if($this->credits==0 && $this->rewardCredits==0) {
+					$this->db->query('REPLACE INTO account_has_credits (account_id, reward_credits) VALUES('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($credits).')');
+		} else {
+					$this->db->query('UPDATE account_has_credits SET reward_credits='.$this->db->escapeNumber($credits).' WHERE '.$this->SQL.' LIMIT 1');
+		}
 		$this->rewardCredits=$credits;
 	}
 
 	public function increaseSmrRewardCredits($credits) {
-		if($credits==0)
-			return;
-		if($credits<0)
-			throw new Exception('You cannot gain negative reward credits');
+		if($credits==0) {
+					return;
+		}
+		if($credits<0) {
+					throw new Exception('You cannot gain negative reward credits');
+		}
 		$this->setSmrRewardCredits($this->getSmrRewardCredits()+$credits);
 	}
 
@@ -601,8 +628,9 @@ 
 	}
 
 	public function hasOldAccountID($dbName=false) {
-		if($dbName===false)
-			return count($this->getOldAccountIDs())!=0;
+		if($dbName===false) {
+					return count($this->getOldAccountIDs())!=0;
+		}
 		return $this->getOldAccountID($dbName)!=0;
 	}
 
@@ -681,8 +709,9 @@ 
 	}
 
 	public function setFontSize($size) {
-		if($this->fontSize==$size)
-			return;
+		if($this->fontSize==$size) {
+					return;
+		}
 		$this->fontSize = $size;
 		$this->hasChanged = true;
 		$this->update();
@@ -695,8 +724,9 @@ 
 
 	// sets the extra CSS file linked in preferences
 	public function setCssLink($link) {
-		if($this->cssLink==$link)
-			return;
+		if($this->cssLink==$link) {
+					return;
+		}
 		$this->cssLink = $link;
 		$this->hasChanged = true;
 		$this->update();
@@ -707,10 +737,12 @@ 
 	}
 
 	public function setTemplate($template) {
-		if($this->template==$template)
-			return;
-		if(!in_array($template,array_keys(Globals::getAvailableTemplates())))
-			throw new Exception('Template not allowed: '.$template);
+		if($this->template==$template) {
+					return;
+		}
+		if(!in_array($template,array_keys(Globals::getAvailableTemplates()))) {
+					throw new Exception('Template not allowed: '.$template);
+		}
 		$this->db->query('UPDATE account SET template = ' . $this->db->escapeString($template) . ' WHERE '.$this->SQL.' LIMIT 1');
 		$this->template = $template;
 		$colourSchemes = Globals::getAvailableColourSchemes($template);
@@ -722,10 +754,12 @@ 
 	}
 
 	public function setColourScheme($colourScheme) {
-		if($this->colourScheme==$colourScheme)
-			return;
-		if(!in_array($colourScheme,array_keys(Globals::getAvailableColourSchemes($this->getTemplate()))))
-			throw new Exception('Colour scheme not allowed: '.$colourScheme);
+		if($this->colourScheme==$colourScheme) {
+					return;
+		}
+		if(!in_array($colourScheme,array_keys(Globals::getAvailableColourSchemes($this->getTemplate())))) {
+					throw new Exception('Colour scheme not allowed: '.$colourScheme);
+		}
 		$this->colourScheme = $colourScheme;
 		$this->hasChanged = true;
 		$this->update();
@@ -759,8 +793,9 @@ 
 	}
 
 	public function setHofName($name) {
-		if($this->hofName==$name)
-			return;
+		if($this->hofName==$name) {
+					return;
+		}
 		$this->hofName = $name;
 		$this->hasChanged = true;
 		$this->update();
@@ -771,8 +806,9 @@ 
 	}
 
 	public function setIrcNick($nick) {
-		if($this->ircNick==$nick)
-			return;
+		if($this->ircNick==$nick) {
+					return;
+		}
 		$this->ircNick = $nick;
 		$this->hasChanged = true;
 		$this->update();
@@ -800,8 +836,9 @@ 
 	}
 
 	public function setShortDateFormat($format) {
-		if($this->dateShort==$format)
-			return;
+		if($this->dateShort==$format) {
+					return;
+		}
 		$this->dateShort = $format;
 		$this->hasChanged = true;
 		$this->update();
@@ -812,8 +849,9 @@ 
 	}
 
 	public function setShortTimeFormat($format) {
-		if($this->timeShort==$format)
-			return;
+		if($this->timeShort==$format) {
+					return;
+		}
 		$this->timeShort = $format;
 		$this->hasChanged = true;
 		$this->update();
@@ -824,16 +862,18 @@ 
 	}
 
 	protected function setValidationCode($code) {
-		if($this->validation_code == $code)
-			return;
+		if($this->validation_code == $code) {
+					return;
+		}
 		$this->validation_code=$code;
 		$this->hasChanged=true;
 		$this->update();
 	}
 
 	public function setValidated($bool) {
-		if($this->validated == $bool)
-			return;
+		if($this->validated == $bool) {
+					return;
+		}
 		$this->validated = $bool;
 		$this->hasChanged = true;
 		$this->update();
@@ -906,8 +946,9 @@ 
 	}
 
 	protected function setPasswordReset($passwordReset) {
-		if($this->passwordReset == $passwordReset)
-			return;
+		if($this->passwordReset == $passwordReset) {
+					return;
+		}
 		$this->passwordReset=$passwordReset;
 		$this->hasChanged=true;
 		$this->update();
@@ -918,8 +959,9 @@ 
 	}
 
 	public function setDisplayShipImages($yesNo) {
-		if($this->images == $yesNo)
-			return;
+		if($this->images == $yesNo) {
+					return;
+		}
 		$this->images = $yesNo;
 		$this->hasChanged = true;
 		$this->update();
@@ -930,8 +972,9 @@ 
 	}
 
 	public function setUseAJAX($bool) {
-		if($this->useAJAX == $bool)
-			return;
+		if($this->useAJAX == $bool) {
+					return;
+		}
 		$this->useAJAX=$bool;
 		$this->hasChanged=true;
 		$this->update();
@@ -942,8 +985,9 @@ 
 	}
 
 	public function setDefaultCSSEnabled($bool) {
-		if($this->defaultCSSEnabled == $bool)
-			return;
+		if($this->defaultCSSEnabled == $bool) {
+					return;
+		}
 		$this->defaultCSSEnabled=$bool;
 		$this->hasChanged=true;
 		$this->update();
@@ -953,8 +997,7 @@ 
 		if($hotkeyType!==false) {
 			if(isset($this->hotkeys[$hotkeyType])) {
 				return $this->hotkeys[$hotkeyType];
-			}
-			else {
+			} else {
 				return array();
 			}
 		}
@@ -962,8 +1005,9 @@ 
 	}
 
 	public function setHotkey($hotkeyType,$binding) {
-		if($this->getHotkeys($hotkeyType) == $binding)
-			return;
+		if($this->getHotkeys($hotkeyType) == $binding) {
+					return;
+		}
 		$this->hotkeys[$hotkeyType] = $binding;
 		$this->hasChanged=true;
 		$this->update();
@@ -978,26 +1022,31 @@ 
 	}
 
 	public function setMessageNotifications($messageTypeID,$num) {
-		if($this->getMessageNotifications($messageTypeID) == $num)
-			return;
+		if($this->getMessageNotifications($messageTypeID) == $num) {
+					return;
+		}
 		$this->messageNotifications[$messageTypeID]=$num;
 		$this->hasChanged=true;
 		$this->update();
 	}
 
 	public function increaseMessageNotifications($messageTypeID,$num) {
-		if($num==0)
-			return;
-		if($num<0)
-			throw new Exception('You cannot increase by a negative amount');
+		if($num==0) {
+					return;
+		}
+		if($num<0) {
+					throw new Exception('You cannot increase by a negative amount');
+		}
 		$this->setMessageNotifications($messageTypeID, $this->getMessageNotifications($messageTypeID) + $num);
 	}
 
 	public function decreaseMessageNotifications($messageTypeID,$num) {
-		if($num==0)
-			return;
-		if($num<0)
-			throw new Exception('You cannot decrease by a negative amount');
+		if($num==0) {
+					return;
+		}
+		if($num<0) {
+					throw new Exception('You cannot decrease by a negative amount');
+		}
 		$this->setMessageNotifications($messageTypeID, $this->getMessageNotifications($messageTypeID) - $num);
 	}
 
@@ -1006,8 +1055,9 @@ 
 	}
 
 	public function setCenterGalaxyMapOnPlayer($bool) {
-		if($this->centerGalaxyMapOnPlayer == $bool)
-			return;
+		if($this->centerGalaxyMapOnPlayer == $bool) {
+					return;
+		}
 		$this->centerGalaxyMapOnPlayer=$bool;
 		$this->hasChanged=true;
 		$this->update();
@@ -1022,8 +1072,9 @@ 
 	}
 
 	public function setMailBanned($time) {
-		if($this->mailBanned == $time)
-			return;
+		if($this->mailBanned == $time) {
+					return;
+		}
 		$this->mailBanned=$time;
 		$this->hasChanged=true;
 	}
@@ -1077,53 +1128,59 @@ 
 
 	public function setPoints($numPoints,$lastUpdate=false) {
 		$numPoints = max($numPoints,0);
-		if($this->getPoints()==$numPoints)
-			return;
-		if ($this->points==0)
-			$this->db->query('INSERT INTO account_has_points (account_id, points, last_update) VALUES ('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($numPoints).', '.$this->db->escapeNumber($lastUpdate?$lastUpdate:TIME).')');
-		else if($numPoints<=0)
-			$this->db->query('DELETE FROM account_has_points WHERE '.$this->SQL.' LIMIT 1');
-		else
-			$this->db->query('UPDATE account_has_points SET points = '.$this->db->escapeNumber($numPoints).($lastUpdate ? ', last_update = '.$this->db->escapeNumber(TIME) : '').' WHERE '.$this->SQL.' LIMIT 1');
+		if($this->getPoints()==$numPoints) {
+					return;
+		}
+		if ($this->points==0) {
+					$this->db->query('INSERT INTO account_has_points (account_id, points, last_update) VALUES ('.$this->db->escapeNumber($this->getAccountID()).', '.$this->db->escapeNumber($numPoints).', '.$this->db->escapeNumber($lastUpdate?$lastUpdate:TIME).')');
+		} else if($numPoints<=0) {
+					$this->db->query('DELETE FROM account_has_points WHERE '.$this->SQL.' LIMIT 1');
+		} else {
+					$this->db->query('UPDATE account_has_points SET points = '.$this->db->escapeNumber($numPoints).($lastUpdate ? ', last_update = '.$this->db->escapeNumber(TIME) : '').' WHERE '.$this->SQL.' LIMIT 1');
+		}
 		$this->points=$numPoints;
 	}
 
 	public function removePoints($numPoints,$lastUpdate=false) {
-		if($numPoints>0)
-			$this->setPoints($this->getPoints()-$numPoints,$lastUpdate);
+		if($numPoints>0) {
+					$this->setPoints($this->getPoints()-$numPoints,$lastUpdate);
+		}
 	}
 
 	public function addPoints($numPoints,SmrAccount $admin,$reasonID,$suspicion) {
 		//do we have points
 		$this->setPoints($this->getPoints() + $numPoints,TIME);
 		$totalPoints = $this->getPoints();
-		if ($totalPoints < 10)
-			return false;//leave scripts its only a warning
-		elseif ($totalPoints < 20)
-			$days = 2;
-		elseif ($totalPoints < 30)
-			$days = 4;
-		elseif ($totalPoints < 50)
-			$days = 7;
-		elseif ($totalPoints < 75)
-			$days = 15 ;
-		elseif ($totalPoints < 100)
-			$days = 30;
-		elseif ($totalPoints < 125)
-			$days = 60;
-		elseif ($totalPoints < 150)
-			$days = 120;
-		elseif ($totalPoints < 175)
-			$days = 240;
-		elseif ($totalPoints < 200)
-			$days = 480;
-		else
-			$days = 0; //Forever/indefinite
+		if ($totalPoints < 10) {
+					return false;
+		}
+		//leave scripts its only a warning
+		elseif ($totalPoints < 20) {
+					$days = 2;
+		} elseif ($totalPoints < 30) {
+					$days = 4;
+		} elseif ($totalPoints < 50) {
+					$days = 7;
+		} elseif ($totalPoints < 75) {
+					$days = 15 ;
+		} elseif ($totalPoints < 100) {
+					$days = 30;
+		} elseif ($totalPoints < 125) {
+					$days = 60;
+		} elseif ($totalPoints < 150) {
+					$days = 120;
+		} elseif ($totalPoints < 175) {
+					$days = 240;
+		} elseif ($totalPoints < 200) {
+					$days = 480;
+		} else {
+					$days = 0;
+		}
+		//Forever/indefinite
 
 		if($days==0) {
 			$expireTime = 0;
-		}
-		else {
+		} else {
 			$expireTime = TIME + $days * 86400;
 		}
 		$this->banAccount($expireTime,$admin,$reasonID,$suspicion);
@@ -1178,26 +1235,30 @@ 
 			$player->update();
 		}
 		$this->log(LOG_TYPE_ACCOUNT_CHANGES, 'Account closed by ' . $admin->getLogin() . '.');
-		if($removeExceptions!==false)
-			$this->db->query('DELETE FROM account_exceptions WHERE ' . $this->SQL);
+		if($removeExceptions!==false) {
+					$this->db->query('DELETE FROM account_exceptions WHERE ' . $this->SQL);
+		}
 	}
 
 	public function unbanAccount(SmrAccount $admin = null,$currException=false) {
 		$adminID = 0;
-		if($admin!==null)
-			$adminID = $admin->getAccountID();
+		if($admin!==null) {
+					$adminID = $admin->getAccountID();
+		}
 		$this->db->query('DELETE FROM account_is_closed WHERE ' . $this->SQL . ' LIMIT 1');
 		$this->db->query('INSERT INTO account_has_closing_history
 						(account_id, time, admin_id, action)
 						VALUES(' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeNumber(TIME) . ', ' . $this->db->escapeNumber($adminID) . ', ' . $this->db->escapeString('Opened') . ')');
 		$this->db->query('UPDATE player SET last_turn_update = GREATEST(' . $this->db->escapeNumber(TIME) . ', last_turn_update) WHERE ' . $this->SQL);
-		if($admin!==null)
-			$this->log(LOG_TYPE_ACCOUNT_CHANGES, 'Account reopened by ' . $admin->getLogin() . '.');
-		else
-			$this->log(LOG_TYPE_ACCOUNT_CHANGES, 'Account automatically reopened.');
-		if($currException!==false)
-			$this->db->query('REPLACE INTO account_exceptions (account_id, reason)
+		if($admin!==null) {
+					$this->log(LOG_TYPE_ACCOUNT_CHANGES, 'Account reopened by ' . $admin->getLogin() . '.');
+		} else {
+					$this->log(LOG_TYPE_ACCOUNT_CHANGES, 'Account automatically reopened.');
+		}
+		if($currException!==false) {
+					$this->db->query('REPLACE INTO account_exceptions (account_id, reason)
 							VALUES (' . $this->db->escapeNumber($this->getAccountID()) . ', ' . $this->db->escapeString($currException) . ')');
+		}
 	}
 
 	public function getToggleAJAXHREF() {

lib/Default/SmrWeapon.class.php

Braces +20 added lines, -11 removed lines

@@ -12,17 +12,19 @@ 
 
 	
 	protected static function initialiseDatabase() {
-		if (self::$db == null)
-			self::$db = new SmrMySqlDatabase();
+		if (self::$db == null) {
+					self::$db = new SmrMySqlDatabase();
+		}
 	}
 
 	public static function getWeapon($weaponTypeID, $forceUpdate = false, $db = null) {
 		if ($forceUpdate || !isset(self::$CACHE_WEAPONS[$weaponTypeID])) {
 			$w = new SmrWeapon($weaponTypeID, $db);
-			if ($w->exists())
-				self::$CACHE_WEAPONS[$weaponTypeID] = $w;
-			else
-				self::$CACHE_WEAPONS[$weaponTypeID] = false;
+			if ($w->exists()) {
+							self::$CACHE_WEAPONS[$weaponTypeID] = $w;
+			} else {
+							self::$CACHE_WEAPONS[$weaponTypeID] = false;
+			}
 		}
 		return self::$CACHE_WEAPONS[$weaponTypeID];
 	}
@@ -151,8 +153,9 @@ 
 		$weaponShip = $weaponPlayer->getShip();
 		$targetShip = $targetPlayer->getShip();
 		$mrDiff = $targetShip->getMR() - $weaponShip->getMR();
-		if ($mrDiff > 0)
-			$modifiedAccuracy -= $this->getBaseAccuracy() * ($mrDiff / MR_FACTOR) / 100;
+		if ($mrDiff > 0) {
+					$modifiedAccuracy -= $this->getBaseAccuracy() * ($mrDiff / MR_FACTOR) / 100;
+		}
 	
 		return $modifiedAccuracy;
 	}
@@ -190,22 +193,28 @@ 
 	}
 	
 	public function &getModifiedDamageAgainstForces(AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		if (!$this->canShootForces()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootForces()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		return $damage;
 	}
 	
 	public function &getModifiedDamageAgainstPort(AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		if (!$this->canShootPorts()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPorts()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		return $damage;
 	}
 	
 	public function &getModifiedDamageAgainstPlanet(AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet) {
-		if (!$this->canShootPlanets()) // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
+		if (!$this->canShootPlanets()) {
+			// If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods.
 			return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
+		}
 		$damage =& $this->getModifiedDamage();
 		
 		$planetMod = self::PLANET_DAMAGE_MOD;