Inspection of "Use ?? operator to simplify expressions" - smrealms/smr - Measure and Improve Code Quality continuously with Scrutinizer

Failed Conditions

Pull Request — master (#817)

by Dan

created 2020-01-25 01:42 UTC

Status

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 		// **************************
 		// **  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 @@  discard block
 block discarded – undo
 		// **************************
 		// **  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 @@  discard block
 block discarded – undo
 		// **************************
 		// **  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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 }
 
 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 @@  discard block
 block discarded – undo
 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');

Please login to merge, or discard this patch.

Braces +30 added lines, -22 removed lines patch added patch discarded remove patch

@@ -22,16 +22,18 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 		// **************************
 		$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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 
 		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 @@  discard block
 block discarded – undo
 		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

Please login to merge, or discard this patch.

engine/Default/history_games.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -11,7 +11,7 @@
 block discarded – undo
 
 $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')));

Please login to merge, or discard this patch.

admin/Default/game_delete_processing.php 2 patches

Spacing +78 added lines, -78 removed lines patch added patch discarded remove patch

@@ -21,14 +21,14 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 			}
 			$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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 	// 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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 
 			$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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 
 			// 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);
 

Please login to merge, or discard this patch.

Braces +37 added lines, -17 removed lines patch added patch discarded remove patch

@@ -11,8 +11,7 @@  discard block
 block discarded – undo
 $action = $_REQUEST['action'];
 if ($_REQUEST['save'] == 'Yes') {
 	$save = true;
-}
-else {
+} else {
 	$save = false;
 }
 
@@ -42,8 +41,7 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 				$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 {
 

Please login to merge, or discard this patch.

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

Spacing +50 added lines, -50 removed lines patch added patch discarded remove patch

@@ -1,48 +1,48 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 					}
 				}
 			}
-			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 } ?>.

Please login to merge, or discard this patch.

templates/Default/engine/Default/includes/PlanetTraderTeamCombatResults.inc 1 patch

Spacing +49 added lines, -49 removed lines patch added patch discarded remove patch

@@ -1,10 +1,10 @@  discard block
 block discarded – undo
 <?php
-foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
-	$ShootingPlayer =& $TraderResults['Player'];
-	$TotalDamage =& $TraderResults['TotalDamage'];
-	if($MinimalDisplay && !$ThisPlayer->equals($ShootingPlayer)) {
+foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
+	$ShootingPlayer = & $TraderResults['Player'];
+	$TotalDamage = & $TraderResults['TotalDamage'];
+	if ($MinimalDisplay && !$ThisPlayer->equals($ShootingPlayer)) {
 		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
@@ -12,29 +12,29 @@  discard block
 block discarded – undo
 		continue;
 	}
 
-	if($TraderResults['DeadBeforeShot']) {
+	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'];
-				$TargetPlanet =& $WeaponResults['TargetPlanet'];
+		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'];
+				$TargetPlanet = & $WeaponResults['TargetPlanet'];
 				
-				echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?>the debris that was once <?php } echo $TargetPlanet->getDisplayName();
+				echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?>the debris that was once <?php } echo $TargetPlanet->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
@@ -42,96 +42,96 @@  discard block
 block discarded – undo
 					} 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/PlanetKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlanet'=>$TargetPlanet));
+					$this->includeTemplate('includes/PlanetKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlanet'=>$TargetPlanet));
 				}
 			}
 		}
-		if(isset($TraderResults['Drones'])) {
-			$Drones =& $TraderResults['Drones'];
-			$ActualDamage =& $Drones['ActualDamage'];
-			$WeaponDamage =& $Drones['WeaponDamage'];
-			$TargetPlanet =& $Drones['TargetPlanet'];
+		if (isset($TraderResults['Drones'])) {
+			$Drones = & $TraderResults['Drones'];
+			$ActualDamage = & $Drones['ActualDamage'];
+			$WeaponDamage = & $Drones['WeaponDamage'];
+			$TargetPlanet = & $Drones['TargetPlanet'];
 			$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; }
 
 			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']) {
+				if ($ActualDamage['TargetAlreadyDead']) {
 					?>the debris that was once <?php
 				}
 				echo $TargetPlanet->getDisplayName();
-				if(!$ActualDamage['TargetAlreadyDead']) {
-					if($ActualDamage['TotalDamage'] == 0) {
-						if($WeaponDamage['Shield'] > 0) {
-							if($ActualDamage['HasCDs']) {
+				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
 							}
 						}
-						if($ActualDamage['Armour'] > 0) {
+						if ($ActualDamage['Armour'] > 0) {
 							?> which is deflected by their shields<?php
 						} else {
 							?> but they cannot do any damage<?php
 						}
 					} else {
 						?> destroying <?php
-						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/PlanetKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPlanet'=>$TargetPlanet));
+			if ($ActualDamage['KillingShot']) {
+				$this->includeTemplate('includes/PlanetKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlanet'=>$TargetPlanet));
 			}
 		}
 	}
 	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 } ?>.<br /><?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 } ?>.<br /><?php
 foreach ($TraderTeamCombatResults['Downgrades'] as $structureID => $numDestroyed) { ?>
 	This team destroys <span class="red"><?php echo $numDestroyed; ?> </span><?php echo pluralise($TargetPlanet->getStructureTypes($structureID)->name(), $numDestroyed); ?>.<br /><?php
 } ?>

Please login to merge, or discard this patch.

templates/Default/engine/Default/includes/PlanetCombatResults.inc 2 patches

Spacing +43 added lines, -43 removed lines patch added patch discarded remove patch

@@ -1,9 +1,9 @@  discard block
 block discarded – undo
 <?php
 $CombatPlanet = $PlanetCombatResults['Planet'];
 $TotalDamage = $PlanetCombatResults['TotalDamage'];
-if($MinimalDisplay) {
+if ($MinimalDisplay) {
 	echo $CombatPlanet->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 $PlanetCombatResults['TotalDamagePerTargetPlayer'][$ThisPlayer->getAccountID()]; ?></span> was done to you<?php
 	}
 	else {
@@ -11,29 +11,29 @@  discard block
 block discarded – undo
 	} ?>. <?php echo $AttackLogLink;
 	return;
 }
-if(isset($PlanetCombatResults['Weapons']) && is_array($PlanetCombatResults['Weapons'])) {
-	foreach($PlanetCombatResults['Weapons'] as $WeaponResults) {
-		$ShootingWeapon =& $WeaponResults['Weapon'];
-		$ShotHit =& $WeaponResults['Hit'];
-		$ActualDamage =& $WeaponResults['ActualDamage'];
-		$WeaponDamage =& $WeaponResults['WeaponDamage'];
-		$TargetPlayer =& $WeaponResults['TargetPlayer'];
+if (isset($PlanetCombatResults['Weapons']) && is_array($PlanetCombatResults['Weapons'])) {
+	foreach ($PlanetCombatResults['Weapons'] as $WeaponResults) {
+		$ShootingWeapon = & $WeaponResults['Weapon'];
+		$ShotHit = & $WeaponResults['Hit'];
+		$ActualDamage = & $WeaponResults['ActualDamage'];
+		$WeaponDamage = & $WeaponResults['WeaponDamage'];
+		$TargetPlayer = & $WeaponResults['TargetPlayer'];
 		
-		echo $CombatPlanet->getDisplayName() ?> fires a <?php echo $ShootingWeapon->getName(); ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
+		echo $CombatPlanet->getDisplayName() ?> fires a <?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 {
@@ -43,56 +43,56 @@  discard block
 block discarded – undo
 			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($PlanetCombatResults['Drones'])) {
-	$Drones =& $PlanetCombatResults['Drones'];
-	$ActualDamage =& $Drones['ActualDamage'];
-	$WeaponDamage =& $Drones['WeaponDamage'];
-	$TargetPlayer =& $Drones['TargetPlayer'];
+if (isset($PlanetCombatResults['Drones'])) {
+	$Drones = & $PlanetCombatResults['Drones'];
+	$ActualDamage = & $Drones['ActualDamage'];
+	$WeaponDamage = & $Drones['WeaponDamage'];
+	$TargetPlayer = & $Drones['TargetPlayer'];
 	$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; }
 	
 	echo $CombatPlanet->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 {
@@ -101,28 +101,28 @@  discard block
 block discarded – undo
 			}
 			else {
 				?> destroying <?php
-				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 $CombatPlanet->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 {

Please login to merge, or discard this patch.

Braces +12 added lines, -24 removed lines patch added patch discarded remove patch

@@ -5,8 +5,7 @@  discard block
 block discarded – undo
 	echo $CombatPlanet->getDisplayName();
 	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 $PlanetCombatResults['TotalDamagePerTargetPlayer'][$ThisPlayer->getAccountID()]; ?></span> was done to you<?php
-	}
-	else {
+	} else {
 		?> does no damage this round<?php
 	} ?>. <?php echo $AttackLogLink;
 	return;
@@ -23,24 +22,19 @@  discard block
 block discarded – undo
 		if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
 			if(!$ShotHit) {
 				?> and misses<?php
-			}
-			else if($ActualDamage['TotalDamage'] == 0) {
+			} else if($ActualDamage['TotalDamage'] == 0) {
 				if($WeaponDamage['Shield'] > 0) {
 					if($ActualDamage['HasCDs']) {
 						?> which proves ineffective against their combat drones<?php
-					}
-					else {
+					} 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 {
+				} else {
 					?> but it cannot do any damage<?php
 				}
-			}
-			else {
+			} else {
 				?> destroying <?php
 				$DamageTypes = 0;
 				if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
@@ -79,27 +73,22 @@  discard block
 block discarded – undo
 	echo $CombatPlanet->getDisplayName();
 	if($WeaponDamage['Launched'] == 0) {
 		?> fails to launch it's combat drones<?php
-	}
-	else {
+	} 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']) {
 						?> which prove ineffective against their combat drones<?php
-					}
-					else {
+					} 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 {
+				} else {
 					?> but they cannot do any damage<?php
 				}
-			}
-			else {
+			} else {
 				?> destroying <?php
 				if($ActualDamage['Shield'] > 0) {
 					?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php
@@ -124,7 +113,6 @@  discard block
 block discarded – undo
 echo $CombatPlanet->getDisplayName();
 if($TotalDamage > 0) {
 	?> hit for a total of <span class="red"><?php echo $TotalDamage; ?></span> damage in this round of combat<?php
-}
-else {
+} else {
 	?> does no damage this round. You call that a planet? It needs a better builder<?php
 } ?>.

Please login to merge, or discard this patch.

templates/Default/engine/Default/includes/TraderTeamCombatResults.inc 1 patch

Spacing +48 added lines, -48 removed lines patch added patch discarded remove patch

@@ -1,36 +1,36 @@  discard block
 block discarded – undo
 <?php
-if(is_array($TraderTeamCombatResults['Traders'])) {
-	foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
-		$ShootingPlayer =& $TraderResults['Player'];
-		$TotalDamage =& $TraderResults['TotalDamage'];
+if (is_array($TraderTeamCombatResults['Traders'])) {
+	foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
+		$ShootingPlayer = & $TraderResults['Player'];
+		$TotalDamage = & $TraderResults['TotalDamage'];
 	
-		if($TraderResults['DeadBeforeShot']) {
+		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']) {
+					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
@@ -38,94 +38,94 @@  discard block
 block discarded – undo
 						} 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,'ShootingPlayer'=>$ShootingPlayer));
+						$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer));
 					}
 				}
 			}
-			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'];
 				$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; }
 	
 				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']) {
+					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']) {
+					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
 								}
 							}
