smrealms / smr

lib/Default/SmrPlanetType.class.php

Spacing +26 added lines, -26 removed lines

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

lib/Default/AbstractSmrPort.class.php

Spacing +2 added lines, -2 removed lines

@@ -1180,7 +1180,7 @@ 
 			do {
 				$targetPlayer = $targetPlayers[array_rand($targetPlayers)];
 			} while ($results['TotalShotsPerTargetPlayer'][$targetPlayer->getAccountID()] > min($results['TotalShotsPerTargetPlayer']));
-			$results['Weapons'][$orderID] =& $weapon->shootPlayerAsPort($this, $targetPlayer);
+			$results['Weapons'][$orderID] = & $weapon->shootPlayerAsPort($this, $targetPlayer);
 			$results['TotalShotsPerTargetPlayer'][$targetPlayer->getAccountID()]++;
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
@@ -1189,7 +1189,7 @@ 
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs(), true);
-			$results['Drones'] =& $thisCDs->shootPlayerAsPort($this, $targetPlayers[array_rand($targetPlayers)]);
+			$results['Drones'] = & $thisCDs->shootPlayerAsPort($this, $targetPlayers[array_rand($targetPlayers)]);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 			$results['TotalDamagePerTargetPlayer'][$results['Drones']['TargetPlayer']->getAccountID()] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}

lib/Default/SmrPlanet.class.php

Indentation +1 added lines, -1 removed lines

@@ -707,7 +707,7 @@
 		if ($buildingTypeID === false) {
 			$structs = $this->typeInfo::STRUCTURES;
 			return array_combine(array_keys($structs),
-			                     array_column($structs, 'max_amount'));
+								 array_column($structs, 'max_amount'));
 		}
 		return $this->getStructureTypes($buildingTypeID)->maxAmount();
 	}

Spacing +2 added lines, -2 removed lines

@@ -1146,7 +1146,7 @@ 
 		$results['DeadBeforeShot'] = false;
 		$weapons = $this->getWeapons();
 		foreach ($weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPlayerAsPlanet($this, $targetPlayers[array_rand($targetPlayers)]);
+			$results['Weapons'][$orderID] = & $weapon->shootPlayerAsPlanet($this, $targetPlayers[array_rand($targetPlayers)]);
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 				$results['TotalDamagePerTargetPlayer'][$results['Weapons'][$orderID]['TargetPlayer']->getAccountID()] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
@@ -1154,7 +1154,7 @@ 
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs(), true);
-			$results['Drones'] =& $thisCDs->shootPlayerAsPlanet($this, $targetPlayers[array_rand($targetPlayers)]);
+			$results['Drones'] = & $thisCDs->shootPlayerAsPlanet($this, $targetPlayers[array_rand($targetPlayers)]);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 			$results['TotalDamagePerTargetPlayer'][$results['Drones']['TargetPlayer']->getAccountID()] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}

lib/Default/DummyPlayer.class.php

Braces +4 added lines, -4 removed lines

@@ -53,8 +53,9 @@ 
 	}
 	
 	public function setAllianceID($ID) {
-		if($this->allianceID == $ID)
-			return;
+		if($this->allianceID == $ID) {
+					return;
+		}
 		$this->allianceID=$ID;
 	}
 	
@@ -93,8 +94,7 @@ 
 		if($db->nextRecord()) {
 			$return = unserialize($db->getField('info'));
 			return $return;
-		}
-		else {
+		} else {
 			$return = new DummyPlayer();
 			return $return;
 		}

Spacing +20 added lines, -20 removed lines

