smrealms / smr

lib/Default/council.inc

Braces +1 added lines, -2 removed lines

@@ -139,8 +139,7 @@
 				$news = 'The [race=' . $race_id_1 . '] have declared <span class="red">WAR</span> on the [race=' . $race_id_2 . ']';
 				$db2->query('INSERT INTO news (game_id, time, news_message) VALUES ' .
 							'(' . $db2->escapeNumber($player->getGameID()) . ', ' . $db2->escapeNumber(TIME) . ', ' . $db2->escapeString($news) . ')');
-			}
-			elseif ($type == 'PEACE') {
+			} elseif ($type == 'PEACE') {
 				// get 'yes' votes
 				$db2->query('SELECT * FROM player_votes_pact
 							WHERE game_id = '.$db2->escapeNumber($player->getGameID()) . '

lib/Default/SmrSector.class.php

Braces +3 added lines, -6 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);
 		}
 	}
@@ -492,8 +490,7 @@ 
 	public function toggleLink($dir) {
 		if ($this->hasLink($dir)) {
 			$this->disableLink($dir);
-		}
-		else {
+		} else {
 			$this->enableLink($dir);
 		}
 	}

lib/Default/SmrPlayer.class.php

Braces +32 added lines, -35 removed lines

@@ -200,8 +200,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);
 		}
 	}
@@ -335,11 +334,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);
@@ -367,7 +364,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;
@@ -500,7 +499,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);
@@ -712,8 +713,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;
 			}
 		}
@@ -731,8 +731,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;
@@ -859,8 +858,7 @@ 
 		$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
@@ -894,8 +892,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';
 			}
 
@@ -917,16 +914,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);
 
@@ -938,8 +933,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);
 			}
 
@@ -947,8 +941,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);
 
@@ -1133,8 +1126,7 @@ 
 					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 {
+				} else {
 					if ($bounty['Amount'] > 0 || $bounty['SmrCredits'] > 0) {
 						$this->db->query('UPDATE bounty
 							SET amount=' . $this->db->escapeNumber($bounty['Amount']) . ',
@@ -1173,15 +1165,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) {
+				} else if ($hofChanged == self::HOF_CHANGED) {
 	//				if($amount > 0)
 						$this->db->query('UPDATE player_hof
 							SET amount=' . $this->db->escapeNumber($amount) . '
@@ -1292,11 +1282,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;
 	}
@@ -1318,9 +1309,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';
 	}
 

lib/Default/Plotter.class.php

Braces +4 added lines, -4 removed lines

@@ -97,8 +97,9 @@ 
 		}
 
 		$distanceQ = array();
-		for ($i = 0; $i <= TURNS_WARP_SECTOR_EQUIVALENCE; $i++)
-			$distanceQ[] = array();
+		for ($i = 0; $i <= TURNS_WARP_SECTOR_EQUIVALENCE; $i++) {
+					$distanceQ[] = array();
+		}
 		//Warps first as a slight optimisation due to how visitedSectors is set.
 		if ($checkSector->hasWarp() === true) {
 			$d = new Distance($gameID, $checkSector->getSectorID());
@@ -136,8 +137,7 @@ 
 					$checkSector = SmrSector::getSector($gameID, $checkSectorID);
 					if ($x == 'Distance') {
 						$distances[$sectorsTravelled][$checkSector->getSectorID()] = $distance;
-					}
-					else if (($needsToHaveBeenExploredBy === null || $needsToHaveBeenExploredBy->hasVisitedSector($checkSector->getSectorID())) === true
+					} else if (($needsToHaveBeenExploredBy === null || $needsToHaveBeenExploredBy->hasVisitedSector($checkSector->getSectorID())) === true
 							&& $checkSector->hasX($x, $player) === true) {
 						if ($useFirst === true) {
 							return $distance;

lib/Default/Menu.class.php

Braces +3 added lines, -6 removed lines

@@ -22,8 +22,7 @@ 
 
 		if ($alliance_id) {
 			$in_alliance = ($alliance_id == $player->getAllianceID());
-		}
-		else {
+		} else {
 			$in_alliance = $player->hasAlliance();
 		}
 		if (!$in_alliance) {
@@ -36,8 +35,7 @@ 
 				$mbRead = $db->getBoolean('mb_read');
 				$modRead = $db->getBoolean('mod_read');
 				$planetLand = $db->getBoolean('planet_land');
-			}
-			else {
+			} else {
 				$mbRead = FALSE;
 				$modRead = FALSE;
 				$planetLand = FALSE;
@@ -366,8 +364,7 @@ 
 				}
 			}
 			$return .= ('</small></td>');
-		}
-		else {
+		} else {
 			// if it's not the first entry we have to put
 			// additional empty cell for the spacer
 			//if ($number > 0)

lib/Default/AbstractSmrPort.class.php

Braces +17 added lines, -20 removed lines

@@ -153,8 +153,7 @@ 
 			$this->checkDefenses();
 			$this->getGoods();
 			$this->checkForUpgrade();
-		}
-		else {
+		} else {
 			$this->shields = 0;
 			$this->combatDrones = 0;
 			$this->armour = 0;
@@ -566,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);
 		}
 		
@@ -649,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();
 			}
 			