-							if($ActualDamage['Armour'] > 0) {
+							if ($ActualDamage['Armour'] > 0) {
 								?> which is deflected by their shields<?php
 							} else {
 								?> but they cannot do any damage<?php
 							}
 						} else {
 							?> destroying <?php
-							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,'ShootingPlayer'=>$ShootingPlayer));
+				if ($ActualDamage['KillingShot']) {
+					$this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer));
 				}
 			}
 		}
 		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 } ?>.<br />
+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 } ?>.<br />

Please login to merge, or discard this patch.

engine/Default/cargo_dump_processing.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -46,7 +46,7 @@
 block discarded – undo
 
 	// Don't lose more exp than you have
 	$lost_xp = min($player->getExperience(),
-	               IRound(SmrPort::getBaseExperience($amount, $good_distance)));
+				   IRound(SmrPort::getBaseExperience($amount, $good_distance)));
 	$player->decreaseExperience($lost_xp);
 	$player->increaseHOF($lost_xp, array('Trade', 'Experience', 'Jettisoned'), HOF_PUBLIC);
 

Please login to merge, or discard this patch.

lib/Default/SmrMines.class.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -94,7 +94,7 @@  discard block
 block discarded – undo
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		if ($targetPlayer->getShip()->isFederal()) { // do less damage to fed ships 
 			$damage['MaxDamage'] = IRound($damage['MaxDamage'] * self::FED_SHIP_DAMAGE_MODIFIER);
 			$damage['Shield'] = IRound($damage['Shield'] * self::FED_SHIP_DAMAGE_MODIFIER);
@@ -131,12 +131,12 @@  discard block
 block discarded – undo
 	}
 	
 	protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer, $minesAreAttacker = false) {
-		$return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']);
 		$return['ActualDamage']['Launched'] = ICeil($return['WeaponDamage']['Launched'] * $return['ActualDamage']['TotalDamage'] / $return['WeaponDamage']['MaxDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+			$return['KillResults'] = & $targetPlayer->killPlayerByForces($forces);
 		}
 		return $return;
 	}

Please login to merge, or discard this patch.

Scrutinizer GitHub App not installed

Pull Request — master (#817)

Status

Category

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

Braces +30 added lines, -22 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +78 added lines, -78 removed lines patch added patch discarded remove patch

Braces +37 added lines, -17 removed lines patch added patch discarded remove patch

Spacing +50 added lines, -50 removed lines patch added patch discarded remove patch

Spacing +49 added lines, -49 removed lines patch added patch discarded remove patch

Spacing +43 added lines, -43 removed lines patch added patch discarded remove patch

Braces +12 added lines, -24 removed lines patch added patch discarded remove patch

Spacing +48 added lines, -48 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

		@@ -7,7 +7,7 @@ discard block
		block discarded – undo
7	7	$db3 = new SmrMySqlDatabase();
8	8
9	9	// get current entry
10		- $db->query('SELECT * FROM manual WHERE topic_id = '.$db->escapeNumber($topic_id));
	10	+ $db->query('SELECT * FROM manual WHERE topic_id = ' . $db->escapeNumber($topic_id));
11	11	if ($db->nextRecord()) {
12	12	$parent_topic_id = $db->getInt('parent_topic_id');
13	13	$order_id = $db->getInt('order_id');
		@@ -19,17 +19,17 @@ discard block
		block discarded – undo
19	19	// **************************
20	20	// ** PREVIOUS
21	21	// **************************
22		- $db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id - 1));
	22	+ $db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($order_id - 1));
23	23
24	24	// no result?
25	25	if (!$db2->getNumRows())
26		- $db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
	26	+ $db2->query('SELECT * FROM manual WHERE topic_id = ' . $db2->escapeNumber($parent_topic_id));
27	27
28	28	echo ('<th width="32">');
29	29	if ($db2->nextRecord()) {
30	30	$previous_topic_id = $db2->getInt('topic_id');
31	31	$previous_topic = stripslashes($db2->getField('topic'));
32		- echo ('<a href="/manual.php?'.$previous_topic_id.'"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
	32	+ echo ('<a href="/manual.php?' . $previous_topic_id . '"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
33	33	} else
34	34	echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
35	35	echo ('</th>');
		@@ -37,12 +37,12 @@ discard block
		block discarded – undo
37	37	// **************************
38	38	// ** UP
39	39	// **************************
40		- $db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
	40	+ $db2->query('SELECT * FROM manual WHERE topic_id = ' . $db2->escapeNumber($parent_topic_id));
41	41	echo ('<th width="32">');
42	42	if ($db2->nextRecord()) {
43	43	$up_topic_id = $db2->getInt('topic_id');
44	44	$up_topic = stripslashes($db2->getField('topic'));
45		- echo ('<a href="/manual.php?'.$up_topic_id.'"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
	45	+ echo ('<a href="/manual.php?' . $up_topic_id . '"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
46	46	} else
47	47	echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
48	48	echo ('</th>');
		@@ -50,35 +50,35 @@ discard block
		block discarded – undo
50	50	// **************************
51	51	// ** NEXT
52	52	// **************************
53		- $db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($topic_id).' AND order_id = 1');
	53	+ $db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($topic_id) . ' AND order_id = 1');
54	54
55	55	if (!$db2->getNumRows())
56		- $db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1));
	56	+ $db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($order_id + 1));
57	57
58	58	$seenParentIDs = array(0);
59	59	$curr_parent_topic_id = $parent_topic_id;
60	60	while (!$db2->getNumRows() && !in_array($curr_parent_topic_id, $seenParentIDs)) {
61	61	$seenParentIDs[] = $curr_parent_topic_id;
62		- $db3->query('SELECT * FROM manual WHERE topic_id = '.$db3->escapeNumber($parent_topic_id));
	62	+ $db3->query('SELECT * FROM manual WHERE topic_id = ' . $db3->escapeNumber($parent_topic_id));
63	63	$db3->nextRecord();
64	64	$curr_order_id = $db3->getInt('order_id');
65	65	$curr_parent_topic_id = $db3->getInt('parent_topic_id');
66	66
67		- $db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($curr_order_id + 1));
	67	+ $db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($curr_order_id + 1));