@@ -1,30 +1,30 @@ 
 <?php declare(strict_types=1);
 
 class DummyPlayer extends AbstractSmrPlayer {
-	public function __construct($gameID=0,$playerName='Dummy',$raceID=1,$experience=1000,$alignment=100,$allianceID=0,$shipTypeID=60) {
+	public function __construct($gameID = 0, $playerName = 'Dummy', $raceID = 1, $experience = 1000, $alignment = 100, $allianceID = 0, $shipTypeID = 60) {
 		$this->accountID				= 0;
-		$this->gameID					= (int) $gameID;
-		$this->playerName				= (string) $playerName;
+		$this->gameID = (int)$gameID;
+		$this->playerName = (string)$playerName;
 		$this->playerID					= 0;
 		$this->sectorID					= 0;
-		$this->lastSectorID				= 0;
+		$this->lastSectorID = 0;
 		$this->turns					= 1000;
-		$this->newbieTurns				= 0;
+		$this->newbieTurns = 0;
 		$this->lastNewsUpdate			= 0;
 		$this->dead						= false;
 		$this->landedOnPlanet			= false;
-		$this->lastActive				= 0;
-		$this->lastCPLAction			= 0;
-		$this->raceID					= (int) $raceID;
-		$this->credits					= 0;
-		$this->experience				= (int) $experience;
-		$this->alignment				= (int) $alignment;
-		$this->militaryPayment			= 0;
-		$this->allianceID				= (int) $allianceID;
-		$this->shipID					= (int) $shipTypeID;
+		$this->lastActive = 0;
+		$this->lastCPLAction = 0;
+		$this->raceID = (int)$raceID;
+		$this->credits = 0;
+		$this->experience				= (int)$experience;
+		$this->alignment = (int)$alignment;
+		$this->militaryPayment = 0;
+		$this->allianceID				= (int)$allianceID;
+		$this->shipID					= (int)$shipTypeID;
 		$this->kills					= 0;
 		$this->deaths					= 0;
-		$this->lastPort					= 0;
+		$this->lastPort = 0;
 		$this->bank						= 0;
 		$this->zoom						= 0;
 
@@ -48,9 +48,9 @@ 
 	}
 
 	public function setAllianceID($ID) {
-		if($this->allianceID == $ID)
+		if ($this->allianceID == $ID)
 			return;
-		$this->allianceID=$ID;
+		$this->allianceID = $ID;
 	}
 
 	public function &killPlayerByPlayer(AbstractSmrPlayer $killer) {
@@ -76,7 +76,7 @@ 
 		$db = MySqlDatabase::getInstance();
 		$db->query('REPLACE INTO cached_dummys ' .
 					'(type, id, info) ' .
-					'VALUES (\'DummyPlayer\', '.$db->escapeString($this->getPlayerName()).', '.$db->escapeString($cache).')');
+					'VALUES (\'DummyPlayer\', ' . $db->escapeString($this->getPlayerName()) . ', ' . $db->escapeString($cache) . ')');
 		 unserialize($cache);
 	}
 
@@ -85,7 +85,7 @@ 
 		$db->query('SELECT info FROM cached_dummys
 					WHERE type = \'DummyPlayer\'
 						AND id = ' . $db->escapeString($name) . ' LIMIT 1');
-		if($db->nextRecord()) {
+		if ($db->nextRecord()) {
 			$return = unserialize($db->getField('info'));
 			return $return;
 		}
@@ -100,7 +100,7 @@ 
 		$db->query('SELECT id FROM cached_dummys
 					WHERE type = \'DummyPlayer\'');
 		$dummyNames = array();
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$dummyNames[] = $db->getField('id');
 		}
 		return $dummyNames;

lib/Default/AbstractSmrShip.class.php

Indentation +4 added lines, -4 removed lines

@@ -857,14 +857,14 @@
 
 	public function isFederal() {
 		return $this->getShipTypeID() == SHIP_TYPE_FEDERAL_DISCOVERY ||
-		       $this->getShipTypeID() == SHIP_TYPE_FEDERAL_WARRANT ||
-		       $this->getShipTypeID() == SHIP_TYPE_FEDERAL_ULTIMATUM;
+			   $this->getShipTypeID() == SHIP_TYPE_FEDERAL_WARRANT ||
+			   $this->getShipTypeID() == SHIP_TYPE_FEDERAL_ULTIMATUM;
 	}
 
 	public function isUnderground() {
 		return $this->getShipTypeID() == SHIP_TYPE_THIEF ||
-		       $this->getShipTypeID() == SHIP_TYPE_ASSASSIN ||
-		       $this->getShipTypeID() == SHIP_TYPE_DEATH_CRUISER;
+			   $this->getShipTypeID() == SHIP_TYPE_ASSASSIN ||
+			   $this->getShipTypeID() == SHIP_TYPE_DEATH_CRUISER;
 	}
 
 	public function &shootPlayer(AbstractSmrPlayer $targetPlayer) {

Spacing +9 added lines, -9 removed lines

@@ -301,7 +301,7 @@ 
 	public function setWeaponLocations(array $orderArray) {
 		$weapons = $this->weapons;
 		foreach ($orderArray as $newOrder => $oldOrder) {
-			$this->weapons[$newOrder] =& $weapons[$oldOrder];
+			$this->weapons[$newOrder] = & $weapons[$oldOrder];
 		}
 		$this->hasChangedWeapons = true;
 	}
@@ -901,14 +901,14 @@ 
 		}
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
+			$results['Weapons'][$orderID] = & $weapon->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 			}
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Drones'] =& $thisCDs->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
+			$results['Drones'] = & $thisCDs->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
 		$thisPlayer->increaseExperience(IRound($results['TotalDamage'] * self::EXP_PER_DAMAGE_PLAYER));
@@ -926,7 +926,7 @@ 
 		}
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootForces($thisPlayer, $forces);
+			$results['Weapons'][$orderID] = & $weapon->shootForces($thisPlayer, $forces);
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['NumMines'], array('Combat', 'Forces', 'Mines', 'Killed'), HOF_PUBLIC);
@@ -940,7 +940,7 @@ 
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Drones'] =& $thisCDs->shootForces($thisPlayer, $forces);
+			$results['Drones'] = & $thisCDs->shootForces($thisPlayer, $forces);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['NumMines'], array('Combat', 'Forces', 'Mines', 'Killed'), HOF_PUBLIC);
 			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['Mines'], array('Combat', 'Forces', 'Mines', 'Damage Done'), HOF_PUBLIC);
