smrealms / smr

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));

Braces +3 added lines, -6 removed lines

@@ -273,8 +273,7 @@ 
 		if ($replacement < 0) {
 			// Shift everything up by one and put the selected weapon at the bottom
 			array_push($this->weapons, array_shift($this->weapons));
-		}
-		else {
+		} else {
 			// Swap the selected weapon with the one above it
 			$temp = $this->weapons[$replacement];
 			$this->weapons[$replacement] = $this->weapons[$orderID];
@@ -288,8 +287,7 @@ 
 		if ($replacement >= count($this->weapons)) {
 			// Shift everything down by one and put the selected weapon at the top
 			array_unshift($this->weapons, array_pop($this->weapons));
-		}
-		else {
+		} else {
 			// Swap the selected weapon with the one below it
 			$temp = $this->weapons[$replacement];
 			$this->weapons[$replacement] = $this->weapons[$orderID];
@@ -348,8 +346,7 @@ 
 			$this->setArmour(150, true);
 			$this->setCargoHolds(40);
 			$this->setShipTypeID(SHIP_TYPE_NEWBIE_MERCHANT_VESSEL);
-		}
-		else {
+		} else {
 			$this->setShields(50, true);
 			$this->setArmour(50, true);
 			$this->setCargoHolds(5);

lib/Default/SmrSession.class.php

Braces +9 added lines, -18 removed lines

@@ -156,8 +156,7 @@ 
 		// now try the cookie
 		if (isset($_COOKIE['session_id']) && strlen($_COOKIE['session_id']) === 32) {
 			self::$session_id = $_COOKIE['session_id'];
-		}
-		else {
+		} else {
 			// create a new session id
 			do {
 				self::$session_id = md5(uniqid(strval(rand())));
@@ -211,18 +210,15 @@ 
 				self::$account_id = 0;
 				self::$game_id = 0;
 				self::$var = array();
-			}
-			else {
+			} else {
 				foreach (self::$var as $key => &$value) {
 					if ($value['Expires'] > 0 && $value['Expires'] <= TIME) { // Use 0 for infinity
 						//This link is no longer valid
 						unset(self::$var[$key]);
-					}
-					else if ($value['RemainingPageLoads'] < 0) {
+					} else if ($value['RemainingPageLoads'] < 0) {
 						//This link is no longer valid
 						unset(self::$var[$key]);
-					}
-					else {
+					} else {
 						--$value['RemainingPageLoads'];
 						if (isset($value['CommonID'])) {
 							self::$commonIDs[$value['CommonID']] = $key;
@@ -230,8 +226,7 @@ 
 					}
 				} unset($value);
 			}
-		}
-		else {
+		} else {
 			self::$generate = true;
 			self::$account_id = 0;
 			self::$game_id = 0;
@@ -252,8 +247,7 @@ 
 			self::$db->query('UPDATE active_session SET account_id=' . self::$db->escapeNumber(self::$account_id) . ',game_id=' . self::$db->escapeNumber(self::$game_id) . (!USING_AJAX ? ',last_accessed=' . self::$db->escapeNumber(TIME) : '') . ',session_var=' . self::$db->escapeBinary($compressed) .
 					',last_sn=' . self::$db->escapeString(self::$SN) .
 					' WHERE session_id=' . self::$db->escapeString(self::$session_id) . (USING_AJAX ? ' AND last_sn=' . self::$db->escapeString(self::$lastSN) : '') . ' LIMIT 1');
-		}
-		else {
+		} else {
 			self::$db->query('DELETE FROM active_session WHERE account_id = ' . self::$db->escapeNumber(self::$account_id) . ' AND game_id = ' . self::$db->escapeNumber(self::$game_id));
 			self::$db->query('INSERT INTO active_session (session_id, account_id, game_id, last_accessed, session_var) VALUES(' . self::$db->escapeString(self::$session_id) . ',' . self::$db->escapeNumber(self::$account_id) . ',' . self::$db->escapeNumber(self::$game_id) . ',' . self::$db->escapeNumber(TIME) . ',' . self::$db->escapeBinary($compressed) . ')');
 			self::$generate = false;
@@ -400,8 +394,7 @@ 
 		if ($value === null) {
 			unset($var[$key]);
 			unset(self::$var[self::$SN][$key]);
-		}
-		else {
+		} else {
 			$var[$key] = $value;
 			self::$var[self::$SN][$key] = $value;
 		}
@@ -423,8 +416,7 @@ 
 
 		if ($sn === false) {
 			$sn = self::generateSN($container);
-		}
-		else {
+		} else {
 			// If we've been provided an SN to use then copy over the existing 'PreviousRequestTime'
 			$container['PreviousRequestTime'] = self::$var[$sn]['PreviousRequestTime'];
 		}
@@ -437,8 +429,7 @@ 
 		if (isset(self::$commonIDs[$container['CommonID']])) {
 			$sn = self::$commonIDs[$container['CommonID']];
 			$container['PreviousRequestTime'] = isset(self::$var[$sn]) ? self::$var[$sn]['PreviousRequestTime'] : MICRO_TIME;
-		}
-		else {
+		} else {
 			do {
 				$sn = substr(md5(strval(rand())), 0, 8);
 			} while (isset(self::$var[$sn]));

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

Spacing +25 added lines, -25 removed lines

@@ -7,7 +7,7 @@ 
 	$db3 = new SmrMySqlDatabase();
 
 	// 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 = new SmrMySqlDatabase();
 
 	// 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 = new SmrMySqlDatabase();
-	$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 = new SmrMySqlDatabase();
 
-	$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 = new SmrMySqlDatabase();
 
-	$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');

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

engine/Default/history_games.php

Indentation +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
 $db = new $var['HistoryDatabase']();
 $db->query('SELECT start_date, type, end_date, game_name, speed, game_id ' .
-           'FROM game WHERE game_id = ' . $db->escapeNumber($game_id));
+		   'FROM game WHERE game_id = ' . $db->escapeNumber($game_id));
 $db->nextRecord();
 $template->assign('GameName', $game_name);
 $template->assign('Start', date(DATE_DATE_SHORT, $db->getInt('start_date')));

admin/Default/game_delete_processing.php

Spacing +78 added lines, -78 removed lines

@@ -21,14 +21,14 @@ 
 	$game_id = $var['delete_game_id'];
 
 	if ($save) {
-		$db->query('SELECT * FROM alliance WHERE game_id = '.$db->escapeNumber($game_id));
+		$db->query('SELECT * FROM alliance WHERE game_id = ' . $db->escapeNumber($game_id));
 
 		while ($db->nextRecord()) {
 			$id = $db->getInt('alliance_id');
 			//we need info for forces
 			//populate alliance list
 			$db2->query('SELECT * FROM player
-						WHERE alliance_id = '.$db2->escapeNumber($id).'
+						WHERE alliance_id = '.$db2->escapeNumber($id) . '
 							AND game_id = '.$db2->escapeNumber($game_id));
 			$list = array(0);
 			while ($db2->nextRecord()) {
@@ -36,7 +36,7 @@ 
 			}
 			$db2->query('SELECT sum(mines) as sum_m, sum(combat_drones) as cds, sum(scout_drones) as sds
 						FROM sector_has_forces
-						WHERE owner_id IN ('.$db2->escapeArray($list).') AND game_id = '.$db2->escapeNumber($game_id));
+						WHERE owner_id IN ('.$db2->escapeArray($list) . ') AND game_id = ' . $db2->escapeNumber($game_id));
 			if ($db2->nextRecord()) {
 
 				$mines = $db2->getInt('sum_m');
@@ -56,7 +56,7 @@ 
 			$deaths = $db->getInt('alliance_deaths');
 			// insert into history db
 			$history_db_sql[] = 'INSERT INTO alliance (game_id, alliance_id, leader_id, kills, deaths, alliance_name, mines, cds, sds) ' .
-								'VALUES ('.$db->escapeNumber($game_id).', '.$db->escapeNumber($id).', '.$db->escapeNumber($leader).', '.$db->escapeNumber($kills).', '.$db->escapeNumber($deaths).', ' . $db->escapeString($name) . ', '.$db->escapeNumber($mines).', '.$db->escapeNumber($cds).', '.$db->escapeNumber($sds).')';
+								'VALUES (' . $db->escapeNumber($game_id) . ', ' . $db->escapeNumber($id) . ', ' . $db->escapeNumber($leader) . ', ' . $db->escapeNumber($kills) . ', ' . $db->escapeNumber($deaths) . ', ' . $db->escapeString($name) . ', ' . $db->escapeNumber($mines) . ', ' . $db->escapeNumber($cds) . ', ' . $db->escapeNumber($sds) . ')';
 
 		}
 
@@ -65,56 +65,56 @@ 
 	// these table is nothing worth without the players
 	//$smr_db_sql[] = 'DELETE FROM account_has_logs WHERE game_id = '.$game_id;
 
-	$smr_db_sql[] = 'UPDATE active_session SET game_id = 0 WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM alliance WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM alliance_bank_transactions WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM alliance_has_roles WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM alliance_thread WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM alliance_thread_topic WHERE game_id = '.$db->escapeNumber($game_id);
+	$smr_db_sql[] = 'UPDATE active_session SET game_id = 0 WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM alliance WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM alliance_bank_transactions WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM alliance_has_roles WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM alliance_thread WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM alliance_thread_topic WHERE game_id = ' . $db->escapeNumber($game_id);
 
 	if ($save) {
 
-		$db->query('SELECT * FROM alliance_vs_alliance WHERE game_id = '.$db->escapeNumber($game_id));
+		$db->query('SELECT * FROM alliance_vs_alliance WHERE game_id = ' . $db->escapeNumber($game_id));
 		while ($db->nextRecord()) {
 
 			$alliance_1 = $db->getInt('alliance_id_1');
 			$alliance_2 = $db->getInt('alliance_id_2');
 			$kills = $db->getInt('kills');
 			$history_db_sql[] = 'INSERT INTO alliance_vs_alliance (game_id, alliance_id_1, alliance_id_2, kills) ' .
-								'VALUES ('.$game_id.', '.$alliance_1.', '.$alliance_2.', '.$kills.')';
+								'VALUES (' . $game_id . ', ' . $alliance_1 . ', ' . $alliance_2 . ', ' . $kills . ')';
 
 		}
 
 	}
 
 
-	$smr_db_sql[] = 'DELETE FROM alliance_vs_alliance WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM anon_bank WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM anon_bank_transactions WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM bar_tender WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM blackjack WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM galactic_post_applications WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM galactic_post_article WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM galactic_post_paper WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM galactic_post_paper_content WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM galactic_post_writer WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM game_galaxy WHERE game_id = '.$db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM alliance_vs_alliance WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM anon_bank WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM anon_bank_transactions WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM bar_tender WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM blackjack WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM galactic_post_applications WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM galactic_post_article WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM galactic_post_paper WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM galactic_post_paper_content WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM galactic_post_writer WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM game_galaxy WHERE game_id = ' . $db->escapeNumber($game_id);
 
 	if ($save) {
 		$game = SmrGame::getGame($game_id);
 		// insert into history db
 		$history_db_sql[] = 'INSERT INTO game (game_id, end_date, start_date, game_name, speed, type) VALUES ' .
-								'('.$db->escapeNumber($game_id).', '.$game->getEndTime().', '.$game->getStartTime().', ' . $db->escapeString($game->getGameName()) . ', '.$game->getGameSpeed().', '.$db->escapeString($game->getGameType()).')';
+								'(' . $db->escapeNumber($game_id) . ', ' . $game->getEndTime() . ', ' . $game->getStartTime() . ', ' . $db->escapeString($game->getGameName()) . ', ' . $game->getGameSpeed() . ', ' . $db->escapeString($game->getGameType()) . ')';
 	}
 
-	$smr_db_sql[] = 'DELETE FROM location WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM mb_exceptions WHERE value LIKE '.$db->escapeString($game_id.'%');
-	$smr_db_sql[] = 'DELETE FROM message WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM message_notify WHERE game_id = '.$db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM location WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM mb_exceptions WHERE value LIKE ' . $db->escapeString($game_id . '%');
+	$smr_db_sql[] = 'DELETE FROM message WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM message_notify WHERE game_id = ' . $db->escapeNumber($game_id);
 
 	if ($save) {
 
-		$db->query('SELECT * FROM news WHERE game_id = '.$game_id.' AND type = \'regular\'');
+		$db->query('SELECT * FROM news WHERE game_id = ' . $game_id . ' AND type = \'regular\'');
 		$id = 1;
 
 		while ($db->nextRecord()) {
@@ -124,17 +124,17 @@ 
 			$msg = $db->getField('news_message');
 
 			// insert into history db
-			$history_db_sql[] = 'INSERT INTO news (game_id, news_id, time, message) VALUES ('.$game_id.', '.$id.', '.$time.', ' . $db->escapeString($msg) . ')';
+			$history_db_sql[] = 'INSERT INTO news (game_id, news_id, time, message) VALUES (' . $game_id . ', ' . $id . ', ' . $time . ', ' . $db->escapeString($msg) . ')';
 			$id++;
 
 		}
 	}
 
-	$smr_db_sql[] = 'DELETE FROM news WHERE game_id = '.$db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM news WHERE game_id = ' . $db->escapeNumber($game_id);
 
 	if ($save) {
 
-		$db->query('SELECT * FROM planet WHERE game_id = '.$db->escapeNumber($game_id));
+		$db->query('SELECT * FROM planet WHERE game_id = ' . $db->escapeNumber($game_id));
 
 		while ($db->nextRecord()) {
 
@@ -142,34 +142,34 @@ 
 			$sector = $db->getInt('sector_id');
 			$owner = $db->getInt('owner_id');
 
-			$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 1');
+			$db2->query('SELECT * FROM planet_has_building WHERE game_id = ' . $game_id . ' AND sector_id = ' . $sector . ' AND construction_id = 1');
 			if ($db2->nextRecord()) $gens = $db2->getInt('amount');
 			else $gens = 0;
 
-			$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 2');
+			$db2->query('SELECT * FROM planet_has_building WHERE game_id = ' . $game_id . ' AND sector_id = ' . $sector . ' AND construction_id = 2');
 			if ($db2->nextRecord()) $hangs = $db2->getInt('amount');
 			else $hangs = 0;
 
-			$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 3');
+			$db2->query('SELECT * FROM planet_has_building WHERE game_id = ' . $game_id . ' AND sector_id = ' . $sector . ' AND construction_id = 3');
 			if ($db2->nextRecord()) $turs = $db2->getInt('amount');
 			else $turs = 0;
 
 			// insert into history db
 			$history_db_sql[] = 'INSERT INTO planet (game_id, sector_id, owner_id, generators, hangers, turrets) VALUES ' .
-								'('.$game_id.', '.$sector.', '.$owner.', '.$gens.', '.$hangs.', '.$turs.')';
+								'(' . $game_id . ', ' . $sector . ', ' . $owner . ', ' . $gens . ', ' . $hangs . ', ' . $turs . ')';
 
 		}
 
 	}
 
-	$smr_db_sql[] = 'DELETE FROM planet WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM planet_is_building WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM planet_has_cargo WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM planet_has_building WHERE game_id = '.$db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM planet WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM planet_is_building WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM planet_has_cargo WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM planet_has_building WHERE game_id = ' . $db->escapeNumber($game_id);
 
 	if ($save) {
 
-		$db->query('SELECT * FROM player WHERE game_id = '.$game_id);
+		$db->query('SELECT * FROM player WHERE game_id = ' . $game_id);
 
 		while ($db->nextRecord()) {
 
@@ -187,48 +187,48 @@ 
 
 			$amount = 0;
 			$smrCredits = 0;
-			$db2->query('SELECT sum(amount) as bounty_am, sum(smr_credits) as bounty_cred FROM bounty WHERE game_id = '.$game_id.' AND account_id = '.$acc_id.' AND claimer_id = 0');
+			$db2->query('SELECT sum(amount) as bounty_am, sum(smr_credits) as bounty_cred FROM bounty WHERE game_id = ' . $game_id . ' AND account_id = ' . $acc_id . ' AND claimer_id = 0');
 			if ($db2->nextRecord()) {
 				if (is_int($db2->getField('bounty_am'))) $amount = $db2->getInt('bounty_am');
 				if (is_int($db2->getField('bounty_cred'))) $smrCredits = $db2->getInt('bounty_cred');
 
 			}
 
-			$db2->query('SELECT * FROM ship_has_name WHERE game_id = '.$game_id.' AND account_id = '.$acc_id);
+			$db2->query('SELECT * FROM ship_has_name WHERE game_id = ' . $game_id . ' AND account_id = ' . $acc_id);
 			if ($db2->nextRecord()) $ship_name = $db2->getField('ship_name');
 			else $ship_name = 'None';
 
 			// insert into history db
 			$history_db_sql[] = 'INSERT INTO player (account_id, game_id, player_name, player_id, experience, ship, race, alignment, alliance_id, kills, deaths, bounty, bounty_cred, ship_name) ' .
-								'VALUES ('.$acc_id.', '.$game_id.', ' . $db->escapeString($name) . ', '.$id.', '.$exp.', '.$ship.', '.$race.', '.$align.', '.$alli.', '.$kills.', '.$deaths.', '.$amount.','.$smrCredits.', ' . $db->escapeString($ship_name) . ')';
+								'VALUES (' . $acc_id . ', ' . $game_id . ', ' . $db->escapeString($name) . ', ' . $id . ', ' . $exp . ', ' . $ship . ', ' . $race . ', ' . $align . ', ' . $alli . ', ' . $kills . ', ' . $deaths . ', ' . $amount . ',' . $smrCredits . ', ' . $db->escapeString($ship_name) . ')';
 
 		}
 
 	}
 
-	$smr_db_sql[] = 'DELETE FROM player WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM bounty WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM player_has_ticker WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM player_has_ticket WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM player_has_alliance_role WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM player_has_drinks WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM player_has_relation WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM player_has_unread_messages WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM player_plotted_course WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM player_read_thread WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM player_visited_port WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM player_visited_sector WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM player_votes_pact WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM player_votes_relation WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM plot_cache WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM port WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM port_has_goods WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM race_has_relation WHERE game_id = '.$db->escapeNumber($game_id);
-	$smr_db_sql[] = 'DELETE FROM race_has_voting WHERE game_id = '.$db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM player WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM bounty WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM player_has_ticker WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM player_has_ticket WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM player_has_alliance_role WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM player_has_drinks WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM player_has_relation WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM player_has_unread_messages WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM player_plotted_course WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM player_read_thread WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM player_visited_port WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM player_visited_sector WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM player_votes_pact WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM player_votes_relation WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM plot_cache WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM port WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM port_has_goods WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM race_has_relation WHERE game_id = ' . $db->escapeNumber($game_id);
+	$smr_db_sql[] = 'DELETE FROM race_has_voting WHERE game_id = ' . $db->escapeNumber($game_id);
 
 	if ($save) {
 
-		$db->query('SELECT * FROM sector WHERE game_id = '.$game_id);
+		$db->query('SELECT * FROM sector WHERE game_id = ' . $game_id);
 
 		while ($db->nextRecord()) {
 
@@ -238,7 +238,7 @@ 
 			$gal_id = $db->getInt('galaxy_id');
 
 			$db2->query('SELECT sum(mines) as sum_mines, sum(combat_drones) as cds, sum(scout_drones) as sds FROM sector_has_forces ' .
-						'WHERE sector_id = '.$sector.' AND game_id = '.$game_id.' GROUP BY sector_id');
+						'WHERE sector_id = ' . $sector . ' AND game_id = ' . $game_id . ' GROUP BY sector_id');
 			if ($db2->nextRecord()) {
 
 				$mines = $db2->getInt('sum_mines');
@@ -258,32 +258,32 @@ 
 
 			// insert into history db
 			$history_db_sql[] = 'INSERT INTO sector (game_id, sector_id, gal_id, mines, kills, combat, scouts) ' .
-								'VALUES ('.$game_id.','. $sector.','. $gal_id.','. $mines.','. $kills.','. $cds.','. $sds.')';
+								'VALUES (' . $game_id . ',' . $sector . ',' . $gal_id . ',' . $mines . ',' . $kills . ',' . $cds . ',' . $sds . ')';
 
 		}
 
 	}
 
-	$smr_db_sql[] = 'DELETE FROM sector WHERE game_id = '.$game_id;
-	$smr_db_sql[] = 'DELETE FROM sector_has_forces WHERE game_id = '.$game_id;
-	$smr_db_sql[] = 'DELETE FROM ship_has_cargo WHERE game_id = '.$game_id;
-	$smr_db_sql[] = 'DELETE FROM ship_has_hardware WHERE game_id = '.$game_id;
-	$smr_db_sql[] = 'DELETE FROM ship_has_name WHERE game_id = '.$game_id;
-	$smr_db_sql[] = 'DELETE FROM ship_has_illusion WHERE game_id = '.$game_id;
-	$smr_db_sql[] = 'DELETE FROM ship_has_weapon WHERE game_id = '.$game_id;
-	$smr_db_sql[] = 'DELETE FROM ship_is_cloaked WHERE game_id = '.$game_id;
-	$smr_db_sql[] = 'UPDATE game SET end_time='.TIME.' WHERE game_id = '.$game_id.' AND end_time > '.TIME; // Do not delete game placeholder, just make sure game is finished
-	$smr_db_sql[] = 'UPDATE active_session SET game_id = 0 WHERE game_id = '.$game_id;
+	$smr_db_sql[] = 'DELETE FROM sector WHERE game_id = ' . $game_id;
+	$smr_db_sql[] = 'DELETE FROM sector_has_forces WHERE game_id = ' . $game_id;
+	$smr_db_sql[] = 'DELETE FROM ship_has_cargo WHERE game_id = ' . $game_id;
+	$smr_db_sql[] = 'DELETE FROM ship_has_hardware WHERE game_id = ' . $game_id;
+	$smr_db_sql[] = 'DELETE FROM ship_has_name WHERE game_id = ' . $game_id;
+	$smr_db_sql[] = 'DELETE FROM ship_has_illusion WHERE game_id = ' . $game_id;
+	$smr_db_sql[] = 'DELETE FROM ship_has_weapon WHERE game_id = ' . $game_id;
+	$smr_db_sql[] = 'DELETE FROM ship_is_cloaked WHERE game_id = ' . $game_id;
+	$smr_db_sql[] = 'UPDATE game SET end_time=' . TIME . ' WHERE game_id = ' . $game_id . ' AND end_time > ' . TIME; // Do not delete game placeholder, just make sure game is finished
+	$smr_db_sql[] = 'UPDATE active_session SET game_id = 0 WHERE game_id = ' . $game_id;
 
 	// now do the sql stuff
-	foreach($smr_db_sql as $sql) {
+	foreach ($smr_db_sql as $sql) {
 
 		$db->query($sql);
 
 	}
 
 	$db = new SmrHistoryMySqlDatabase();
-	foreach($history_db_sql as $sql) {
+	foreach ($history_db_sql as $sql) {
 
 		$db->query($sql);
 

Braces +37 added lines, -17 removed lines

@@ -11,8 +11,7 @@ 
 $action = $_REQUEST['action'];
 if ($_REQUEST['save'] == 'Yes') {
 	$save = true;
-}
-else {
+} else {
 	$save = false;
 }
 
@@ -42,8 +41,7 @@ 
 				$mines = $db2->getInt('sum_m');
 				$cds = $db2->getInt('cds');
 				$sds = $db2->getInt('sds');
-			}
-			else {
+			} else {
 				$mines = 0;
 				$cds = 0;
 				$sds = 0;
@@ -143,16 +141,25 @@ 
 			$owner = $db->getInt('owner_id');
 
 			$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 1');
-			if ($db2->nextRecord()) $gens = $db2->getInt('amount');
-			else $gens = 0;
+			if ($db2->nextRecord()) {
+				$gens = $db2->getInt('amount');
+			} else {
+				$gens = 0;
+			}
 
 			$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 2');
-			if ($db2->nextRecord()) $hangs = $db2->getInt('amount');
-			else $hangs = 0;
+			if ($db2->nextRecord()) {
+				$hangs = $db2->getInt('amount');
+			} else {
+				$hangs = 0;
+			}
 
 			$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 3');
-			if ($db2->nextRecord()) $turs = $db2->getInt('amount');
-			else $turs = 0;
+			if ($db2->nextRecord()) {
+				$turs = $db2->getInt('amount');
+			} else {
+				$turs = 0;
+			}
 
 			// insert into history db
 			$history_db_sql[] = 'INSERT INTO planet (game_id, sector_id, owner_id, generators, hangers, turrets) VALUES ' .
@@ -189,14 +196,21 @@ 
 			$smrCredits = 0;
 			$db2->query('SELECT sum(amount) as bounty_am, sum(smr_credits) as bounty_cred FROM bounty WHERE game_id = '.$game_id.' AND account_id = '.$acc_id.' AND claimer_id = 0');
 			if ($db2->nextRecord()) {
-				if (is_int($db2->getField('bounty_am'))) $amount = $db2->getInt('bounty_am');
-				if (is_int($db2->getField('bounty_cred'))) $smrCredits = $db2->getInt('bounty_cred');
+				if (is_int($db2->getField('bounty_am'))) {
+					$amount = $db2->getInt('bounty_am');
+				}
+				if (is_int($db2->getField('bounty_cred'))) {
+					$smrCredits = $db2->getInt('bounty_cred');
+				}
 
 			}
 
 			$db2->query('SELECT * FROM ship_has_name WHERE game_id = '.$game_id.' AND account_id = '.$acc_id);
-			if ($db2->nextRecord()) $ship_name = $db2->getField('ship_name');
-			else $ship_name = 'None';
+			if ($db2->nextRecord()) {
+				$ship_name = $db2->getField('ship_name');
+			} else {
+				$ship_name = 'None';
+			}
 
 			// insert into history db
 			$history_db_sql[] = 'INSERT INTO player (account_id, game_id, player_name, player_id, experience, ship, race, alignment, alliance_id, kills, deaths, bounty, bounty_cred, ship_name) ' .
@@ -244,9 +258,15 @@ 
 				$mines = $db2->getInt('sum_mines');
 				$cds = $db2->getInt('cds');
 				$sds = $db2->getInt('sds');
-				if (!is_numeric($mines)) $mines = 0;
-				if (!is_numeric($cds)) $cds = 0;
-				if (!is_numeric($sds)) $sds = 0;
+				if (!is_numeric($mines)) {
+					$mines = 0;
+				}
+				if (!is_numeric($cds)) {
+					$cds = 0;
+				}
+				if (!is_numeric($sds)) {
+					$sds = 0;
+				}
 
 			} else {
 

templates/Default/engine/Default/includes/PortCombatResults.inc

Spacing +44 added lines, -44 removed lines

@@ -1,35 +1,35 @@ 
 <?php
-$CombatPort =& $PortCombatResults['Port'];
+$CombatPort = & $PortCombatResults['Port'];
 $TotalDamage = $PortCombatResults['TotalDamage'];
-if($MinimalDisplay) {
+if ($MinimalDisplay) {
 	echo $CombatPort->getDisplayName();
-	if($TotalDamage > 0) {
+	if ($TotalDamage > 0) {
 		?> hit for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat of which <span class="red"><?php echo $PortCombatResults['TotalDamagePerTargetPlayer'][$ThisPlayer->getAccountID()]; ?></span> was done to you<?php
 	} else {
 		?> does no damage this round<?php
 	} ?>. <?php echo $AttackLogLink;
 	return;
 }
-if(isset($PortCombatResults['Weapons']) && is_array($PortCombatResults['Weapons'])) {
-	foreach($PortCombatResults['Weapons'] as $WeaponResults) {
-		$ShootingWeapon =& $WeaponResults['Weapon'];
-		$ShotHit =& $WeaponResults['Hit'];
-		$ActualDamage =& $WeaponResults['ActualDamage'];
-		$WeaponDamage =& $WeaponResults['WeaponDamage'];
-		$TargetPlayer =& $WeaponResults['TargetPlayer'];
+if (isset($PortCombatResults['Weapons']) && is_array($PortCombatResults['Weapons'])) {
+	foreach ($PortCombatResults['Weapons'] as $WeaponResults) {
+		$ShootingWeapon = & $WeaponResults['Weapon'];
+		$ShotHit = & $WeaponResults['Hit'];
+		$ActualDamage = & $WeaponResults['ActualDamage'];
+		$WeaponDamage = & $WeaponResults['WeaponDamage'];
+		$TargetPlayer = & $WeaponResults['TargetPlayer'];
 		
-		echo $CombatPort->getDisplayName() ?> fires an <?php echo $ShootingWeapon->getName() ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
+		echo $CombatPort->getDisplayName() ?> fires an <?php echo $ShootingWeapon->getName() ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
 		if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
-			if(!$ShotHit) {
+			if (!$ShotHit) {
 				?> and misses<?php
-			} else if($ActualDamage['TotalDamage'] == 0) {
-				if($WeaponDamage['Shield'] > 0) {
-					if($ActualDamage['HasCDs']) {
+			} else if ($ActualDamage['TotalDamage'] == 0) {
+				if ($WeaponDamage['Shield'] > 0) {
+					if ($ActualDamage['HasCDs']) {
 						?> which proves ineffective against their combat drones<?php
 					} else {
 						?> which washes harmlessly over their hull<?php
 					}
-				} else if($WeaponDamage['Armour'] > 0) {
+				} else if ($WeaponDamage['Armour'] > 0) {
 					?> which is deflected by their shields<?php
 				} else {
 					?> but it cannot do any damage<?php
@@ -37,49 +37,49 @@ 
 			} else {
 				?> destroying <?php
 				$DamageTypes = 0;
-				if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-				if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-				if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+				if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+				if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+				if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
-				if($ActualDamage['Shield'] > 0) {
+				if ($ActualDamage['Shield'] > 0) {
 					?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
 					$this->doDamageTypeReductionDisplay($DamageTypes);
 				}
-				if($ActualDamage['NumCDs'] > 0) {
+				if ($ActualDamage['NumCDs'] > 0) {
 					?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
 					$this->doDamageTypeReductionDisplay($DamageTypes);
 				}
-				if($ActualDamage['Armour'] > 0) {
+				if ($ActualDamage['Armour'] > 0) {
 					?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
 				}
 			}
 		} ?>.
 		<br /><?php
 		if ($ShotHit && $ActualDamage['KillingShot']) {
-			$this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer));
+			$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer));
 		}
 	}
 }
-if(isset($PortCombatResults['Drones'])) {
-	$Drones =& $PortCombatResults['Drones'];
-	$ActualDamage =& $Drones['ActualDamage'];
-	$WeaponDamage =& $Drones['WeaponDamage'];
-	$TargetPlayer =& $Drones['TargetPlayer'];
+if (isset($PortCombatResults['Drones'])) {
+	$Drones = & $PortCombatResults['Drones'];
+	$ActualDamage = & $Drones['ActualDamage'];
+	$WeaponDamage = & $Drones['WeaponDamage'];
+	$TargetPlayer = & $Drones['TargetPlayer'];
 	
 	echo $CombatPort->getDisplayName();
-	if($WeaponDamage['Launched'] == 0) {
+	if ($WeaponDamage['Launched'] == 0) {
 		?> fails to launch it's 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 } echo $TargetPlayer->getDisplayName();
-		if(!$ActualDamage['TargetAlreadyDead']) {
-			if($ActualDamage['TotalDamage'] == 0) {
-				if($WeaponDamage['Shield'] > 0) {
-					if($ActualDamage['HasCDs']) {
+		?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php if ($ActualDamage['TargetAlreadyDead']) { ?>the debris that was once <?php } echo $TargetPlayer->getDisplayName();
+		if (!$ActualDamage['TargetAlreadyDead']) {
+			if ($ActualDamage['TotalDamage'] == 0) {
+				if ($WeaponDamage['Shield'] > 0) {
+					if ($ActualDamage['HasCDs']) {
 						?> which prove ineffective against their combat drones<?php
 					} else {
 						?> which washes harmlessly over their hull<?php
 					}
-				} else if($WeaponDamage['Armour'] > 0) {
+				} else if ($WeaponDamage['Armour'] > 0) {
 					?> which is deflected by their shields<?php
 				} else {
 					?> but they cannot do any damage<?php
@@ -87,32 +87,32 @@ 
 			} else {
 				?> destroying <?php
 				$DamageTypes = 0;
-				if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
-				if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
-				if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
+				if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
+				if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
+				if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
 
-				if($ActualDamage['Shield'] > 0) {
+				if ($ActualDamage['Shield'] > 0) {
 					?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
 					$this->doDamageTypeReductionDisplay($DamageTypes);
 				}
-				if($ActualDamage['NumCDs'] > 0) {
+				if ($ActualDamage['NumCDs'] > 0) {
 					?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
 					$this->doDamageTypeReductionDisplay($DamageTypes);
 				}
-				if($ActualDamage['Armour'] > 0) {
+				if ($ActualDamage['Armour'] > 0) {
 					?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
 				}
 			}
 		}
 	} ?>.
 	<br /><?php
-	if($ActualDamage['KillingShot']) {
-		$this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer));
+	if ($ActualDamage['KillingShot']) {
+		$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer));
 	}
 }
 
 echo $CombatPort->getDisplayName();
-if($TotalDamage > 0) {
+if ($TotalDamage > 0) {
 	?> hit 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

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 } ?>.