68	68	}
69	69
70	70	echo ('<th width="32">');
71	71	if ($db2->nextRecord()) {
72	72	$next_topic_id = $db2->getInt('topic_id');
73	73	$next_topic = stripslashes($db2->getField('topic'));
74		- echo ('<a href="/manual.php?'.$next_topic_id.'"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
	74	+ echo ('<a href="/manual.php?' . $next_topic_id . '"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
75	75	}
76	76	else {
77	77	echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
78	78	}
79	79	echo ('</th>');
80	80
81		- echo ('<th width="100%" class="center" validn="middle" style="font-size:18pt;font-weight:bold;">' . get_numbering($topic_id) . $topic.'</th>');
	81	+ echo ('<th width="100%" class="center" validn="middle" style="font-size:18pt;font-weight:bold;">' . get_numbering($topic_id) . $topic . '</th>');
82	82	echo ('<th width="32"><a href="/manual_toc.php"><img src="/images/help/contents.jpg" width="32" height="32" border="0"></a></th>');
83	83
84	84	echo ('</tr>');
		@@ -86,11 +86,11 @@ discard block
		block discarded – undo
86	86	echo ('<tr>');
87	87	echo ('<td colspan="5">');
88	88	if (isset($previous_topic_id) && $previous_topic_id > 0)
89		- echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a>   ');
	89	+ echo ('<b>Previous:</b> <a href="/manual.php?' . $previous_topic_id . '">' . get_numbering($previous_topic_id) . $previous_topic . '</a>   ');
90	90	if (isset($up_topic_id) && $up_topic_id > 0)
91		- echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a>   ');
	91	+ echo ('<b>Up:</b> <a href="/manual.php?' . $up_topic_id . '">' . get_numbering($up_topic_id) . $up_topic . '</a>   ');
92	92	if (isset($next_topic_id) && $next_topic_id > 0)
93		- echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>');
	93	+ echo ('<b>Next:</b> <a href="/manual.php?' . $next_topic_id . '">' . get_numbering($next_topic_id) . $next_topic . '</a>');
94	94	echo ('</tr>');
95	95
96	96	echo ('</table>');
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	$db = new SmrMySqlDatabase();
104	104
105	105	// get current entry
106		- $db->query('SELECT * FROM manual WHERE topic_id = '.$topic_id);
	106	+ $db->query('SELECT * FROM manual WHERE topic_id = ' . $topic_id);
107	107	if ($db->nextRecord()) {
108	108	$parent_topic_id = $db->getInt('parent_topic_id');
109	109	$order_id = $db->getInt('order_id');
		@@ -111,8 +111,8 @@ discard block
		block discarded – undo
111	111	$text = stripslashes($db->getField('text'));
112	112
113	113	echo ('<div id="help_content">');
114		- echo ('<h1>' . get_numbering($topic_id) . $topic.'</h1>');
115		- echo ('<p>'.$text.'<p>');
	114	+ echo ('<h1>' . get_numbering($topic_id) . $topic . '</h1>');
	115	+ echo ('<p>' . $text . '<p>');
116	116	echo ('</div>');
117	117	} else
118	118	echo ('Invalid Topic!');
		@@ -121,9 +121,9 @@ discard block
		block discarded – undo
121	121	function echo_subsection($topic_id) {
122	122	// database object
123	123	$db = new SmrMySqlDatabase();
124		- $return='';
	124	+ $return = '';
125	125	// check if there are subsections
126		- $db->query('SELECT * FROM manual WHERE parent_topic_id = '.$db->escapeNumber($topic_id).' ORDER BY order_id');
	126	+ $db->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db->escapeNumber($topic_id) . ' ORDER BY order_id');
127	127	if ($db->getNumRows()) {
128	128	echo ('<hr noshade width="75%" size="1" class="center"/>');
129	129	echo ('<div id="help_menu">');
		@@ -137,19 +137,19 @@ discard block
		block discarded – undo
137	137	}
138	138
139	139	function echo_menu($topic_id) {
140		- $return='';
	140	+ $return = '';
141	141	// database object
142	142	$db = new SmrMySqlDatabase();
143	143
144		- $db->query('SELECT * FROM manual WHERE parent_topic_id = '.$db->escapeNumber($topic_id).' ORDER BY order_id');
	144	+ $db->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db->escapeNumber($topic_id) . ' ORDER BY order_id');
145	145	if ($db->getNumRows()) {
146	146	echo ('<ul type="disc">');
147		- while($db->nextRecord()) {
	147	+ while ($db->nextRecord()) {
148	148	$sub_topic_id = $db->getInt('topic_id');
149	149	$order_id = $db->getInt('order_id');
150	150	$sub_topic = stripslashes($db->getField('topic'));
151	151
152		- echo ('<li><a href="/manual.php?'.$sub_topic_id.'">' . get_numbering($sub_topic_id) . $sub_topic.'</a></li>');
	152	+ echo ('<li><a href="/manual.php?' . $sub_topic_id . '">' . get_numbering($sub_topic_id) . $sub_topic . '</a></li>');
153	153	echo_menu($sub_topic_id);
154	154	}
155	155	echo ('</ul>');
		@@ -160,7 +160,7 @@ discard block
		block discarded – undo
160	160	function get_numbering($topic_id) {
161	161	$db = new SmrMySqlDatabase();
162	162
163		- $db->query('SELECT * FROM manual WHERE topic_id = '.$db->escapeNumber($topic_id));
	163	+ $db->query('SELECT * FROM manual WHERE topic_id = ' . $db->escapeNumber($topic_id));
164	164	if ($db->nextRecord()) {
165	165	$up_topic_id = $db->getInt('parent_topic_id');
166	166	$order_id = $db->getInt('order_id');

		@@ -22,16 +22,18 @@ discard block
		block discarded – undo
22	22	$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id - 1));
23	23
24	24	// no result?
25		- if (!$db2->getNumRows())
26		- $db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
	25	+ if (!$db2->getNumRows()) {
	26	+ $db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
	27	+ }
27	28
28	29	echo ('<th width="32">');
29	30	if ($db2->nextRecord()) {
30	31	$previous_topic_id = $db2->getInt('topic_id');
31	32	$previous_topic = stripslashes($db2->getField('topic'));
32	33	echo ('<a href="/manual.php?'.$previous_topic_id.'"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
33		- } else
34		- echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
	34	+ } else {
	35	+ echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
	36	+ }
35	37	echo ('</th>');
36	38
37	39	// **************************
		@@ -43,8 +45,9 @@ discard block
		block discarded – undo
43	45	$up_topic_id = $db2->getInt('topic_id');
44	46	$up_topic = stripslashes($db2->getField('topic'));
45	47	echo ('<a href="/manual.php?'.$up_topic_id.'"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
46		- } else
47		- echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
	48	+ } else {
	49	+ echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
	50	+ }
48	51	echo ('</th>');
49	52
50	53	// **************************
		@@ -52,8 +55,9 @@ discard block
		block discarded – undo
52	55	// **************************
53	56	$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($topic_id).' AND order_id = 1');
54	57
55		- if (!$db2->getNumRows())
56		- $db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1));
	58	+ if (!$db2->getNumRows()) {
	59	+ $db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1));
	60	+ }
57	61
58	62	$seenParentIDs = array(0);
59	63	$curr_parent_topic_id = $parent_topic_id;
		@@ -72,8 +76,7 @@ discard block
		block discarded – undo
72	76	$next_topic_id = $db2->getInt('topic_id');
73	77	$next_topic = stripslashes($db2->getField('topic'));
74	78	echo ('<a href="/manual.php?'.$next_topic_id.'"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
75		- }
76		- else {
	79	+ } else {
77	80	echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
78	81	}
79	82	echo ('</th>');
		@@ -85,18 +88,22 @@ discard block
		block discarded – undo
85	88
86	89	echo ('<tr>');
87	90	echo ('<td colspan="5">');
88		- if (isset($previous_topic_id) && $previous_topic_id > 0)
89		- echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a>   ');
90		- if (isset($up_topic_id) && $up_topic_id > 0)
91		- echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a>   ');
92		- if (isset($next_topic_id) && $next_topic_id > 0)
93		- echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>');
	91	+ if (isset($previous_topic_id) && $previous_topic_id > 0) {
	92	+ echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a>   ');
	93	+ }
	94	+ if (isset($up_topic_id) && $up_topic_id > 0) {
	95	+ echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a>   ');
	96	+ }
	97	+ if (isset($next_topic_id) && $next_topic_id > 0) {
	98	+ echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>');
	99	+ }
94	100	echo ('</tr>');
95	101
96	102	echo ('</table>');
97		- } else
98		- echo ('Invalid Topic!');
99		-}
	103	+ } else {
	104	+ echo ('Invalid Topic!');
	105	+ }
	106	+ }