@@ -659,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.';
@@ -1005,8 +1001,9 @@ 
 		 if ($transactionType == 'Buy') {
 			$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;
 //		$rand = .095 + $range * mt_rand(0, 32767)/32767;
@@ -1069,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.';
 		}
@@ -1141,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];
 	}
@@ -1189,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()) .
@@ -1273,8 +1268,7 @@ 
 						$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));
 			}
 		}
@@ -1370,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();

lib/Default/smr.inc

Braces +39 added lines, -28 removed lines

@@ -132,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;
@@ -186,8 +185,7 @@ 
 	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;
@@ -227,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]) . '">';
@@ -319,8 +316,7 @@ 
 	}
 	if ($maxValue - $minValue == 0) {
 		return $text;
-	}
-	else {
+	} else {
 		$normalisedValue = round(510 * max(0, min($maxValue, $value) - $minValue) / ($maxValue - $minValue)) - 255;
 	}
 	if ($type == 'Game') {
@@ -330,28 +326,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;
 	}
 }
@@ -410,10 +411,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()) {
@@ -460,8 +469,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
@@ -567,8 +577,7 @@ 
 
 			usleep(25000 * $locksInQueue);
 			continue;
-		}
-		else {
+		} else {
 			return true;
 		}
 	}
@@ -765,7 +774,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');

lib/Default/Routes/RouteGenerator.class.php

Spacing +20 added lines, -20 removed lines

@@ -71,11 +71,11 @@ 
 		$routes = array();
 		foreach ($distances as $currentSectorId => $d) {
 			$raceID = $sectors[$currentSectorId]->getPort()->getRaceID();
-			if (isset($races[$raceID])===false) {
-				echo 'Error with Race ID: '.$sectors[$currentSectorId]->getPort()->getRaceID();
+			if (isset($races[$raceID]) === false) {
+				echo 'Error with Race ID: ' . $sectors[$currentSectorId]->getPort()->getRaceID();
 				continue;
 			}
-			if($races[$raceID]===false) {
+			if ($races[$raceID] === false) {
 				continue;
 			}
 			$rl = array();
@@ -83,16 +83,16 @@ 
 				if (!$races[$sectors[$targetSectorId]->getPort()->getRaceID()]) {
 					continue;
 				}
-				if($routesForPort!==-1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort) {
+				if ($routesForPort !== -1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort) {
 					continue;
 				}
 
-				if ($goods[GOOD_NOTHING]===true) {
+				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) {
+					if ($goods[$goodId] === true) {
 						if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_SELLS &&
 						    $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_BUYS) {
 							$rl[] = new OneWayRoute($currentSectorId, $targetSectorId, $raceID, $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId);
@@ -108,19 +108,19 @@ 
 	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) {
+			if ($races[$sectors[$currentSectorId]->getPort()->getRaceID()] === false) {
 				continue;
 			}
 			foreach ($d as $targetSectorId => $distance) {
-				if ($races[$sectors[$targetSectorId]->getPort()->getRaceID()]===false) {
+				if ($races[$sectors[$targetSectorId]->getPort()->getRaceID()] === false) {
 					continue;
 				}
-				if($routesForPort!==-1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort) {
+				if ($routesForPort !== -1 && $currentSectorId !== $routesForPort && $targetSectorId !== $routesForPort) {
 					continue;
 				}
 
 				foreach (\Globals::getGoods() as $goodId => $value) {
-					if ($goods[$goodId]===true) {
+					if ($goods[$goodId] === true) {
 						if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_SELLS &&
 						    $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === self::GOOD_BUYS) {
 							$owr = new OneWayRoute($currentSectorId, $targetSectorId, $sectors[$currentSectorId]->getPort()->getRaceID(), $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId);
@@ -166,19 +166,19 @@ 
 		$i = 0;
 		krsort(self::$expRoutes, SORT_NUMERIC);
 		foreach (self::$expRoutes as $multi => $routesByMulti) {
-			if(count($routesByMulti)+$i < $trimToBestXRoutes) {
+			if (count($routesByMulti) + $i < $trimToBestXRoutes) {
 				$i += count($routesByMulti);
 			}
-			else if($i > $trimToBestXRoutes) {
+			else if ($i > $trimToBestXRoutes) {
 				unset(self::$expRoutes[$multi]);
 			}
 			else {
-				foreach($routesByMulti as $key => $value) {
+				foreach ($routesByMulti as $key => $value) {
 					$i++;
-					if($i < $trimToBestXRoutes) {
+					if ($i < $trimToBestXRoutes) {
 						continue;
 					}
-					if($i === $trimToBestXRoutes) {
+					if ($i === $trimToBestXRoutes) {
 						self::$dontAddWorseThan[self::EXP_ROUTE] = $multi;
 						continue;
 					}
@@ -190,20 +190,20 @@ 
 		$i = 0;
 		krsort(self::$moneyRoutes, SORT_NUMERIC);
 		foreach (self::$moneyRoutes as $multi => $routesByMulti) {
-			if(count($routesByMulti)+$i < $trimToBestXRoutes) {
+			if (count($routesByMulti) + $i < $trimToBestXRoutes) {
 				$i += count($routesByMulti);
 			}
-			else if($i > $trimToBestXRoutes) {
+			else if ($i > $trimToBestXRoutes) {
 				unset(self::$moneyRoutes[$multi]);
 				continue;
 			}
 			else {
-				foreach($routesByMulti as $key => $value) {
+				foreach ($routesByMulti as $key => $value) {
 					$i++;
-					if($i < $trimToBestXRoutes) {
+					if ($i < $trimToBestXRoutes) {
 						continue;
 					}
-					if($i === $trimToBestXRoutes) {
+					if ($i === $trimToBestXRoutes) {
 						self::$dontAddWorseThan[self::MONEY_ROUTE] = $multi;
 						continue;
 					}

Braces +5 added lines, -10 removed lines

@@ -58,8 +58,7 @@ 
 					$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);
 				}
@@ -168,11 +167,9 @@ 
 		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) {
@@ -192,12 +189,10 @@ 
 		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) {

htdocs/album/index.php

Braces +5 added lines, -6 removed lines

@@ -62,8 +62,9 @@ 
 				// get all id's and build array
 				$album_ids = array();
 		
-				while ($db->nextRecord())
-					$album_ids[] = $db->getInt('album_id');
+				while ($db->nextRecord()) {
+									$album_ids[] = $db->getInt('album_id');
+				}
 		
 				// double check if we have id's
 				if (count($album_ids) > 0) {
@@ -73,8 +74,7 @@ 
 				}
 			}
 	
-		}
-		elseif ($db->getNumRows() == 1) {
+		} elseif ($db->getNumRows() == 1) {
 			if ($db->nextRecord()) {
 				album_entry($db->getInt('album_id'));
 			} else {
@@ -86,8 +86,7 @@ 
 	} else {
 		main_page();
 	}
-}
-catch (Throwable $e) {
+} catch (Throwable $e) {
 	handleException($e);
 }
 ?>