@@ -965,14 +965,14 @@ 
 		}
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPort($thisPlayer, $port);
+			$results['Weapons'][$orderID] = & $weapon->shootPort($thisPlayer, $port);
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 			}
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Drones'] =& $thisCDs->shootPort($thisPlayer, $port);
+			$results['Drones'] = & $thisCDs->shootPort($thisPlayer, $port);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
 		$thisPlayer->increaseExperience(IRound($results['TotalDamage'] * self::EXP_PER_DAMAGE_PORT));
@@ -1003,14 +1003,14 @@ 
 		}
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPlanet($thisPlayer, $planet, $delayed);
+			$results['Weapons'][$orderID] = & $weapon->shootPlanet($thisPlayer, $planet, $delayed);
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 			}
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Drones'] =& $thisCDs->shootPlanet($thisPlayer, $planet, $delayed);
+			$results['Drones'] = & $thisCDs->shootPlanet($thisPlayer, $planet, $delayed);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
 		$thisPlayer->increaseExperience(IRound($results['TotalDamage'] * self::EXP_PER_DAMAGE_PLANET));

engine/Default/galactic_post_past.php

Indentation +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 $publishedGames = array();
 while ($db->nextRecord()) {
 	$publishedGames[] = array('game_name' => $db->getField('game_name'),
-	                          'game_id' => $db->getInt('game_id'));
+							  'game_id' => $db->getInt('game_id'));
 }
 $template->assign('PublishedGames', $publishedGames);
 
@@ -31,7 +31,7 @@ 
 	$container['back'] = true;
 
 	$pastEditions[] = array('title' => $db->getField('title'),
-	                        'online_since' => $db->getInt('online_since'),
-	                        'href' => SmrSession::getNewHREF($container));
+							'online_since' => $db->getInt('online_since'),
+							'href' => SmrSession::getNewHREF($container));
 }
 $template->assign('PastEditions', $pastEditions);

engine/Default/message_view.php

Spacing +1 added lines, -1 removed lines

@@ -202,7 +202,7 @@
 					AND receiver_delete = ' . $db->escapeBoolean(false) . '
 					ORDER BY send_time DESC');
 	while ($db->nextRecord()) {
-		$groupBox =& $messageBox['GroupedMessages'][$db->getInt('sender_id')];
+		$groupBox = & $messageBox['GroupedMessages'][$db->getInt('sender_id')];
 		// Limit the number of messages in each group
 		if (!isset($groupBox['Messages']) || count($groupBox['Messages']) < MESSAGE_SCOUT_GROUP_LIMIT) {
 			displayMessage($groupBox, $db->getInt('message_id'), $db->getInt('account_id'), $db->getInt('sender_id'), stripslashes($db->getField('message_text')), $db->getInt('send_time'), $db->getBoolean('msg_read'), MSG_SCOUT);

engine/Default/help.inc

Braces +30 added lines, -22 removed lines

@@ -22,16 +22,18 @@ 
 		$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id - 1));
 
 		// no result?
-		if (!$db2->getNumRows())
-			$db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
+		if (!$db2->getNumRows()) {
+					$db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
+		}
 
 		echo ('<th width="32">');
 		if ($db2->nextRecord()) {
 			$previous_topic_id = $db2->getInt('topic_id');
 			$previous_topic = stripslashes($db2->getField('topic'));
 			echo ('<a href="/manual.php?'.$previous_topic_id.'"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
-		} else
-			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
+		} else {
+					echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
+		}
 		echo ('</th>');
 
 		// **************************
@@ -43,8 +45,9 @@ 
 			$up_topic_id = $db2->getInt('topic_id');
 			$up_topic = stripslashes($db2->getField('topic'));
 			echo ('<a href="/manual.php?'.$up_topic_id.'"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
-		} else
-			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
+		} else {
+					echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
+		}
 		echo ('</th>');
 
 		// **************************
@@ -52,8 +55,9 @@ 
 		// **************************
 		$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($topic_id).' AND order_id = 1');
 
-		if (!$db2->getNumRows())
-			$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1));
+		if (!$db2->getNumRows()) {
+					$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1));
+		}
 
 		$seenParentIDs = array(0);
 		$curr_parent_topic_id = $parent_topic_id;
@@ -72,8 +76,7 @@ 
 			$next_topic_id = $db2->getInt('topic_id');
 			$next_topic = stripslashes($db2->getField('topic'));
 			echo ('<a href="/manual.php?'.$next_topic_id.'"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
-		}
-		else {
+		} else {
 			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
 		}
 		echo ('</th>');
@@ -85,18 +88,22 @@ 
 
 		echo ('<tr>');
 		echo ('<td colspan="5">');
-		if (isset($previous_topic_id) && $previous_topic_id > 0)
-			echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a>&nbsp;&nbsp;&nbsp;');
-		if (isset($up_topic_id) && $up_topic_id > 0)
-			echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a>&nbsp;&nbsp;&nbsp;');
-		if (isset($next_topic_id) && $next_topic_id > 0)
-			echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>');
+		if (isset($previous_topic_id) && $previous_topic_id > 0) {
+					echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a>&nbsp;&nbsp;&nbsp;');
+		}
+		if (isset($up_topic_id) && $up_topic_id > 0) {
+					echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a>&nbsp;&nbsp;&nbsp;');
+		}
+		if (isset($next_topic_id) && $next_topic_id > 0) {
+					echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>');
+		}
 		echo ('</tr>');
 
 		echo ('</table>');
-	} else
-		echo ('Invalid Topic!');
-}
+	} else {
+			echo ('Invalid Topic!');
+	}
+	}
 
 function echo_content($topic_id) {
 	// database object
@@ -114,9 +121,10 @@ 
 		echo ('<h1>' . get_numbering($topic_id) . $topic.'</h1>');
 		echo ('<p>'.$text.'<p>');
 		echo ('</div>');
-	} else
-		echo ('Invalid Topic!');
-}
+	} else {
+			echo ('Invalid Topic!');
+	}
+	}
 
 function echo_subsection($topic_id) {
 	// database object

Spacing +25 added lines, -25 removed lines

@@ -7,7 +7,7 @@ 
 	$db3 = MySqlDatabase::getInstance();
 
 	// get current entry
-	$db->query('SELECT * FROM manual WHERE topic_id = '.$db->escapeNumber($topic_id));
+	$db->query('SELECT * FROM manual WHERE topic_id = ' . $db->escapeNumber($topic_id));
 	if ($db->nextRecord()) {
 		$parent_topic_id = $db->getInt('parent_topic_id');
 		$order_id = $db->getInt('order_id');
@@ -19,17 +19,17 @@ 
 		// **************************
 		// **  PREVIOUS
 		// **************************
-		$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id - 1));
+		$db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($order_id - 1));
 
 		// no result?
 		if (!$db2->getNumRows())
-			$db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
+			$db2->query('SELECT * FROM manual WHERE topic_id = ' . $db2->escapeNumber($parent_topic_id));
 
 		echo ('<th width="32">');
 		if ($db2->nextRecord()) {
 			$previous_topic_id = $db2->getInt('topic_id');
 			$previous_topic = stripslashes($db2->getField('topic'));
-			echo ('<a href="/manual.php?'.$previous_topic_id.'"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
+			echo ('<a href="/manual.php?' . $previous_topic_id . '"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
 		} else
 			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
 		echo ('</th>');
@@ -37,12 +37,12 @@ 
 		// **************************
 		// **  UP
 		// **************************
-		$db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
+		$db2->query('SELECT * FROM manual WHERE topic_id = ' . $db2->escapeNumber($parent_topic_id));
 		echo ('<th width="32">');
 		if ($db2->nextRecord()) {
 			$up_topic_id = $db2->getInt('topic_id');
 			$up_topic = stripslashes($db2->getField('topic'));
-			echo ('<a href="/manual.php?'.$up_topic_id.'"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
+			echo ('<a href="/manual.php?' . $up_topic_id . '"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
 		} else
 			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
 		echo ('</th>');
@@ -50,35 +50,35 @@ 
 		// **************************
 		// **  NEXT
 		// **************************
-		$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($topic_id).' AND order_id = 1');
+		$db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($topic_id) . ' AND order_id = 1');
 
 		if (!$db2->getNumRows())
-			$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1));
+			$db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($order_id + 1));
 
 		$seenParentIDs = array(0);
 		$curr_parent_topic_id = $parent_topic_id;
 		while (!$db2->getNumRows() && !in_array($curr_parent_topic_id, $seenParentIDs)) {
 			$seenParentIDs[] = $curr_parent_topic_id;
-			$db3->query('SELECT * FROM manual WHERE topic_id = '.$db3->escapeNumber($parent_topic_id));
+			$db3->query('SELECT * FROM manual WHERE topic_id = ' . $db3->escapeNumber($parent_topic_id));
 			$db3->nextRecord();
 			$curr_order_id = $db3->getInt('order_id');
 			$curr_parent_topic_id = $db3->getInt('parent_topic_id');
 
-			$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($curr_order_id + 1));
+			$db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($curr_order_id + 1));
 		}
 
 		echo ('<th width="32">');
 		if ($db2->nextRecord()) {
 			$next_topic_id = $db2->getInt('topic_id');
 			$next_topic = stripslashes($db2->getField('topic'));
-			echo ('<a href="/manual.php?'.$next_topic_id.'"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
+			echo ('<a href="/manual.php?' . $next_topic_id . '"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
 		}
 		else {
 			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
 		}
 		echo ('</th>');
 
-		echo ('<th width="100%" class="center" validn="middle" style="font-size:18pt;font-weight:bold;">' . get_numbering($topic_id) . $topic.'</th>');
+		echo ('<th width="100%" class="center" validn="middle" style="font-size:18pt;font-weight:bold;">' . get_numbering($topic_id) . $topic . '</th>');
 		echo ('<th width="32"><a href="/manual_toc.php"><img src="/images/help/contents.jpg" width="32" height="32" border="0"></a></th>');
 
 		echo ('</tr>');
@@ -86,11 +86,11 @@ 
 		echo ('<tr>');
 		echo ('<td colspan="5">');
 		if (isset($previous_topic_id) && $previous_topic_id > 0)
-			echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a>&nbsp;&nbsp;&nbsp;');
+			echo ('<b>Previous:</b> <a href="/manual.php?' . $previous_topic_id . '">' . get_numbering($previous_topic_id) . $previous_topic . '</a>&nbsp;&nbsp;&nbsp;');
 		if (isset($up_topic_id) && $up_topic_id > 0)
-			echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a>&nbsp;&nbsp;&nbsp;');
+			echo ('<b>Up:</b> <a href="/manual.php?' . $up_topic_id . '">' . get_numbering($up_topic_id) . $up_topic . '</a>&nbsp;&nbsp;&nbsp;');
 		if (isset($next_topic_id) && $next_topic_id > 0)
-			echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>');
+			echo ('<b>Next:</b> <a href="/manual.php?' . $next_topic_id . '">' . get_numbering($next_topic_id) . $next_topic . '</a>');
 		echo ('</tr>');
 
 		echo ('</table>');
@@ -103,7 +103,7 @@ 
 	$db = MySqlDatabase::getInstance();
 
 	// get current entry
-	$db->query('SELECT * FROM manual WHERE topic_id = '.$topic_id);
+	$db->query('SELECT * FROM manual WHERE topic_id = ' . $topic_id);
 	if ($db->nextRecord()) {
 		$parent_topic_id = $db->getInt('parent_topic_id');
 		$order_id = $db->getInt('order_id');
@@ -111,8 +111,8 @@ 
 		$text = stripslashes($db->getField('text'));
 
 		echo ('<div id="help_content">');
-		echo ('<h1>' . get_numbering($topic_id) . $topic.'</h1>');
-		echo ('<p>'.$text.'<p>');
+		echo ('<h1>' . get_numbering($topic_id) . $topic . '</h1>');
+		echo ('<p>' . $text . '<p>');
 		echo ('</div>');
 	} else
 		echo ('Invalid Topic!');
@@ -121,9 +121,9 @@ 
 function echo_subsection($topic_id) {
 	// database object
 	$db = MySqlDatabase::getInstance();
-	$return='';
+	$return = '';
 	// check if there are subsections
-	$db->query('SELECT * FROM manual WHERE parent_topic_id = '.$db->escapeNumber($topic_id).' ORDER BY order_id');
+	$db->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db->escapeNumber($topic_id) . ' ORDER BY order_id');
 	if ($db->getNumRows()) {
 		echo ('<hr noshade width="75%" size="1" class="center"/>');
 		echo ('<div id="help_menu">');
@@ -137,19 +137,19 @@ 
 }
 
 function echo_menu($topic_id) {
-	$return='';
+	$return = '';
 	// database object
 	$db = MySqlDatabase::getInstance();
 
-	$db->query('SELECT * FROM manual WHERE parent_topic_id = '.$db->escapeNumber($topic_id).' ORDER BY order_id');
+	$db->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db->escapeNumber($topic_id) . ' ORDER BY order_id');
 	if ($db->getNumRows()) {
 		echo ('<ul type="disc">');
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$sub_topic_id = $db->getInt('topic_id');
 			$order_id = $db->getInt('order_id');
 			$sub_topic = stripslashes($db->getField('topic'));
 
-			echo ('<li><a href="/manual.php?'.$sub_topic_id.'">' . get_numbering($sub_topic_id) . $sub_topic.'</a></li>');
+			echo ('<li><a href="/manual.php?' . $sub_topic_id . '">' . get_numbering($sub_topic_id) . $sub_topic . '</a></li>');
 			echo_menu($sub_topic_id);
 		}
 		echo ('</ul>');
@@ -160,7 +160,7 @@ 
 function get_numbering($topic_id) {
 	$db = MySqlDatabase::getInstance();
 
-	$db->query('SELECT * FROM manual WHERE topic_id = '.$db->escapeNumber($topic_id));
+	$db->query('SELECT * FROM manual WHERE topic_id = ' . $db->escapeNumber($topic_id));
 	if ($db->nextRecord()) {
 		$up_topic_id = $db->getInt('parent_topic_id');
 		$order_id = $db->getInt('order_id');

templates/Default/engine/Default/includes/ForceTraderTeamCombatResults.inc

Spacing +50 added lines, -50 removed lines

@@ -1,48 +1,48 @@ 
 <?php
 
-if(is_array($TraderTeamCombatResults['Traders'])) {
-	foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
-		$ShootingPlayer =& $TraderResults['Player'];
-		$TotalDamage =& $TraderResults['TotalDamage'];
-		if($TraderResults['DeadBeforeShot']) {
+if (is_array($TraderTeamCombatResults['Traders'])) {
+	foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
+		$ShootingPlayer = & $TraderResults['Player'];
+		$TotalDamage = & $TraderResults['TotalDamage'];
+		if ($TraderResults['DeadBeforeShot']) {
 			echo $ShootingPlayer->getDisplayName() ?> died before they were able to attack!<br /><?php
 		} else {
-			if(isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
-				foreach($TraderResults['Weapons'] as $WeaponResults) {
-					$ShootingWeapon =& $WeaponResults['Weapon'];
-					$ShotHit =& $WeaponResults['Hit'];
-					$ActualDamage =& $WeaponResults['ActualDamage'];
-					$WeaponDamage =& $WeaponResults['WeaponDamage'];
-					$TargetPlayer =& $WeaponResults['TargetPlayer'];
+			if (isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
+				foreach ($TraderResults['Weapons'] as $WeaponResults) {
+					$ShootingWeapon = & $WeaponResults['Weapon'];
+					$ShotHit = & $WeaponResults['Hit'];
+					$ActualDamage = & $WeaponResults['ActualDamage'];
+					$WeaponDamage = & $WeaponResults['WeaponDamage'];
+					$TargetPlayer = & $WeaponResults['TargetPlayer'];
 
-					echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at<?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once<?php } ?> the forces<?php
+					echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at<?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once<?php } ?> the forces<?php
 					if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
-						if(!$ShotHit) {
+						if (!$ShotHit) {
 							?> and misses<?php
-						} else if($ActualDamage['TotalDamage'] == 0) {
-							if($WeaponDamage['Shield'] > 0) {
-								?> which proves ineffective against the <?php if($ActualDamage['HasMines']){ ?>mines<?php } else if($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php }
-							} else if($WeaponDamage['Armour'] > 0) {
-								?> which is deflected by the <?php if($ActualDamage['HasMines']){ ?>mines<?php } else if($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php } ?> shields<?php
+						} else if ($ActualDamage['TotalDamage'] == 0) {
+							if ($WeaponDamage['Shield'] > 0) {
+								?> which proves ineffective against the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } else if ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php }
+							} else if ($WeaponDamage['Armour'] > 0) {
+								?> which is deflected by the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } else if ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php } ?> shields<?php
 							} else {
 								?> but it cannot do any damage<?php
 							}
 						} else {
 							?> destroying <?php
 							$DamageTypes = 0;
-							if($ActualDamage['NumMines'] > 0){ $DamageTypes = $DamageTypes+1; }
-							if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-							if($ActualDamage['NumSDs'] > 0){ $DamageTypes = $DamageTypes+1; }
+							if ($ActualDamage['NumMines'] > 0) { $DamageTypes = $DamageTypes + 1; }
+							if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+							if ($ActualDamage['NumSDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
-							if($ActualDamage['NumMines'] > 0) {
+							if ($ActualDamage['NumMines'] > 0) {
 								?><span class="red"><?php echo number_format($ActualDamage['NumMines']) ?></span> mines<?php
 								$this->doDamageTypeReductionDisplay($DamageTypes);
 							}
-							if($ActualDamage['NumCDs'] > 0) {
+							if ($ActualDamage['NumCDs'] > 0) {
 								?><span class="red"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
 								$this->doDamageTypeReductionDisplay($DamageTypes);
 							}
-							if($ActualDamage['NumSDs'] > 0) {
+							if ($ActualDamage['NumSDs'] > 0) {
 								?><span class="red"><?php echo number_format($ActualDamage['NumSDs']) ?></span> scout drones<?php
 							}
 						}
@@ -53,71 +53,71 @@ 
 					}
 				}
 			}
-			if(isset($TraderResults['Drones'])) {
-				$Drones =& $TraderResults['Drones'];
-				$ActualDamage =& $Drones['ActualDamage'];
-				$WeaponDamage =& $Drones['WeaponDamage'];
-				$TargetPlayer =& $Drones['TargetPlayer'];
+			if (isset($TraderResults['Drones'])) {
+				$Drones = & $TraderResults['Drones'];
+				$ActualDamage = & $Drones['ActualDamage'];
+				$WeaponDamage = & $Drones['WeaponDamage'];
+				$TargetPlayer = & $Drones['TargetPlayer'];
 
 				echo $ShootingPlayer->getDisplayName();
-				if($WeaponDamage['Launched'] == 0) {
+				if ($WeaponDamage['Launched'] == 0) {
 					?> fails to launch their combat drones<?php
 				} else {
-					?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at<?php if($ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } ?> the forces<?php
-					if(!$ActualDamage['TargetAlreadyDead']) {
-						if($ActualDamage['TotalDamage'] == 0) {
-							if($WeaponDamage['Shield'] > 0) {
-								?> which prove ineffective against the <?php if($ActualDamage['HasMines']){ ?>mines<?php } else if($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php }
-							} else if($WeaponDamage['Armour'] > 0) {
+					?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at<?php if ($ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php } ?> the forces<?php
+					if (!$ActualDamage['TargetAlreadyDead']) {
+						if ($ActualDamage['TotalDamage'] == 0) {
+							if ($WeaponDamage['Shield'] > 0) {
+								?> which prove ineffective against the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } else if ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php }
+							} else if ($WeaponDamage['Armour'] > 0) {
 								?> which is deflected by the <?php
-								if($ActualDamage['HasMines']){ ?>mines<?php } else if($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php } ?> shields<?php
+								if ($ActualDamage['HasMines']) { ?>mines<?php } else if ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php } ?> shields<?php
 							} else {
 								?> but they cannot do any damage<?php
 							}
 						} else {
 							$DamageTypes = 0;
-							if($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) { $DamageTypes = $DamageTypes+1; }
-							if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-							if($ActualDamage['NumSDs'] > 0){ $DamageTypes = $DamageTypes+1; }
+							if ($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) { $DamageTypes = $DamageTypes + 1; }
+							if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+							if ($ActualDamage['NumSDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
-							if($WeaponDamage['Kamikaze'] == 0) {
+							if ($WeaponDamage['Kamikaze'] == 0) {
 								?> destroying <?php
 							} else {
 								?> of which <span class="cds"><?php echo $WeaponDamage['Kamikaze'] ?></span> kamikaze against <span class="red"><?php echo $WeaponDamage['Kamikaze'] ?></span> mines<?php
-								if($DamageTypes > 0) {
+								if ($DamageTypes > 0) {
 									?> whilst the others destroy <?php
 								}
 							}
-							if($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) {
+							if ($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) {
 								?><span class="red"><?php echo number_format($ActualDamage['NumMines']) ?></span> mines<?php
 								$this->doDamageTypeReductionDisplay($DamageTypes);
 							}
-							if($ActualDamage['NumCDs'] > 0) {
+							if ($ActualDamage['NumCDs'] > 0) {
 								?><span class="red"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
 								$this->doDamageTypeReductionDisplay($DamageTypes);
 							}
-							if($ActualDamage['NumSDs'] > 0) {
+							if ($ActualDamage['NumSDs'] > 0) {
 								?><span class="red"><?php echo number_format($ActualDamage['NumSDs']) ?></span> scout drones<?php
 							}
 						}
 					}
 				}?>.
 				<br />
-				<?php if($ActualDamage['KillingShot']) {
+				<?php if ($ActualDamage['KillingShot']) {
 					?>Forces are <span class="red">DESTROYED!</span><br /><?php
 				}
 			}
 		}
 		echo $ShootingPlayer->getDisplayName();
-		if($TotalDamage > 0) {
+		if ($TotalDamage > 0) {
 			?> hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php
 		} else {
 			?> does no damage this round.<?php
-			if(!$TraderResults['DeadBeforeShot']) {
+			if (!$TraderResults['DeadBeforeShot']) {
 				?> Maybe they should go back to the academy<?php
 			}
 		} ?>.<br /><br /><?php
 	}
 }
 $TotalDamage = $TraderTeamCombatResults['TotalDamage']; ?>
-This fleet <?php if($TotalDamage > 0){ ?>hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php } else{ ?>does no damage this round. You call that a fleet? They need a better recruiter<?php } ?>.
+This fleet <?php if ($TotalDamage > 0) { ?>hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php } else { ?>does no damage this round. You call that a fleet? They need a better recruiter<?php } ?>.