100	107
101	108	function echo_content($topic_id) {
102	109	// database object
		@@ -114,9 +121,10 @@ discard block
		block discarded – undo
114	121	echo ('<h1>' . get_numbering($topic_id) . $topic.'</h1>');
115	122	echo ('<p>'.$text.'<p>');
116	123	echo ('</div>');
117		- } else
118		- echo ('Invalid Topic!');
119		-}
	124	+ } else {
	125	+ echo ('Invalid Topic!');
	126	+ }
	127	+ }
120	128
121	129	function echo_subsection($topic_id) {
122	130	// database object

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

		@@ -11,8 +11,7 @@ discard block
		block discarded – undo
11	11	$action = $_REQUEST['action'];
12	12	if ($_REQUEST['save'] == 'Yes') {
13	13	$save = true;
14		-}
15		-else {
	14	+} else {
16	15	$save = false;
17	16	}
18	17
		@@ -42,8 +41,7 @@ discard block
		block discarded – undo
42	41	$mines = $db2->getInt('sum_m');
43	42	$cds = $db2->getInt('cds');
44	43	$sds = $db2->getInt('sds');
45		- }
46		- else {
	44	+ } else {
47	45	$mines = 0;
48	46	$cds = 0;
49	47	$sds = 0;
		@@ -143,16 +141,25 @@ discard block
		block discarded – undo
143	141	$owner = $db->getInt('owner_id');
144	142
145	143	$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 1');
146		- if ($db2->nextRecord()) $gens = $db2->getInt('amount');
147		- else $gens = 0;
	144	+ if ($db2->nextRecord()) {
	145	+ $gens = $db2->getInt('amount');
	146	+ } else {
	147	+ $gens = 0;
	148	+ }
148	149
149	150	$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 2');
150		- if ($db2->nextRecord()) $hangs = $db2->getInt('amount');
151		- else $hangs = 0;
	151	+ if ($db2->nextRecord()) {
	152	+ $hangs = $db2->getInt('amount');
	153	+ } else {
	154	+ $hangs = 0;
	155	+ }
152	156
153	157	$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 3');
154		- if ($db2->nextRecord()) $turs = $db2->getInt('amount');
155		- else $turs = 0;
	158	+ if ($db2->nextRecord()) {
	159	+ $turs = $db2->getInt('amount');
	160	+ } else {
	161	+ $turs = 0;
	162	+ }
156	163
157	164	// insert into history db
158	165	$history_db_sql[] = 'INSERT INTO planet (game_id, sector_id, owner_id, generators, hangers, turrets) VALUES ' .
		@@ -189,14 +196,21 @@ discard block
		block discarded – undo
189	196	$smrCredits = 0;
190	197	$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');
191	198	if ($db2->nextRecord()) {
192		- if (is_int($db2->getField('bounty_am'))) $amount = $db2->getInt('bounty_am');
193		- if (is_int($db2->getField('bounty_cred'))) $smrCredits = $db2->getInt('bounty_cred');
	199	+ if (is_int($db2->getField('bounty_am'))) {
	200	+ $amount = $db2->getInt('bounty_am');
	201	+ }
	202	+ if (is_int($db2->getField('bounty_cred'))) {
	203	+ $smrCredits = $db2->getInt('bounty_cred');
	204	+ }
194	205
195	206	}
196	207
197	208	$db2->query('SELECT * FROM ship_has_name WHERE game_id = '.$game_id.' AND account_id = '.$acc_id);
198		- if ($db2->nextRecord()) $ship_name = $db2->getField('ship_name');
199		- else $ship_name = 'None';
	209	+ if ($db2->nextRecord()) {
	210	+ $ship_name = $db2->getField('ship_name');
	211	+ } else {
	212	+ $ship_name = 'None';
	213	+ }
200	214
201	215	// insert into history db
202	216	$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 @@ discard block
		block discarded – undo
244	258	$mines = $db2->getInt('sum_mines');
245	259	$cds = $db2->getInt('cds');
246	260	$sds = $db2->getInt('sds');
247		- if (!is_numeric($mines)) $mines = 0;
248		- if (!is_numeric($cds)) $cds = 0;
249		- if (!is_numeric($sds)) $sds = 0;
	261	+ if (!is_numeric($mines)) {
	262	+ $mines = 0;
	263	+ }
	264	+ if (!is_numeric($cds)) {
	265	+ $cds = 0;
	266	+ }
	267	+ if (!is_numeric($sds)) {
	268	+ $sds = 0;
	269	+ }
250	270
251	271	} else {
252	272

		@@ -1,48 +1,48 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-if(is_array($TraderTeamCombatResults['Traders'])) {
4		- foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
5		- $ShootingPlayer =& $TraderResults['Player'];
6		- $TotalDamage =& $TraderResults['TotalDamage'];
7		- if($TraderResults['DeadBeforeShot']) {
	3	+if (is_array($TraderTeamCombatResults['Traders'])) {
	4	+ foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
	5	+ $ShootingPlayer = & $TraderResults['Player'];
	6	+ $TotalDamage = & $TraderResults['TotalDamage'];
	7	+ if ($TraderResults['DeadBeforeShot']) {
8	8	echo $ShootingPlayer->getDisplayName() ?> died before they were able to attack!<br /><?php
9	9	} else {
10		- if(isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
11		- foreach($TraderResults['Weapons'] as $WeaponResults) {
12		- $ShootingWeapon =& $WeaponResults['Weapon'];
13		- $ShotHit =& $WeaponResults['Hit'];
14		- $ActualDamage =& $WeaponResults['ActualDamage'];
15		- $WeaponDamage =& $WeaponResults['WeaponDamage'];
16		- $TargetPlayer =& $WeaponResults['TargetPlayer'];
	10	+ if (isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
	11	+ foreach ($TraderResults['Weapons'] as $WeaponResults) {
	12	+ $ShootingWeapon = & $WeaponResults['Weapon'];
	13	+ $ShotHit = & $WeaponResults['Hit'];
	14	+ $ActualDamage = & $WeaponResults['ActualDamage'];
	15	+ $WeaponDamage = & $WeaponResults['WeaponDamage'];
	16	+ $TargetPlayer = & $WeaponResults['TargetPlayer'];
17	17
18		- echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at<?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once<?php } ?> the forces<?php
	18	+ echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at<?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once<?php } ?> the forces<?php
19	19	if (!$ShotHit \|\| !$ActualDamage['TargetAlreadyDead']) {
20		- if(!$ShotHit) {
	20	+ if (!$ShotHit) {
21	21	?> and misses<?php
22		- } else if($ActualDamage['TotalDamage'] == 0) {
23		- if($WeaponDamage['Shield'] > 0) {
24		- ?> which proves ineffective against the <?php if($ActualDamage['HasMines']){ ?>mines<?php } else if($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php }
25		- } else if($WeaponDamage['Armour'] > 0) {
26		- ?> which is deflected by the <?php if($ActualDamage['HasMines']){ ?>mines<?php } else if($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php } ?> shields<?php
	22	+ } else if ($ActualDamage['TotalDamage'] == 0) {
	23	+ if ($WeaponDamage['Shield'] > 0) {
	24	+ ?> which proves ineffective against the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } else if ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php }
	25	+ } else if ($WeaponDamage['Armour'] > 0) {
	26	+ ?> which is deflected by the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } else if ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php } ?> shields<?php
27	27	} else {
28	28	?> but it cannot do any damage<?php
29	29	}
30	30	} else {
31	31	?> destroying <?php
32	32	$DamageTypes = 0;
33		- if($ActualDamage['NumMines'] > 0){ $DamageTypes = $DamageTypes+1; }
34		- if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
35		- if($ActualDamage['NumSDs'] > 0){ $DamageTypes = $DamageTypes+1; }
	33	+ if ($ActualDamage['NumMines'] > 0) { $DamageTypes = $DamageTypes + 1; }
	34	+ if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
	35	+ if ($ActualDamage['NumSDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
36	36
37		- if($ActualDamage['NumMines'] > 0) {
	37	+ if ($ActualDamage['NumMines'] > 0) {
38	38	?><span class="red"><?php echo number_format($ActualDamage['NumMines']) ?></span> mines<?php
39	39	$this->doDamageTypeReductionDisplay($DamageTypes);
40	40	}
41		- if($ActualDamage['NumCDs'] > 0) {
	41	+ if ($ActualDamage['NumCDs'] > 0) {
42	42	?><span class="red"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
43	43	$this->doDamageTypeReductionDisplay($DamageTypes);
44	44	}
45		- if($ActualDamage['NumSDs'] > 0) {
	45	+ if ($ActualDamage['NumSDs'] > 0) {
46	46	?><span class="red"><?php echo number_format($ActualDamage['NumSDs']) ?></span> scout drones<?php
47	47	}
48	48	}
		@@ -53,71 +53,71 @@ discard block
		block discarded – undo
53	53	}
54	54	}
55	55	}
56		- if(isset($TraderResults['Drones'])) {
57		- $Drones =& $TraderResults['Drones'];
58		- $ActualDamage =& $Drones['ActualDamage'];
59		- $WeaponDamage =& $Drones['WeaponDamage'];
60		- $TargetPlayer =& $Drones['TargetPlayer'];
	56	+ if (isset($TraderResults['Drones'])) {
	57	+ $Drones = & $TraderResults['Drones'];
	58	+ $ActualDamage = & $Drones['ActualDamage'];
	59	+ $WeaponDamage = & $Drones['WeaponDamage'];
	60	+ $TargetPlayer = & $Drones['TargetPlayer'];
61	61
62	62	echo $ShootingPlayer->getDisplayName();
63		- if($WeaponDamage['Launched'] == 0) {
	63	+ if ($WeaponDamage['Launched'] == 0) {
64	64	?> fails to launch their combat drones<?php
65	65	} else {
66		- ?> 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
67		- if(!$ActualDamage['TargetAlreadyDead']) {
68		- if($ActualDamage['TotalDamage'] == 0) {
69		- if($WeaponDamage['Shield'] > 0) {
70		- ?> which prove ineffective against the <?php if($ActualDamage['HasMines']){ ?>mines<?php } else if($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php }
71		- } else if($WeaponDamage['Armour'] > 0) {
	66	+ ?> 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
	67	+ if (!$ActualDamage['TargetAlreadyDead']) {
	68	+ if ($ActualDamage['TotalDamage'] == 0) {
	69	+ if ($WeaponDamage['Shield'] > 0) {
	70	+ ?> which prove ineffective against the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } else if ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php }
	71	+ } else if ($WeaponDamage['Armour'] > 0) {
72	72	?> which is deflected by the <?php
73		- if($ActualDamage['HasMines']){ ?>mines<?php } else if($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php } ?> shields<?php
	73	+ if ($ActualDamage['HasMines']) { ?>mines<?php } else if ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php } ?> shields<?php
74	74	} else {
75	75	?> but they cannot do any damage<?php
76	76	}
77	77	} else {
78	78	$DamageTypes = 0;
79		- if($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) { $DamageTypes = $DamageTypes+1; }
80		- if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
81		- if($ActualDamage['NumSDs'] > 0){ $DamageTypes = $DamageTypes+1; }
	79	+ if ($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) { $DamageTypes = $DamageTypes + 1; }
	80	+ if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
	81	+ if ($ActualDamage['NumSDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
82	82
83		- if($WeaponDamage['Kamikaze'] == 0) {
	83	+ if ($WeaponDamage['Kamikaze'] == 0) {
84	84	?> destroying <?php
85	85	} else {
86	86	?> of which <span class="cds"><?php echo $WeaponDamage['Kamikaze'] ?></span> kamikaze against <span class="red"><?php echo $WeaponDamage['Kamikaze'] ?></span> mines<?php
87		- if($DamageTypes > 0) {
	87	+ if ($DamageTypes > 0) {
88	88	?> whilst the others destroy <?php
89	89	}
90	90	}
91		- if($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) {
	91	+ if ($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) {
92	92	?><span class="red"><?php echo number_format($ActualDamage['NumMines']) ?></span> mines<?php
93	93	$this->doDamageTypeReductionDisplay($DamageTypes);
94	94	}
95		- if($ActualDamage['NumCDs'] > 0) {
	95	+ if ($ActualDamage['NumCDs'] > 0) {
96	96	?><span class="red"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
97	97	$this->doDamageTypeReductionDisplay($DamageTypes);
98	98	}
99		- if($ActualDamage['NumSDs'] > 0) {
	99	+ if ($ActualDamage['NumSDs'] > 0) {
100	100	?><span class="red"><?php echo number_format($ActualDamage['NumSDs']) ?></span> scout drones<?php
101	101	}
102	102	}
103	103	}
104	104	}?>.
105	105	<br />
106		- <?php if($ActualDamage['KillingShot']) {
	106	+ <?php if ($ActualDamage['KillingShot']) {
107	107	?>Forces are <span class="red">DESTROYED!</span><br /><?php
108	108	}
109	109	}
110	110	}
111	111	echo $ShootingPlayer->getDisplayName();
112		- if($TotalDamage > 0) {
	112	+ if ($TotalDamage > 0) {
113	113	?> hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php
114	114	} else {
115	115	?> does no damage this round.<?php
116		- if(!$TraderResults['DeadBeforeShot']) {
	116	+ if (!$TraderResults['DeadBeforeShot']) {
117	117	?> Maybe they should go back to the academy<?php
118	118	}
119	119	} ?>.<br /><br /><?php
120	120	}
121	121	}
122	122	$TotalDamage = $TraderTeamCombatResults['TotalDamage']; ?>
123		-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 } ?>.
	123	+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 } ?>.

		@@ -1,10 +1,10 @@ discard block
		block discarded – undo
1	1	<?php
2		-foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
3		- $ShootingPlayer =& $TraderResults['Player'];
4		- $TotalDamage =& $TraderResults['TotalDamage'];
5		- if($MinimalDisplay && !$ThisPlayer->equals($ShootingPlayer)) {
	2	+foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
	3	+ $ShootingPlayer = & $TraderResults['Player'];
	4	+ $TotalDamage = & $TraderResults['TotalDamage'];
	5	+ if ($MinimalDisplay && !$ThisPlayer->equals($ShootingPlayer)) {
6	6	echo $ShootingPlayer->getDisplayName();
7		- if($TotalDamage > 0) {
	7	+ if ($TotalDamage > 0) {
8	8	?> hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php
9	9	} else {
10	10	?> does no damage this round<?php
		@@ -12,29 +12,29 @@ discard block
		block discarded – undo
12	12	continue;
13	13	}
14	14
15		- if($TraderResults['DeadBeforeShot']) {
	15	+ if ($TraderResults['DeadBeforeShot']) {
16	16	echo $ShootingPlayer->getDisplayName() ?> died before they were able to attack!<br /><?php
17	17	} else {
18		- if(isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
19		- foreach($TraderResults['Weapons'] as $WeaponResults) {
20		- $ShootingWeapon =& $WeaponResults['Weapon'];
21		- $ShotHit =& $WeaponResults['Hit'];
22		- $ActualDamage =& $WeaponResults['ActualDamage'];
23		- $WeaponDamage =& $WeaponResults['WeaponDamage'];
24		- $TargetPlanet =& $WeaponResults['TargetPlanet'];
	18	+ if (isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
	19	+ foreach ($TraderResults['Weapons'] as $WeaponResults) {
	20	+ $ShootingWeapon = & $WeaponResults['Weapon'];
	21	+ $ShotHit = & $WeaponResults['Hit'];
	22	+ $ActualDamage = & $WeaponResults['ActualDamage'];
	23	+ $WeaponDamage = & $WeaponResults['WeaponDamage'];
	24	+ $TargetPlanet = & $WeaponResults['TargetPlanet'];
25	25
26		- echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?>the debris that was once <?php } echo $TargetPlanet->getDisplayName();
	26	+ echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?>the debris that was once <?php } echo $TargetPlanet->getDisplayName();
27	27	if (!$ShotHit \|\| !$ActualDamage['TargetAlreadyDead']) {
28		- if(!$ShotHit) {
	28	+ if (!$ShotHit) {
29	29	?> and misses<?php
30		- } else if($ActualDamage['TotalDamage'] == 0) {
31		- if($WeaponDamage['Shield'] > 0) {
32		- if($ActualDamage['HasCDs']) {
	30	+ } else if ($ActualDamage['TotalDamage'] == 0) {
	31	+ if ($WeaponDamage['Shield'] > 0) {
	32	+ if ($ActualDamage['HasCDs']) {
33	33	?> which proves ineffective against their combat drones<?php
34	34	} else {
35	35	?> which washes harmlessly over their hull<?php
36	36	}
37		- } else if($WeaponDamage['Armour'] > 0) {
	37	+ } else if ($WeaponDamage['Armour'] > 0) {
38	38	?> which is deflected by their shields<?php
39	39	} else {
40	40	?> but it cannot do any damage<?php
		@@ -42,96 +42,96 @@ discard block
		block discarded – undo
42	42	} else {
43	43	?> destroying <?php
44	44	$DamageTypes = 0;
45		- if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
46		- if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
47		- if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
	45	+ if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
	46	+ if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
	47	+ if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
48	48
49		- if($ActualDamage['Shield'] > 0) {
	49	+ if ($ActualDamage['Shield'] > 0) {
50	50	?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
51	51	$this->doDamageTypeReductionDisplay($DamageTypes);
52	52	}
53		- if($ActualDamage['NumCDs'] > 0) {
	53	+ if ($ActualDamage['NumCDs'] > 0) {
54	54	?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
55	55	$this->doDamageTypeReductionDisplay($DamageTypes);
56	56	}
57		- if($ActualDamage['Armour'] > 0) {
	57	+ if ($ActualDamage['Armour'] > 0) {
58	58	?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
59	59	}
60	60	}
61	61	} ?>.
62	62	<br /><?php
63	63	if ($ShotHit && $ActualDamage['KillingShot']) {
64		- $this->includeTemplate('includes/PlanetKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlanet'=>$TargetPlanet));
	64	+ $this->includeTemplate('includes/PlanetKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlanet'=>$TargetPlanet));
65	65	}
66	66	}
67	67	}
68		- if(isset($TraderResults['Drones'])) {
69		- $Drones =& $TraderResults['Drones'];
70		- $ActualDamage =& $Drones['ActualDamage'];
71		- $WeaponDamage =& $Drones['WeaponDamage'];
72		- $TargetPlanet =& $Drones['TargetPlanet'];
	68	+ if (isset($TraderResults['Drones'])) {
	69	+ $Drones = & $TraderResults['Drones'];
	70	+ $ActualDamage = & $Drones['ActualDamage'];
	71	+ $WeaponDamage = & $Drones['WeaponDamage'];
	72	+ $TargetPlanet = & $Drones['TargetPlanet'];
73	73	$DamageTypes = 0;
74		- if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
75		- if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
76		- if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
	74	+ if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
	75	+ if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
	76	+ if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
77	77
78	78	echo $ShootingPlayer->getDisplayName();
79		- if($WeaponDamage['Launched'] == 0) {
	79	+ if ($WeaponDamage['Launched'] == 0) {
80	80	?> fails to launch their combat drones<?php
81	81	} else {
82	82	?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php
83		- if($ActualDamage['TargetAlreadyDead']) {
	83	+ if ($ActualDamage['TargetAlreadyDead']) {
84	84	?>the debris that was once <?php
85	85	}
86	86	echo $TargetPlanet->getDisplayName();
87		- if(!$ActualDamage['TargetAlreadyDead']) {
88		- if($ActualDamage['TotalDamage'] == 0) {
89		- if($WeaponDamage['Shield'] > 0) {
90		- if($ActualDamage['HasCDs']) {
	87	+ if (!$ActualDamage['TargetAlreadyDead']) {
	88	+ if ($ActualDamage['TotalDamage'] == 0) {
	89	+ if ($WeaponDamage['Shield'] > 0) {
	90	+ if ($ActualDamage['HasCDs']) {
91	91	?> which prove ineffective against their combat drones<?php
92	92	} else {
93	93	?> which washes harmlessly over their hull<?php
94	94	}
95	95	}
96		- if($ActualDamage['Armour'] > 0) {
	96	+ if ($ActualDamage['Armour'] > 0) {
97	97	?> which is deflected by their shields<?php
98	98	} else {
99	99	?> but they cannot do any damage<?php
100	100	}
101	101	} else {
102	102	?> destroying <?php
103		- if($ActualDamage['Shield'] > 0) {
	103	+ if ($ActualDamage['Shield'] > 0) {
104	104	?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
105	105	$this->doDamageTypeReductionDisplay($DamageTypes);
106	106	}
107		- if($ActualDamage['NumCDs'] > 0) {
	107	+ if ($ActualDamage['NumCDs'] > 0) {
108	108	?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
109	109	$this->doDamageTypeReductionDisplay($DamageTypes);
110	110	}
111		- if($ActualDamage['Armour'] > 0) {
	111	+ if ($ActualDamage['Armour'] > 0) {
112	112	?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
113	113	}
114	114	}
115	115	}
116	116	} ?>.
117	117	<br /><?php
118		- if($ActualDamage['KillingShot']) {
119		- $this->includeTemplate('includes/PlanetKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPlanet'=>$TargetPlanet));
	118	+ if ($ActualDamage['KillingShot']) {
	119	+ $this->includeTemplate('includes/PlanetKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlanet'=>$TargetPlanet));
120	120	}
121	121	}
122	122	}
123	123	echo $ShootingPlayer->getDisplayName();
124		- if($TotalDamage > 0) {
	124	+ if ($TotalDamage > 0) {
125	125	?> hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php
126	126	} else {
127	127	?> does no damage this round<?php
128		- if(!$TraderResults['DeadBeforeShot']) {
	128	+ if (!$TraderResults['DeadBeforeShot']) {
129	129	?>. Maybe they should go back to the academy<?php
130	130	}
131	131	} ?>.<br /><br /><?php
132	132	}
133	133	$TotalDamage = $TraderTeamCombatResults['TotalDamage']; ?>
134		-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 } ?>.<br /><?php
	134	+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 } ?>.<br /><?php
135	135	foreach ($TraderTeamCombatResults['Downgrades'] as $structureID => $numDestroyed) { ?>
136	136	This team destroys <span class="red"><?php echo $numDestroyed; ?> </span><?php echo pluralise($TargetPlanet->getStructureTypes($structureID)->name(), $numDestroyed); ?>.<br /><?php
137	137	} ?>

		@@ -1,9 +1,9 @@ discard block
		block discarded – undo
1	1	<?php
2	2	$CombatPlanet = $PlanetCombatResults['Planet'];
3	3	$TotalDamage = $PlanetCombatResults['TotalDamage'];
4		-if($MinimalDisplay) {
	4	+if ($MinimalDisplay) {
5	5	echo $CombatPlanet->getDisplayName();
6		- if($TotalDamage > 0) {
	6	+ if ($TotalDamage > 0) {
7	7	?> 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 $PlanetCombatResults['TotalDamagePerTargetPlayer'][$ThisPlayer->getAccountID()]; ?></span> was done to you<?php
8	8	}
9	9	else {
		@@ -11,29 +11,29 @@ discard block
		block discarded – undo
11	11	} ?>. <?php echo $AttackLogLink;
12	12	return;
13	13	}
14		-if(isset($PlanetCombatResults['Weapons']) && is_array($PlanetCombatResults['Weapons'])) {
15		- foreach($PlanetCombatResults['Weapons'] as $WeaponResults) {
16		- $ShootingWeapon =& $WeaponResults['Weapon'];
17		- $ShotHit =& $WeaponResults['Hit'];
18		- $ActualDamage =& $WeaponResults['ActualDamage'];
19		- $WeaponDamage =& $WeaponResults['WeaponDamage'];
20		- $TargetPlayer =& $WeaponResults['TargetPlayer'];
	14	+if (isset($PlanetCombatResults['Weapons']) && is_array($PlanetCombatResults['Weapons'])) {
	15	+ foreach ($PlanetCombatResults['Weapons'] as $WeaponResults) {
	16	+ $ShootingWeapon = & $WeaponResults['Weapon'];
	17	+ $ShotHit = & $WeaponResults['Hit'];
	18	+ $ActualDamage = & $WeaponResults['ActualDamage'];
	19	+ $WeaponDamage = & $WeaponResults['WeaponDamage'];
	20	+ $TargetPlayer = & $WeaponResults['TargetPlayer'];
21	21
22		- echo $CombatPlanet->getDisplayName() ?> fires a <?php echo $ShootingWeapon->getName(); ?> at <?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
	22	+ echo $CombatPlanet->getDisplayName() ?> fires a <?php echo $ShootingWeapon->getName(); ?> at <?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php } echo $TargetPlayer->getDisplayName();
23	23	if (!$ShotHit \|\| !$ActualDamage['TargetAlreadyDead']) {
24		- if(!$ShotHit) {
	24	+ if (!$ShotHit) {
25	25	?> and misses<?php
26	26	}
27		- else if($ActualDamage['TotalDamage'] == 0) {
28		- if($WeaponDamage['Shield'] > 0) {
29		- if($ActualDamage['HasCDs']) {
	27	+ else if ($ActualDamage['TotalDamage'] == 0) {
	28	+ if ($WeaponDamage['Shield'] > 0) {
	29	+ if ($ActualDamage['HasCDs']) {
30	30	?> which proves ineffective against their combat drones<?php
31	31	}
32	32	else {
33	33	?> which washes harmlessly over their hull<?php
34	34	}
35	35	}
36		- else if($WeaponDamage['Armour'] > 0) {
	36	+ else if ($WeaponDamage['Armour'] > 0) {
37	37	?> which is deflected by their shields<?php
38	38	}
39	39	else {
		@@ -43,56 +43,56 @@ discard block
		block discarded – undo
43	43	else {
44	44	?> destroying <?php
45	45	$DamageTypes = 0;
46		- if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
47		- if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
48		- if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
	46	+ if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
	47	+ if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
	48	+ if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
49	49
50		- if($ActualDamage['Shield'] > 0) {
	50	+ if ($ActualDamage['Shield'] > 0) {
51	51	?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php
52	52	$this->doDamageTypeReductionDisplay($DamageTypes);
53	53	}
54		- if($ActualDamage['NumCDs'] > 0) {
	54	+ if ($ActualDamage['NumCDs'] > 0) {
55	55	?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']); ?></span> combat drones<?php
56	56	$this->doDamageTypeReductionDisplay($DamageTypes);
57	57	}
58		- if($ActualDamage['Armour'] > 0) {
	58	+ if ($ActualDamage['Armour'] > 0) {
59	59	?><span class="red"><?php echo number_format($ActualDamage['Armour']); ?></span> plates of armour<?php
60	60	}
61	61	}
62	62	} ?>.
63	63	<br /><?php
64	64	if ($ShotHit && $ActualDamage['KillingShot']) {
65		- $this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer));
	65	+ $this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer));
66	66	}
67	67	}
68	68	}
69		-if(isset($PlanetCombatResults['Drones'])) {
70		- $Drones =& $PlanetCombatResults['Drones'];
71		- $ActualDamage =& $Drones['ActualDamage'];
72		- $WeaponDamage =& $Drones['WeaponDamage'];
73		- $TargetPlayer =& $Drones['TargetPlayer'];
	69	+if (isset($PlanetCombatResults['Drones'])) {
	70	+ $Drones = & $PlanetCombatResults['Drones'];
	71	+ $ActualDamage = & $Drones['ActualDamage'];
	72	+ $WeaponDamage = & $Drones['WeaponDamage'];
	73	+ $TargetPlayer = & $Drones['TargetPlayer'];
74	74	$DamageTypes = 0;
75		- if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
76		- if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
77		- if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
	75	+ if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
	76	+ if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
	77	+ if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
78	78
79	79	echo $CombatPlanet->getDisplayName();
80		- if($WeaponDamage['Launched'] == 0) {
	80	+ if ($WeaponDamage['Launched'] == 0) {
81	81	?> fails to launch it's combat drones<?php
82	82	}
83	83	else {
84		- ?> 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();
85		- if(!$ActualDamage['TargetAlreadyDead']) {
86		- if($ActualDamage['TotalDamage'] == 0) {
87		- if($WeaponDamage['Shield'] > 0) {
88		- if($ActualDamage['HasCDs']) {
	84	+ ?> 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();
	85	+ if (!$ActualDamage['TargetAlreadyDead']) {
	86	+ if ($ActualDamage['TotalDamage'] == 0) {
	87	+ if ($WeaponDamage['Shield'] > 0) {
	88	+ if ($ActualDamage['HasCDs']) {
89	89	?> which prove ineffective against their combat drones<?php
90	90	}
91	91	else {
92	92	?> which washes harmlessly over their hull<?php
93	93	}
94	94	}
95		- else if($WeaponDamage['Armour'] > 0) {
	95	+ else if ($WeaponDamage['Armour'] > 0) {
96	96	?> which is deflected by their shields<?php
97	97	}
98	98	else {
		@@ -101,28 +101,28 @@ discard block
		block discarded – undo
101	101	}
102	102	else {
103	103	?> destroying <?php
104		- if($ActualDamage['Shield'] > 0) {
	104	+ if ($ActualDamage['Shield'] > 0) {
105	105	?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php
106	106	$this->doDamageTypeReductionDisplay($DamageTypes);
107	107	}
108		- if($ActualDamage['NumCDs'] > 0) {
	108	+ if ($ActualDamage['NumCDs'] > 0) {
109	109	?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']); ?></span> combat drones<?php
110	110	$this->doDamageTypeReductionDisplay($DamageTypes);
111	111	}
112		- if($ActualDamage['Armour'] > 0) {
	112	+ if ($ActualDamage['Armour'] > 0) {
113	113	?><span class="red"><?php echo number_format($ActualDamage['Armour']); ?></span> plates of armour<?php
114	114	}
115	115	}
116	116	}
117	117	} ?>.
118	118	<br /><?php
119		- if($ActualDamage['KillingShot']) {
120		- $this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer));
	119	+ if ($ActualDamage['KillingShot']) {
	120	+ $this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer));
121	121	}
122	122	}
123	123
124	124	echo $CombatPlanet->getDisplayName();
125		-if($TotalDamage > 0) {
	125	+if ($TotalDamage > 0) {
126	126	?> hit for a total of <span class="red"><?php echo $TotalDamage; ?></span> damage in this round of combat<?php
127	127	}
128	128	else {

		@@ -5,8 +5,7 @@ discard block
		block discarded – undo
5	5	echo $CombatPlanet->getDisplayName();
6	6	if($TotalDamage > 0) {
7	7	?> 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 $PlanetCombatResults['TotalDamagePerTargetPlayer'][$ThisPlayer->getAccountID()]; ?></span> was done to you<?php
8		- }
9		- else {
	8	+ } else {
10	9	?> does no damage this round<?php
11	10	} ?>. <?php echo $AttackLogLink;
12	11	return;
		@@ -23,24 +22,19 @@ discard block
		block discarded – undo
23	22	if (!$ShotHit \|\| !$ActualDamage['TargetAlreadyDead']) {
24	23	if(!$ShotHit) {
25	24	?> and misses<?php
26		- }
27		- else if($ActualDamage['TotalDamage'] == 0) {
	25	+ } else if($ActualDamage['TotalDamage'] == 0) {
28	26	if($WeaponDamage['Shield'] > 0) {
29	27	if($ActualDamage['HasCDs']) {
30	28	?> which proves ineffective against their combat drones<?php
31		- }
32		- else {
	29	+ } else {
33	30	?> which washes harmlessly over their hull<?php
34	31	}
35		- }
36		- else if($WeaponDamage['Armour'] > 0) {
	32	+ } else if($WeaponDamage['Armour'] > 0) {
37	33	?> which is deflected by their shields<?php
38		- }
39		- else {
	34	+ } else {
40	35	?> but it cannot do any damage<?php
41	36	}
42		- }
43		- else {
	37	+ } else {
44	38	?> destroying <?php
45	39	$DamageTypes = 0;
46	40	if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
		@@ -79,27 +73,22 @@ discard block
		block discarded – undo
79	73	echo $CombatPlanet->getDisplayName();
80	74	if($WeaponDamage['Launched'] == 0) {
81	75	?> fails to launch it's combat drones<?php
82		- }
83		- else {
	76	+ } else {
84	77	?> 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();
85	78	if(!$ActualDamage['TargetAlreadyDead']) {
86	79	if($ActualDamage['TotalDamage'] == 0) {
87	80	if($WeaponDamage['Shield'] > 0) {
88	81	if($ActualDamage['HasCDs']) {
89	82	?> which prove ineffective against their combat drones<?php
90		- }
91		- else {
	83	+ } else {
92	84	?> which washes harmlessly over their hull<?php
93	85	}
94		- }
95		- else if($WeaponDamage['Armour'] > 0) {
	86	+ } else if($WeaponDamage['Armour'] > 0) {
96	87	?> which is deflected by their shields<?php
97		- }
98		- else {
	88	+ } else {
99	89	?> but they cannot do any damage<?php
100	90	}
101		- }
102		- else {
	91	+ } else {
103	92	?> destroying <?php
104	93	if($ActualDamage['Shield'] > 0) {
105	94	?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php
		@@ -124,7 +113,6 @@ discard block
		block discarded – undo
124	113	echo $CombatPlanet->getDisplayName();
125	114	if($TotalDamage > 0) {
126	115	?> hit for a total of <span class="red"><?php echo $TotalDamage; ?></span> damage in this round of combat<?php
127		-}
128		-else {
	116	+} else {
129	117	?> does no damage this round. You call that a planet? It needs a better builder<?php
130	118	} ?>.

		@@ -1,36 +1,36 @@ discard block
		block discarded – undo
1	1	<?php
2		-if(is_array($TraderTeamCombatResults['Traders'])) {
3		- foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
4		- $ShootingPlayer =& $TraderResults['Player'];
5		- $TotalDamage =& $TraderResults['TotalDamage'];
	2	+if (is_array($TraderTeamCombatResults['Traders'])) {
	3	+ foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) {
	4	+ $ShootingPlayer = & $TraderResults['Player'];
	5	+ $TotalDamage = & $TraderResults['TotalDamage'];
6	6
7		- if($TraderResults['DeadBeforeShot']) {
	7	+ if ($TraderResults['DeadBeforeShot']) {
8	8	echo $ShootingPlayer->getDisplayName() ?> died before they were able to attack!<br /><?php
9	9	} else {
10		- if(isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
11		- foreach($TraderResults['Weapons'] as $WeaponResults) {
12		- $ShootingWeapon =& $WeaponResults['Weapon'];
13		- $ShotHit =& $WeaponResults['Hit'];
14		- $ActualDamage =& $WeaponResults['ActualDamage'];
15		- $WeaponDamage =& $WeaponResults['WeaponDamage'];
16		- $TargetPlayer =& $WeaponResults['TargetPlayer'];
	10	+ if (isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) {
	11	+ foreach ($TraderResults['Weapons'] as $WeaponResults) {
	12	+ $ShootingWeapon = & $WeaponResults['Weapon'];
	13	+ $ShotHit = & $WeaponResults['Hit'];
	14	+ $ActualDamage = & $WeaponResults['ActualDamage'];
	15	+ $WeaponDamage = & $WeaponResults['WeaponDamage'];
	16	+ $TargetPlayer = & $WeaponResults['TargetPlayer'];
17	17
18	18	echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php
19		- if($ShotHit && $ActualDamage['TargetAlreadyDead']) {
	19	+ if ($ShotHit && $ActualDamage['TargetAlreadyDead']) {
20	20	?>the debris that was once <?php
21	21	}
22	22	echo $TargetPlayer->getDisplayName();
23	23	if (!$ShotHit \|\| !$ActualDamage['TargetAlreadyDead']) {
24		- if(!$ShotHit) {
	24	+ if (!$ShotHit) {
25	25	?> and misses<?php
26		- } else if($ActualDamage['TotalDamage'] == 0) {
27		- if($WeaponDamage['Shield'] > 0) {
28		- if($ActualDamage['HasCDs']) {
	26	+ } else if ($ActualDamage['TotalDamage'] == 0) {
	27	+ if ($WeaponDamage['Shield'] > 0) {
	28	+ if ($ActualDamage['HasCDs']) {
29	29	?> which proves ineffective against their combat drones<?php
30	30	} else {
31	31	?> which washes harmlessly over their hull<?php
32	32	}
33		- } else if($WeaponDamage['Armour'] > 0) {
	33	+ } else if ($WeaponDamage['Armour'] > 0) {
34	34	?> which is deflected by their shields<?php
35	35	} else {
36	36	?> but it cannot do any damage<?php
		@@ -38,94 +38,94 @@ discard block
		block discarded – undo
38	38	} else {
39	39	?> destroying <?php
40	40	$DamageTypes = 0;
41		- if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
42		- if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
43		- if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
	41	+ if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
	42	+ if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
	43	+ if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
44	44
45		- if($ActualDamage['Shield'] > 0) {
	45	+ if ($ActualDamage['Shield'] > 0) {
46	46	?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
47	47	$this->doDamageTypeReductionDisplay($DamageTypes);
48	48	}
49		- if($ActualDamage['NumCDs'] > 0) {
	49	+ if ($ActualDamage['NumCDs'] > 0) {
50	50	?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
51	51	$this->doDamageTypeReductionDisplay($DamageTypes);
52	52	}
53		- if($ActualDamage['Armour'] > 0) {
	53	+ if ($ActualDamage['Armour'] > 0) {
54	54	?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
55	55	}
56	56	}
57	57	} ?>.
58	58	<br /><?php
59	59	if ($ShotHit && $ActualDamage['KillingShot']) {
60		- $this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer));
	60	+ $this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer));
61	61	}
62	62	}
63	63	}
64		- if(isset($TraderResults['Drones'])) {
65		- $Drones =& $TraderResults['Drones'];
66		- $ActualDamage =& $Drones['ActualDamage'];
67		- $WeaponDamage =& $Drones['WeaponDamage'];
68		- $TargetPlayer =& $Drones['TargetPlayer'];
	64	+ if (isset($TraderResults['Drones'])) {
	65	+ $Drones = & $TraderResults['Drones'];
	66	+ $ActualDamage = & $Drones['ActualDamage'];
	67	+ $WeaponDamage = & $Drones['WeaponDamage'];
	68	+ $TargetPlayer = & $Drones['TargetPlayer'];
69	69	$DamageTypes = 0;
70		- if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
71		- if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; }
72		- if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; }
	70	+ if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; }
	71	+ if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; }
	72	+ if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; }
73	73
74	74	echo $ShootingPlayer->getDisplayName();
75		- if($WeaponDamage['Launched'] == 0) {
	75	+ if ($WeaponDamage['Launched'] == 0) {
76	76	?> fails to launch their combat drones<?php
77	77	} else {
78	78	?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php
79		- if($ActualDamage['TargetAlreadyDead']) {
	79	+ if ($ActualDamage['TargetAlreadyDead']) {
80	80	?>the debris that was once <?php
81	81	}
82	82	echo $TargetPlayer->getDisplayName();
83		- if(!$ActualDamage['TargetAlreadyDead']) {
84		- if($ActualDamage['TotalDamage'] == 0) {
85		- if($WeaponDamage['Shield'] > 0) {
86		- if($ActualDamage['HasCDs']) {
	83	+ if (!$ActualDamage['TargetAlreadyDead']) {
	84	+ if ($ActualDamage['TotalDamage'] == 0) {
	85	+ if ($WeaponDamage['Shield'] > 0) {
	86	+ if ($ActualDamage['HasCDs']) {
87	87	?> which prove ineffective against their combat drones<?php
88	88	} else {
89	89	?> which washes harmlessly over their hull<?php
90	90	}
91	91	}
92		- if($ActualDamage['Armour'] > 0) {
	92	+ if ($ActualDamage['Armour'] > 0) {
93	93	?> which is deflected by their shields<?php
94	94	} else {
95	95	?> but they cannot do any damage<?php
96	96	}
97	97	} else {
98	98	?> destroying <?php
99		- if($ActualDamage['Shield'] > 0) {
	99	+ if ($ActualDamage['Shield'] > 0) {
100	100	?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php
101	101	$this->doDamageTypeReductionDisplay($DamageTypes);
102	102	}
103		- if($ActualDamage['NumCDs'] > 0) {
	103	+ if ($ActualDamage['NumCDs'] > 0) {
104	104	?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php
105	105	$this->doDamageTypeReductionDisplay($DamageTypes);
106	106	}
107		- if($ActualDamage['Armour'] > 0) {
	107	+ if ($ActualDamage['Armour'] > 0) {
108	108	?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php
109	109	}
110	110	}
111	111	}
112	112	} ?>.
113	113	<br /><?php
114		- if($ActualDamage['KillingShot']) {
115		- $this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer));
	114	+ if ($ActualDamage['KillingShot']) {
	115	+ $this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer));
116	116	}
117	117	}
118	118	}
119	119	echo $ShootingPlayer->getDisplayName();
120		- if($TotalDamage > 0) {
	120	+ if ($TotalDamage > 0) {
121	121	?> hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php
122	122	} else {
123	123	?> does no damage this round.<?php
124		- if(!$TraderResults['DeadBeforeShot']) {
	124	+ if (!$TraderResults['DeadBeforeShot']) {
125	125	?> Maybe they should go back to the academy<?php
126	126	}
127	127	} ?>.<br /><br /><?php
128	128	}
129	129	}
130	130	$TotalDamage = $TraderTeamCombatResults['TotalDamage']; ?>
131		-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 } ?>.<br />
	131	+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 } ?>.<br />

		@@ -46,7 +46,7 @@
		block discarded – undo
46	46
47	47	// Don't lose more exp than you have
48	48	$lost_xp = min($player->getExperience(),
49		- IRound(SmrPort::getBaseExperience($amount, $good_distance)));
	49	+ IRound(SmrPort::getBaseExperience($amount, $good_distance)));
50	50	$player->decreaseExperience($lost_xp);
51	51	$player->increaseHOF($lost_xp, array('Trade', 'Experience', 'Jettisoned'), HOF_PUBLIC);
52	52

		@@ -94,7 +94,7 @@ discard block
		block discarded – undo
94	94	$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
95	95	return $return;
96	96	}
97		- $damage =& $this->getModifiedDamage();
	97	+ $damage = & $this->getModifiedDamage();
98	98	if ($targetPlayer->getShip()->isFederal()) { // do less damage to fed ships
99	99	$damage['MaxDamage'] = IRound($damage['MaxDamage'] * self::FED_SHIP_DAMAGE_MODIFIER);
100	100	$damage['Shield'] = IRound($damage['Shield'] * self::FED_SHIP_DAMAGE_MODIFIER);
		@@ -131,12 +131,12 @@ discard block
		block discarded – undo
131	131	}
132	132
133	133	protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer, $minesAreAttacker = false) {
134		- $return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker);
135		- $return['ActualDamage'] =& $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']);
	134	+ $return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker);
	135	+ $return['ActualDamage'] = & $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']);
136	136	$return['ActualDamage']['Launched'] = ICeil($return['WeaponDamage']['Launched'] * $return['ActualDamage']['TotalDamage'] / $return['WeaponDamage']['MaxDamage']);
137	137
138	138	if ($return['ActualDamage']['KillingShot']) {
139		- $return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
	139	+ $return['KillResults'] = & $targetPlayer->killPlayerByForces($forces);
140	140	}
141	141	return $return;
142	142	}

smrealms / smr

Scrutinizer GitHub App not installed

Pull Request — master (#817)

Status

Category

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

Braces +30 added lines, -22 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +78 added lines, -78 removed lines patch added patch discarded remove patch

Braces +37 added lines, -17 removed lines patch added patch discarded remove patch

Spacing +50 added lines, -50 removed lines patch added patch discarded remove patch

Spacing +49 added lines, -49 removed lines patch added patch discarded remove patch

Spacing +43 added lines, -43 removed lines patch added patch discarded remove patch

Braces +12 added lines, -24 removed lines patch added patch discarded remove patch

Spacing +48 added lines, -48 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch