Inspection of "href url on archive error" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 87b863...3be42e )

by Yannick

created 2017-10-20 17:44 UTC

Status

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

@@ -42,7 +42,9 @@  discard block
 block discarded – undo
 	}
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
-	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
+	if (empty($airline_names)) {
+		$airline_names = $Spotter->getAllAirlineNames();
+	}
 	foreach($airline_names as $airline_name)
 	{
 		if($airline == $airline_name['airline_icao'])
@@ -65,8 +67,7 @@  discard block
 block discarded – undo
 			if ($globalIVAO && @getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
-			}
-			elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
+			} elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
 			}

Please login to merge, or discard this patch.

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

@@ -7,22 +7,22 @@  discard block
 block discarded – undo
 	header('Location: '.$globalURL.'/airline');
 	die();
 }
-$airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
+$airline = urldecode(filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING));
 $Spotter = new Spotter();
 $alliance = false;
-if (strpos($airline,'alliance_') !== FALSE) {
+if (strpos($airline, 'alliance_') !== FALSE) {
 //	$spotter_array = $Spotter->getSpotterDataByAirline('',"0,1","",array('alliance' => str_replace('_',' ',str_replace('alliance_','',$airline))));
 	$alliance = true;
 } else {
-	$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+	$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 }
 
 if (!empty($spotter_array) || $alliance === true)
 {
 	if ($alliance) {
-		$title = sprintf(_("Most Common Aircraft from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
+		$title = sprintf(_("Most Common Aircraft from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
 	} else {
-		$title = sprintf(_("Most Common Aircraft from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+		$title = sprintf(_("Most Common Aircraft from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	}
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
 	$alliances = $Spotter->getAllAllianceNames();
 	if (!empty($alliances)) {
 		foreach ($alliances as $al) {
-			if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
+			if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
 			} else {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
 			}
 		}
 		print '<option disabled>────────────────</option>';
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($airline == $airline_name['airline_icao'])
+		if ($airline == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -79,12 +79,12 @@  discard block
 block discarded – undo
 			print '</div>';
 		} else {
 			print '<div class="info column">';
-			print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
-			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
+			print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
+			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
 			{
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
 			}
-			print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
+			print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
 			print '</div>';
 		}
 	} else {
@@ -95,9 +95,9 @@  discard block
 block discarded – undo
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft").'</h2>';
 	if ($alliance === false) {
-		print '<p>'.sprintf(_("The statistic below shows the most common aircraft of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common aircraft of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	} else {
-		print '<p>'.sprintf(_("The statistic below shows the most common aircraft of flights from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common aircraft of flights from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
 	}
 
 	/*
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
 		$aircraft_array = $Spotter->countAllAircraftTypesByAirline($airline);
 	}
 	*/
-	$aircraft_array = $Stats->countAllAircraftTypes(true,$airline);
+	$aircraft_array = $Stats->countAllAircraftTypes(true, $airline);
 	if (!empty($aircraft_array))
 	{
 		print '<div class="table-responsive">';
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($aircraft_array as $aircraft_item)
+		foreach ($aircraft_array as $aircraft_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

airline-statistics-departure-airport.php 2 patches

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

@@ -42,7 +42,9 @@  discard block
 block discarded – undo
 	}
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
-	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
+	if (empty($airline_names)) {
+		$airline_names = $Spotter->getAllAirlineNames();
+	}
 	foreach($airline_names as $airline_name)
 	{
 		if($airline == $airline_name['airline_icao'])
@@ -65,8 +67,7 @@  discard block
 block discarded – undo
 			if ($globalIVAO && @getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
-			}
-			elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
+			} elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
 			}

Please login to merge, or discard this patch.

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

@@ -7,21 +7,21 @@  discard block
 block discarded – undo
 	header('Location: '.$globalURL.'/airline');
 	die();
 }
-$airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
+$airline = urldecode(filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING));
 $Spotter = new Spotter();
 $alliance = false;
-if (strpos($airline,'alliance_') !== FALSE) {
+if (strpos($airline, 'alliance_') !== FALSE) {
 	$alliance = true;
 } else {
-	$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+	$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 }
 
 if (!empty($spotter_array) || $alliance === true)
 {
 	if ($alliance) {
-		$title = sprintf(_("Most Common Departure Airports from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
+		$title = sprintf(_("Most Common Departure Airports from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
 	} else {
-		$title = sprintf(_("Most Common Departure Airports from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+		$title = sprintf(_("Most Common Departure Airports from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	}
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -31,10 +31,10 @@  discard block
 block discarded – undo
 	$alliances = $Spotter->getAllAllianceNames();
 	if (!empty($alliances)) {
 		foreach ($alliances as $al) {
-			if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
+			if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
 			} else {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
 			}
 		}
 		print '<option disabled>───────────────────</option>';
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($airline == $airline_name['airline_icao'])
+		if ($airline == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
 			print '</div>';
 		} else {
 			print '<div class="info column">';
-			print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
-			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
+			print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
+			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
 			{
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
 			}
-			print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
+			print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
 			print '</div>';
 		}
 	} else {
@@ -94,9 +94,9 @@  discard block
 block discarded – undo
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports").'</h2>';
 	if ($alliance) {
-		print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
 	} else {
-		print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	}
 	/*
 	if ($alliance) {
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
 		$airport_airport_array = $Spotter->countAllDepartureAirportsByAirline($airline);
 	}
 	*/
-	$airport_airport_array = $Stats->countAllDepartureAirports(true,$airline);
+	$airport_airport_array = $Stats->countAllDepartureAirports(true, $airline);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/datamaps.world.min.js"></script>';
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
 	print '<script>';
 	print 'var series = [';
 	$airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		$airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_name'].' ('.$airport_item['airport_departure_icao'].')",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],';
 	}
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

airline-statistics-route.php 2 patches

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

@@ -42,7 +42,9 @@  discard block
 block discarded – undo
 	}
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
-	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
+	if (empty($airline_names)) {
+		$airline_names = $Spotter->getAllAirlineNames();
+	}
 	foreach($airline_names as $airline_name)
 	{
 		if($airline == $airline_name['airline_icao'])
@@ -65,8 +67,7 @@  discard block
 block discarded – undo
 			if ($globalIVAO && @getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
-			}
-			elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
+			} elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
 			}

Please login to merge, or discard this patch.

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

@@ -7,21 +7,21 @@  discard block
 block discarded – undo
 	header('Location: '.$globalURL.'/airline');
 	die();
 }
-$airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
+$airline = urldecode(filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING));
 $Spotter = new Spotter();
 $alliance = false;
-if (strpos($airline,'alliance_') !== FALSE) {
+if (strpos($airline, 'alliance_') !== FALSE) {
 	$alliance = true;
 } else {
-	$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+	$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 }
 
 if (!empty($spotter_array) || $alliance === true)
 {
 	if ($alliance) {
-		$title = sprintf(_("Most Common Routes from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
+		$title = sprintf(_("Most Common Routes from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
 	} else {
-		$title = sprintf(_("Most Common Routes from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+		$title = sprintf(_("Most Common Routes from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	}
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -31,10 +31,10 @@  discard block
 block discarded – undo
 	$alliances = $Spotter->getAllAllianceNames();
 	if (!empty($alliances)) {
 		foreach ($alliances as $al) {
-			if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
+			if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
 			} else {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
 			}
 		}
 		print '<option disabled>───────────────────</option>';
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($airline == $airline_name['airline_icao'])
+		if ($airline == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
 			print '</div>';
 		} else {
 			print '<div class="info column">';
-			print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
-			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
+			print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
+			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
 			{
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
 			}
-			print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
+			print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
 			print '</div>';
 		}
 	} else {
@@ -94,12 +94,12 @@  discard block
 block discarded – undo
 	 print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
 	if ($alliance) {
-		print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
 	} else {
-		print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	}
 	if ($alliance) {
-		$route_array = $Spotter->countAllRoutesByAirline('',array('alliance' => str_replace('_',' ',str_replace('alliance_','',$airline))));
+		$route_array = $Spotter->countAllRoutesByAirline('', array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $airline))));
 	} else {
 		$route_array = $Spotter->countAllRoutesByAirline($airline);
 	}
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($route_array as $route_item)
+		foreach ($route_array as $route_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

airline-statistics-manufacturer.php 2 patches

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

@@ -42,7 +42,9 @@  discard block
 block discarded – undo
 	}
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
-	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
+	if (empty($airline_names)) {
+		$airline_names = $Spotter->getAllAirlineNames();
+	}
 	foreach($airline_names as $airline_name)
 	{
 		if($airline == $airline_name['airline_icao'])
@@ -65,8 +67,7 @@  discard block
 block discarded – undo
 			if ($globalIVAO && @getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
-			}
-			elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
+			} elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
 			}

Please login to merge, or discard this patch.

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

@@ -7,21 +7,21 @@  discard block
 block discarded – undo
 	header('Location: '.$globalURL.'/airline');
 	die();
 }
-$airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
+$airline = urldecode(filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING));
 $Spotter = new Spotter();
 $alliance = false;
-if (strpos($airline,'alliance_') !== FALSE) {
+if (strpos($airline, 'alliance_') !== FALSE) {
 	$alliance = true;
 } else {
-	$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+	$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 }
 
 if (!empty($spotter_array) || $alliance === true)
 {
 	if ($alliance) {
-		$title = sprintf(_("Most Common Aircraft Manufacturer from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
+		$title = sprintf(_("Most Common Aircraft Manufacturer from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
 	} else {
-		$title = sprintf(_("Most Common Aircraft Manufacturer from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+		$title = sprintf(_("Most Common Aircraft Manufacturer from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	}
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -31,10 +31,10 @@  discard block
 block discarded – undo
 	$alliances = $Spotter->getAllAllianceNames();
 	if (!empty($alliances)) {
 		foreach ($alliances as $al) {
-			if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
+			if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
 			} else {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
 			}
 		}
 		print '<option disabled>───────────────────</option>';
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($airline == $airline_name['airline_icao'])
+		if ($airline == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
 			print '</div>';
 		} else {
 			print '<div class="info column">';
-			print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
-			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
+			print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
+			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
 			{
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
 			}
-			print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
+			print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
 			print '</div>';
 		}
 	} else {
@@ -94,16 +94,16 @@  discard block
 block discarded – undo
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft Manufacturer").'</h2>';
 	if ($alliance) {
-		print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
 	} else {
-		print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	}
 	if ($alliance) {
-		$manufacturers_array = $Spotter->countAllAircraftManufacturerByAirline('',array('alliance' => str_replace('_',' ',str_replace('alliance_','',$airline))));
+		$manufacturers_array = $Spotter->countAllAircraftManufacturerByAirline('', array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $airline))));
 	} else {
 		$manufacturers_array = $Spotter->countAllAircraftManufacturerByAirline($airline);
 	}
-	$manufacturers_array = $Stats->countAllAircraftManufacturers(true,$airline);
+	$manufacturers_array = $Stats->countAllAircraftManufacturers(true, $airline);
 	if (!empty($manufacturers_array))
 	{
 		print '<div class="table-responsive">';
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($manufacturers_array as $manufacturer_item)
+		foreach ($manufacturers_array as $manufacturer_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

airline-statistics-departure-airport-country.php 3 patches

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

@@ -42,7 +42,9 @@  discard block
 block discarded – undo
 	}
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
-	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
+	if (empty($airline_names)) {
+		$airline_names = $Spotter->getAllAirlineNames();
+	}
 	foreach($airline_names as $airline_name)
 	{
 		if($airline == $airline_name['airline_icao'])
@@ -65,8 +67,7 @@  discard block
 block discarded – undo
 			if ($globalIVAO && @getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
-			}
-			elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
+			} elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
 			}

Please login to merge, or discard this patch.

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

@@ -4,8 +4,8 @@  discard block
 block discarded – undo
 require_once('require/class.Stats.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['airline'])) {
-        header('Location: '.$globalURL.'/airline');
-        die();
+		header('Location: '.$globalURL.'/airline');
+		die();
 }
 $airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
 $Spotter = new Spotter();
@@ -118,11 +118,11 @@  discard block
 block discarded – undo
 	}
 	$country_data = substr($country_data, 0, -1);
 	print $country_data;
-        print '];';
-        print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
-        print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
-        print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});';
-        print 'new Datamap({
+		print '];';
+		print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
+		print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
+		print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});';
+		print 'new Datamap({
 	    element: document.getElementById("chartCountry"),
 	    projection: "mercator", // big world map
 	    fills: { defaultFill: "#F5F5F5" },

Please login to merge, or discard this patch.

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

@@ -7,21 +7,21 @@  discard block
 block discarded – undo
         header('Location: '.$globalURL.'/airline');
         die();
 }
-$airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
+$airline = urldecode(filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING));
 $Spotter = new Spotter();
 $alliance = false;
-if (strpos($airline,'alliance_') !== FALSE) {
+if (strpos($airline, 'alliance_') !== FALSE) {
 	$alliance = true;
 } else {
-	$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+	$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 }
 
 if (!empty($spotter_array) || $alliance === true)
 {
 	if ($alliance) {
-		$title = sprintf(_("Most Common Departure Airports by Country from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
+		$title = sprintf(_("Most Common Departure Airports by Country from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
 	} else {
-		$title = sprintf(_("Most Common Departure Airports by Country from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+		$title = sprintf(_("Most Common Departure Airports by Country from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	}
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -31,10 +31,10 @@  discard block
 block discarded – undo
 	$alliances = $Spotter->getAllAllianceNames();
 	if (!empty($alliances)) {
 		foreach ($alliances as $al) {
-			if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
+			if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
 			} else {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
 			}
 		}
 		print '<option disabled>──────────────────</option>';
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($airline == $airline_name['airline_icao'])
+		if ($airline == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
 			print '</div>';
 		} else {
 			print '<div class="info column">';
-			print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
-			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
+			print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
+			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
 			{
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
 			}
-			print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
+			print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
 			print '</div>';
 		}
 	} else {
@@ -94,9 +94,9 @@  discard block
 block discarded – undo
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports by Country").'</h2>';
 	if ($alliance) {
-		print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
 	} else {
-		print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	}
 	/*
 	if ($alliance) {
@@ -105,14 +105,14 @@  discard block
 block discarded – undo
 		$airport_country_array = $Spotter->countAllDepartureAirportCountriesByAirline($airline);
 	}
 	*/
-	$airport_country_array = $Stats->countAllDepartureCountries(true,$airline);
+	$airport_country_array = $Stats->countAllDepartureCountries(true, $airline);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/datamaps.world.min.js"></script>';
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['airport_departure_country_iso3'].'",'.$airport_item['airport_departure_country_count'].'],';
 	}
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_array as $airport_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

search-ajax.php 2 patches

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

@@ -7,7 +7,7 @@  discard block
 block discarded – undo
 $Spotter = new Spotter();
 $orderby = $Spotter->getOrderBy();
 
-$ask = filter_input(INPUT_GET,'ask',FILTER_SANITIZE_STRING);
+$ask = filter_input(INPUT_GET, 'ask', FILTER_SANITIZE_STRING);
 if ($ask == 'aircraftsdetected') {
 	require_once('require/class.SpotterLive.php');
 	$SpotterLive = new SpotterLive();
@@ -27,16 +27,16 @@  discard block
 block discarded – undo
 	$manufacturers = $Stats->getAllManufacturers();
 	if (empty($manufacturers)) $manufacturers = $Spotter->getAllManufacturers();
 	$all_manufacturers = array();
-	foreach($manufacturers as $manufacturer)
+	foreach ($manufacturers as $manufacturer)
 	{
-		$all_manufacturers[] = array('value' => $manufacturer['aircraft_manufacturer'], 'id' => strtolower(str_replace(' ','-',$manufacturer['aircraft_manufacturer'])));
+		$all_manufacturers[] = array('value' => $manufacturer['aircraft_manufacturer'], 'id' => strtolower(str_replace(' ', '-', $manufacturer['aircraft_manufacturer'])));
 	}
 	echo json_encode($all_manufacturers);
 } elseif ($ask == 'aircrafttypes') {
 	$aircraft_types = $Stats->getAllAircraftTypes();
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
 	$all_aircraft_types = array();
-	foreach($aircraft_types as $aircraft_type)
+	foreach ($aircraft_types as $aircraft_type)
 	{
 		$all_aircraft_types[] = array('id' => $aircraft_type['aircraft_icao'], 'value' => $aircraft_type['aircraft_name'].' ('.$aircraft_type['aircraft_icao'].')');
 	}
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
 } elseif ($ask == 'airlinenames') {
 	$airline_names = $Stats->getAllAirlineNames();
 	$all_airline_names = array();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
 		$all_airline_names[] = array('id' => $airline_name['airline_icao'], 'value' => $airline_name['airline_name'].' ('.$airline_name['airline_icao'].')');
 	}
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
 } elseif ($ask == 'airlinecountries') {
 	$airline_countries = $Spotter->getAllAirlineCountries();
 	$all_airline_countries = array();
-	foreach($airline_countries as $airline_country)
+	foreach ($airline_countries as $airline_country)
 	{
 		$all_airline_countries[] = array('id' => $airline_country['airline_country'], 'value' => $airline_country['airline_country']);
 	}
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
 	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
 	ksort($airport_names);
 	$all_airport_names = array();
-	foreach($airport_names as $airport_name)
+	foreach ($airport_names as $airport_name)
 	{
 		$all_airport_names[] = array('id' => $airport_name['airport_icao'], 'value' => $airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')');
 	}
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
 } elseif ($ask == 'airportcountries') {
 	$airport_countries = $Spotter->getAllAirportCountries();
 	$all_airport_countries = array();
-	foreach($airport_countries as $airport_country)
+	foreach ($airport_countries as $airport_country)
 	{
 		$all_airport_countries[] = array('id' => $airport_country['airport_country'], 'value' => $airport_country['airport_country']);
 	}

Please login to merge, or discard this patch.

Braces +9 added lines, -3 removed lines patch added patch discarded remove patch

@@ -25,7 +25,9 @@  discard block
 block discarded – undo
 	echo json_encode($marinecnt);
 } elseif ($ask == 'manufacturer') {
 	$manufacturers = $Stats->getAllManufacturers();
-	if (empty($manufacturers)) $manufacturers = $Spotter->getAllManufacturers();
+	if (empty($manufacturers)) {
+		$manufacturers = $Spotter->getAllManufacturers();
+	}
 	$all_manufacturers = array();
 	foreach($manufacturers as $manufacturer)
 	{
@@ -34,7 +36,9 @@  discard block
 block discarded – undo
 	echo json_encode($all_manufacturers);
 } elseif ($ask == 'aircrafttypes') {
 	$aircraft_types = $Stats->getAllAircraftTypes();
-	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
+	if (empty($aircraft_types)) {
+		$aircraft_types = $Spotter->getAllAircraftTypes();
+	}
 	$all_aircraft_types = array();
 	foreach($aircraft_types as $aircraft_type)
 	{
@@ -59,7 +63,9 @@  discard block
 block discarded – undo
 	echo json_encode($all_airline_countries);
 } elseif ($ask == 'airportnames' || $ask == 'departureairportnames' || $ask == 'arrivalairportnames') {
 	$airport_names = $Stats->getAllAirportNames();
-	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
+	if (empty($airport_names)) {
+		$airport_names = $Spotter->getAllAirportNames();
+	}
 	ksort($airport_names);
 	$all_airport_names = array();
 	foreach($airport_names as $airport_name)

Please login to merge, or discard this patch.

require/class.Satellite.php 3 patches

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

@@ -124,11 +124,11 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Gets all launch site
-	*
-	* @return Array the launch site list
-	*
-	*/
+	 * Gets all launch site
+	 *
+	 * @return Array the launch site list
+	 *
+	 */
 	public function countAllLaunchSite($limit = true, $filters = array())
 	{
 		global $globalDBdriver;
@@ -153,11 +153,11 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Gets all owners
-	*
-	* @return Array the owners list
-	*
-	*/
+	 * Gets all owners
+	 *
+	 * @return Array the owners list
+	 *
+	 */
 	public function countAllOwners($limit = true, $filters = array())
 	{
 		global $globalDBdriver;
@@ -182,11 +182,11 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Gets all countries owners
-	*
-	* @return Array the countries list
-	*
-	*/
+	 * Gets all countries owners
+	 *
+	 * @return Array the countries list
+	 *
+	 */
 	public function countAllCountriesOwners($limit = true, $filters = array())
 	{
 		global $globalDBdriver;
@@ -211,11 +211,11 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Counts all launch dates during the last year
-	*
-	* @return Array the launch date list
-	*
-	*/
+	 * Counts all launch dates during the last year
+	 *
+	 * @return Array the launch date list
+	 *
+	 */
 	public function countAllMonthsLastYear($filters = array(), $sincedate = '')
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -256,11 +256,11 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Counts all dates during the last 10 years
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last 10 years
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllYears($filters = array(), $sincedate = '')
 	{
 		global $globalTimezone, $globalDBdriver;

Please login to merge, or discard this patch.

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

@@ -20,7 +20,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':name' => $name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':type' => $type));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -64,49 +64,49 @@  discard block
 block discarded – undo
 		else return array();
 	}
 	
-	public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) {
+	public function position_all($timestamp_begin = '', $timestamp_end = '', $second = 10) {
 		$all_sat = $this->get_tle_names();
 		$result = array();
 		foreach ($all_sat as $sat) {
-			$position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
-			$result = array_merge($position,$result);
+			$position = $this->position($sat['tle_name'], $timestamp_begin, $timestamp_end, $second);
+			$result = array_merge($position, $result);
 		}
 		return $result;
 	}
 
-	public function position_all_type($type,$timestamp_begin = '',$timestamp_end = '',$second = 10) {
+	public function position_all_type($type, $timestamp_begin = '', $timestamp_end = '', $second = 10) {
 		$all_sat = $this->get_tle_names_type($type);
 		$result = array();
 		foreach ($all_sat as $sat) {
-			$position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
-			if (isset($position[0])) $result = array_merge($position,$result);
+			$position = $this->position($sat['tle_name'], $timestamp_begin, $timestamp_end, $second);
+			if (isset($position[0])) $result = array_merge($position, $result);
 			else $result[] = $position;
 		}
 		return $result;
 	}
 
-	public function position($name,$timestamp_begin = '',$timestamp_end = '',$second = 10) {
+	public function position($name, $timestamp_begin = '', $timestamp_end = '', $second = 10) {
 		$qth = new Predict_QTH();
 		$qth->lat = floatval(37.790252);
 		$qth->lon = floatval(-122.419968);
 	
 		$tle_file = $this->get_tle($name);
 		$type = $tle_file['tle_type'];
-		$tle = new Predict_TLE($tle_file['tle_name'],$tle_file['tle_tle1'],$tle_file['tle_tle2']);
+		$tle = new Predict_TLE($tle_file['tle_name'], $tle_file['tle_tle1'], $tle_file['tle_tle2']);
 		$sat = new Predict_Sat($tle);
 		$predict = new Predict();
 		//if ($timestamp == '') $now = Predict_Time::get_current_daynum();
 		if ($timestamp_begin == '') $timestamp_begin = time();
 		if ($timestamp_end == '') {
 			$now = Predict_Time::unix2daynum($timestamp_begin);
-			$predict->predict_calc($sat,$qth,$now);
-			return array('name' => $name, 'latitude' => $sat->ssplat,'longitude' => $sat->ssplon, 'altitude' => $sat->alt,'speed' => $sat->velo*60*60,'timestamp' => $timestamp_begin,'type' => $type);
+			$predict->predict_calc($sat, $qth, $now);
+			return array('name' => $name, 'latitude' => $sat->ssplat, 'longitude' => $sat->ssplon, 'altitude' => $sat->alt, 'speed' => $sat->velo*60*60, 'timestamp' => $timestamp_begin, 'type' => $type);
 		} else {
 			$result = array();
-			for ($timestamp = $timestamp_begin; $timestamp <= $timestamp_end; $timestamp=$timestamp+$second) {
+			for ($timestamp = $timestamp_begin; $timestamp <= $timestamp_end; $timestamp = $timestamp + $second) {
 				$now = Predict_Time::unix2daynum($timestamp);
-				$predict->predict_calc($sat,$qth,$now);
-				$result[] = array('name' => $name,'latitude' => $sat->ssplat,'longitude' => $sat->ssplon, 'altitude' => $sat->alt,'speed' => $sat->velo*60*60,'timestamp' => $timestamp,'type' => $type);
+				$predict->predict_calc($sat, $qth, $now);
+				$result[] = array('name' => $name, 'latitude' => $sat->ssplat, 'longitude' => $sat->ssplon, 'altitude' => $sat->alt, 'speed' => $sat->velo*60*60, 'timestamp' => $timestamp, 'type' => $type);
 			}
 			return $result;
 		}
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':name' => $name.'%'));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
 		$sth->execute($query_values);
 		$launch_site_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['launch_site'] = $row['launch_site'];
 			$temp_array['launch_site_count'] = $row['launch_site_count'];
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
 		$sth->execute($query_values);
 		$owner_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['owner_name'] = $row['owner_name'];
 			$temp_array['owner_count'] = $row['owner_count'];
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
 		$sth->execute($query_values);
 		$owner_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['country_name'] = $row['country_name'];
 			$temp_array['country_count'] = $row['country_count'];
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
 		$sth->execute($query_data);
 		$date_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['year_name'] = $row['year_name'];
 			$temp_array['month_name'] = $row['month_name'];
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
 		$sth->execute($query_data);
 		$date_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['year_name'] = $row['year_name'];
 			$temp_array['date_count'] = $row['date_count'];

Please login to merge, or discard this patch.

Braces +63 added lines, -23 removed lines patch added patch discarded remove patch

@@ -12,7 +12,9 @@  discard block
 block discarded – undo
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection.');
+		if ($this->db === null) {
+			die('Error: No DB connection.');
+		}
 	}
 
 	public function get_tle($name) {
@@ -24,8 +26,11 @@  discard block
 block discarded – undo
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result[0];
-		else return array();
+		if (isset($result[0])) {
+			return $result[0];
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_types() {
 		$query = 'SELECT DISTINCT tle_type FROM tle ORDER BY tle_type';
@@ -36,8 +41,11 @@  discard block
 block discarded – undo
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_names() {
 		$query = 'SELECT DISTINCT tle_name, tle_type FROM tle';
@@ -48,8 +56,11 @@  discard block
 block discarded – undo
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_names_type($type) {
 		$query = 'SELECT tle_name, tle_type FROM tle WHERE tle_type = :type ORDER BY tle_name';
@@ -60,8 +71,11 @@  discard block
 block discarded – undo
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	
 	public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) {
@@ -79,8 +93,11 @@  discard block
 block discarded – undo
 		$result = array();
 		foreach ($all_sat as $sat) {
 			$position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
-			if (isset($position[0])) $result = array_merge($position,$result);
-			else $result[] = $position;
+			if (isset($position[0])) {
+				$result = array_merge($position,$result);
+			} else {
+				$result[] = $position;
+			}
 		}
 		return $result;
 	}
@@ -96,7 +113,9 @@  discard block
 block discarded – undo
 		$sat = new Predict_Sat($tle);
 		$predict = new Predict();
 		//if ($timestamp == '') $now = Predict_Time::get_current_daynum();
-		if ($timestamp_begin == '') $timestamp_begin = time();
+		if ($timestamp_begin == '') {
+			$timestamp_begin = time();
+		}
 		if ($timestamp_end == '') {
 			$now = Predict_Time::unix2daynum($timestamp_begin);
 			$predict->predict_calc($sat,$qth,$now);
@@ -121,8 +140,11 @@  discard block
 block discarded – undo
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result[0];
-		else return array();
+		if (isset($result[0])) {
+			return $result[0];
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -140,7 +162,9 @@  discard block
 block discarded – undo
 		    FROM satellite".$filter_query." satellite.launch_site <> '' AND satellite.launch_site IS NOT NULL";
 		$query_values = array();
 		$query .= " GROUP BY satellite.launch_site ORDER BY launch_site_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$launch_site_array = array();
@@ -169,7 +193,9 @@  discard block
 block discarded – undo
 		    FROM satellite".$filter_query." satellite.owner <> '' AND satellite.owner IS NOT NULL";
 		$query_values = array();
 		$query .= " GROUP BY satellite.owner ORDER BY owner_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$owner_array = array();
@@ -198,7 +224,9 @@  discard block
 block discarded – undo
 		    FROM satellite".$filter_query." satellite.country_owner <> '' AND satellite.country_owner IS NOT NULL";
 		$query_values = array();
 		$query .= " GROUP BY satellite.country_owner ORDER BY country_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$owner_array = array();
@@ -225,20 +253,26 @@  discard block
 block discarded – undo
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		//$filter_query = $this->getFilter($filters,true,true);
 		$filter_query = ' WHERE';
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT MONTH(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS year_name, count(*) as date_count
 				FROM satellite".$filter_query." satellite.launch_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
-			if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
+			if ($sincedate != '') {
+				$query .= " AND satellite.launch_date > '".$sincedate."'";
+			}
 			$query .= " GROUP BY year_name, month_name
 				ORDER BY year_name, month_name ASC";
 			$query_data = array(':offset' => $offset);
 		} else {
 			$query  = "SELECT EXTRACT(MONTH FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS month_name, EXTRACT(YEAR FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS year_name, count(*) as date_count
 				FROM satellite".$filter_query." satellite.launch_date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '1 YEARS'";
-			if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
+			if ($sincedate != '') {
+				$query .= " AND satellite.launch_date > '".$sincedate."'";
+			}
 			$query .= " GROUP BY year_name, month_name
 				ORDER BY year_name, month_name ASC";
 			$query_data = array(':offset' => $offset);
@@ -270,20 +304,26 @@  discard block
 block discarded – undo
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		//$filter_query = $this->getFilter($filters,true,true);
 		$filter_query = ' WHERE';
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT YEAR(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS year_name, count(*) as date_count
 				FROM satellite".$filter_query." satellite.launch_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 YEAR)";
-			if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
+			if ($sincedate != '') {
+				$query .= " AND satellite.launch_date > '".$sincedate."'";
+			}
 			$query .= " GROUP BY year_name
 				ORDER BY year_name ASC";
 			$query_data = array(':offset' => $offset);
 		} else {
 			$query  = "SELECT EXTRACT(YEAR FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS year_name, count(*) as date_count
 				FROM satellite".$filter_query." satellite.launch_date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '10 YEARS'";
-			if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
+			if ($sincedate != '') {
+				$query .= " AND satellite.launch_date > '".$sincedate."'";
+			}
 			$query .= " GROUP BY year_name
 				ORDER BY year_name ASC";
 			$query_data = array(':offset' => $offset);

Please login to merge, or discard this patch.

space-data.php 2 patches

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

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
 <button type="button" class="close">&times;</button>
 <?php
 
-$sat = filter_input(INPUT_GET,'sat',FILTER_SANITIZE_STRING);
+$sat = filter_input(INPUT_GET, 'sat', FILTER_SANITIZE_STRING);
 $sat = urldecode($sat);
 //$info = $Satellite->get_info(str_replace(' ','-',$sat));
 //print_r($info);
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
 	$aircraft_name = 'INTEGRAL';
 //	$ground_speed = 14970;
 	$launch_date = '17 October 2002';
-} elseif (strpos($sat,'IRIDIUM') !== false) {
+} elseif (strpos($sat, 'IRIDIUM') !== false) {
 	$image = 'https://upload.wikimedia.org/wikipedia/commons/b/b6/Iridium_Satellite.jpg';
 	$image_copyright = 'Cliff';
 	$ident = 'Iridium satellite constellation';
@@ -56,23 +56,23 @@  discard block
 block discarded – undo
 	$aircraft_name = $sat;
 //	$ground_speed = 14970;
 //	$launch_date = '29 september 2011';
-} elseif (strpos($sat,'ORBCOMM') !== false) {
+} elseif (strpos($sat, 'ORBCOMM') !== false) {
 	$ident = 'Orbcomm';
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/Orbcomm_(satellite)';
 	$aircraft_name = $sat;
-} elseif (strpos($sat,'GLOBALSTAR') !== false) {
+} elseif (strpos($sat, 'GLOBALSTAR') !== false) {
 	$ident = 'Globalstar';
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/Globalstar';
 	$aircraft_name = $sat;
-	$satname = str_replace(array('[+]','[-]'),'',$sat);
-} elseif (strpos($sat,'OSCAR 7') !== false) {
+	$satname = str_replace(array('[+]', '[-]'), '', $sat);
+} elseif (strpos($sat, 'OSCAR 7') !== false) {
 	$image = 'https://upload.wikimedia.org/wikipedia/en/a/ad/AMSAT-OSCAR_7.jpg';
 	$image_copyright = 'Amsat.org';
 	$ident = 'AMSAT-OSCAR 7';
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/AMSAT-OSCAR_7';
 	$aircraft_name = $sat;
 	$launch_date = '15 November 1974';
-} elseif (strpos($sat,'santaclaus') !== false) {
+} elseif (strpos($sat, 'santaclaus') !== false) {
 	$image = 'https://upload.wikimedia.org/wikipedia/commons/4/49/Jonathan_G_Meath_portrays_Santa_Claus.jpg';
 	$image_copyright = 'Jonathan G Meath';
 	$ident = 'Santa Claus';
@@ -81,8 +81,8 @@  discard block
 block discarded – undo
 //	$launch_date = '15 November 1974';
 } else {
 	$ident = $sat;
-	if (strpos($sat,'(')) $satname = $sat;
-	else $satname = str_replace(array(' '),'-',$sat);
+	if (strpos($sat, '(')) $satname = $sat;
+	else $satname = str_replace(array(' '), '-', $sat);
 }
 if (!isset($satname)) $satname = $sat;
 $info = $Satellite->get_info(strtolower(trim($satname)));
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
 		print '<div><span>'._("Orbit").'</span>'.$info['orbit'].'</div>';
 	}
 	if ($info['launch_date'] != '') {
-		print '<div><span>'._("Launch Date").'</span>'.date('Y-m-d',strtotime($info['launch_date'])).'</div>';
+		print '<div><span>'._("Launch Date").'</span>'.date('Y-m-d', strtotime($info['launch_date'])).'</div>';
 	}
 	if ($info['launch_site'] != '') {
 		print '<div><span>'._("Launch Site").'</span>'.$info['launch_site'].'</div>';

Please login to merge, or discard this patch.

Braces +8 added lines, -3 removed lines patch added patch discarded remove patch

@@ -81,10 +81,15 @@
 block discarded – undo
 //	$launch_date = '15 November 1974';
 } else {
 	$ident = $sat;
-	if (strpos($sat,'(')) $satname = $sat;
-	else $satname = str_replace(array(' '),'-',$sat);
+	if (strpos($sat,'(')) {
+		$satname = $sat;
+	} else {
+		$satname = str_replace(array(' '),'-',$sat);
+	}
+	}
+if (!isset($satname)) {
+	$satname = $sat;
 }
-if (!isset($satname)) $satname = $sat;
 $info = $Satellite->get_info(strtolower(trim($satname)));
 $position = $Satellite->position($sat);
 $ground_speed = $position['speed'];

Please login to merge, or discard this patch.

js/map-satellite.3d.js.php 1 patch

Braces +6 added lines, -1 removed lines patch added patch discarded remove patch

@@ -52,7 +52,12 @@
 block discarded – undo
 	} else {
 		for (var i = 0; i < viewer.dataSources.get(dsn).entities.values.length; i++) {
 			var entity = viewer.dataSources.get(dsn).entities.values[i];
-			if (parseInt(entity.lastupdatesat) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
+			if (parseInt(entity.lastupdatesat) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*2000;
+} else {
+	print '60000';
+}
+?>)) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 			}
 		}

Please login to merge, or discard this patch.

		@@ -124,11 +124,11 @@ discard block
		block discarded – undo
124	124	}
125	125
126	126	/**
127		- * Gets all launch site
128		- *
129		- * @return Array the launch site list
130		- *
131		- */
	127	+ * Gets all launch site
	128	+ *
	129	+ * @return Array the launch site list
	130	+ *
	131	+ */
132	132	public function countAllLaunchSite($limit = true, $filters = array())
133	133	{
134	134	global $globalDBdriver;
		@@ -153,11 +153,11 @@ discard block
		block discarded – undo
153	153	}
154	154
155	155	/**
156		- * Gets all owners
157		- *
158		- * @return Array the owners list
159		- *
160		- */
	156	+ * Gets all owners
	157	+ *
	158	+ * @return Array the owners list
	159	+ *
	160	+ */
161	161	public function countAllOwners($limit = true, $filters = array())
162	162	{
163	163	global $globalDBdriver;
		@@ -182,11 +182,11 @@ discard block
		block discarded – undo
182	182	}
183	183
184	184	/**
185		- * Gets all countries owners
186		- *
187		- * @return Array the countries list
188		- *
189		- */
	185	+ * Gets all countries owners
	186	+ *
	187	+ * @return Array the countries list
	188	+ *
	189	+ */
190	190	public function countAllCountriesOwners($limit = true, $filters = array())
191	191	{
192	192	global $globalDBdriver;
		@@ -211,11 +211,11 @@ discard block
		block discarded – undo
211	211	}
212	212
213	213	/**
214		- * Counts all launch dates during the last year
215		- *
216		- * @return Array the launch date list
217		- *
218		- */
	214	+ * Counts all launch dates during the last year
	215	+ *
	216	+ * @return Array the launch date list
	217	+ *
	218	+ */
219	219	public function countAllMonthsLastYear($filters = array(), $sincedate = '')
220	220	{
221	221	global $globalTimezone, $globalDBdriver;
		@@ -256,11 +256,11 @@ discard block
		block discarded – undo
256	256	}
257	257
258	258	/**
259		- * Counts all dates during the last 10 years
260		- *
261		- * @return Array the date list
262		- *
263		- */
	259	+ * Counts all dates during the last 10 years
	260	+ *
	261	+ * @return Array the date list
	262	+ *
	263	+ */
264	264	public function countAllYears($filters = array(), $sincedate = '')
265	265	{
266	266	global $globalTimezone, $globalDBdriver;

		@@ -42,7 +42,9 @@ discard block
		block discarded – undo
42	42	}
43	43	$Stats = new Stats();
44	44	$airline_names = $Stats->getAllAirlineNames();
45		- if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
	45	+ if (empty($airline_names)) {
	46	+ $airline_names = $Spotter->getAllAirlineNames();
	47	+ }
46	48	foreach($airline_names as $airline_name)
47	49	{
48	50	if($airline == $airline_name['airline_icao'])
		@@ -65,8 +67,7 @@ discard block
		block discarded – undo
65	67	if ($globalIVAO && @getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif'))
66	68	{
67	69	print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
68		- }
69		- elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
	70	+ } elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
70	71	{
71	72	print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
72	73	}

		@@ -7,22 +7,22 @@ discard block
		block discarded – undo
7	7	header('Location: '.$globalURL.'/airline');
8	8	die();
9	9	}
10		-$airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
	10	+$airline = urldecode(filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING));
11	11	$Spotter = new Spotter();
12	12	$alliance = false;
13		-if (strpos($airline,'alliance_') !== FALSE) {
	13	+if (strpos($airline, 'alliance_') !== FALSE) {
14	14	// $spotter_array = $Spotter->getSpotterDataByAirline('',"0,1","",array('alliance' => str_replace('_',' ',str_replace('alliance_','',$airline))));
15	15	$alliance = true;
16	16	} else {
17		- $spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
	17	+ $spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
18	18	}
19	19
20	20	if (!empty($spotter_array) \|\| $alliance === true)
21	21	{
22	22	if ($alliance) {
23		- $title = sprintf(_("Most Common Aircraft from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
	23	+ $title = sprintf(_("Most Common Aircraft from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
24	24	} else {
25		- $title = sprintf(_("Most Common Aircraft from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
	25	+ $title = sprintf(_("Most Common Aircraft from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
26	26	}
27	27	require_once('header.php');
28	28	print '<div class="select-item">';
		@@ -32,10 +32,10 @@ discard block
		block discarded – undo
32	32	$alliances = $Spotter->getAllAllianceNames();
33	33	if (!empty($alliances)) {
34	34	foreach ($alliances as $al) {
35		- if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
36		- print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
	35	+ if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
	36	+ print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
37	37	} else {
38		- print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
	38	+ print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
39	39	}
40	40	}
41	41	print '<option disabled>────────────────</option>';
		@@ -43,9 +43,9 @@ discard block
		block discarded – undo
43	43	$Stats = new Stats();
44	44	$airline_names = $Stats->getAllAirlineNames();
45	45	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
46		- foreach($airline_names as $airline_name)
	46	+ foreach ($airline_names as $airline_name)
47	47	{
48		- if($airline == $airline_name['airline_icao'])
	48	+ if ($airline == $airline_name['airline_icao'])
49	49	{
50	50	print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
51	51	} else {
		@@ -79,12 +79,12 @@ discard block
		block discarded – undo
79	79	print '</div>';
80	80	} else {
81	81	print '<div class="info column">';
82		- print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
83		- if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') \|\| @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
	82	+ print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
	83	+ if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') \|\| @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
84	84	{
85		- print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
	85	+ print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
86	86	}
87		- print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
	87	+ print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
88	88	print '</div>';
89	89	}
90	90	} else {
		@@ -95,9 +95,9 @@ discard block
		block discarded – undo
95	95	print '<div class="column">';
96	96	print '<h2>'._("Most Common Aircraft").'</h2>';
97	97	if ($alliance === false) {
98		- print '<p>'.sprintf(_("The statistic below shows the most common aircraft of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
	98	+ print '<p>'.sprintf(_("The statistic below shows the most common aircraft of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
99	99	} else {
100		- print '<p>'.sprintf(_("The statistic below shows the most common aircraft of flights from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
	100	+ print '<p>'.sprintf(_("The statistic below shows the most common aircraft of flights from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
101	101	}
102	102
103	103	/*
		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107	$aircraft_array = $Spotter->countAllAircraftTypesByAirline($airline);
108	108	}
109	109	*/
110		- $aircraft_array = $Stats->countAllAircraftTypes(true,$airline);
	110	+ $aircraft_array = $Stats->countAllAircraftTypes(true, $airline);
111	111	if (!empty($aircraft_array))
112	112	{
113	113	print '<div class="table-responsive">';
		@@ -120,7 +120,7 @@ discard block
		block discarded – undo
120	120	print '</thead>';
121	121	print '<tbody>';
122	122	$i = 1;
123		- foreach($aircraft_array as $aircraft_item)
	123	+ foreach ($aircraft_array as $aircraft_item)
124	124	{
125	125	print '<tr>';
126	126	print '<td><strong>'.$i.'</strong></td>';

		@@ -7,21 +7,21 @@ discard block
		block discarded – undo
7	7	header('Location: '.$globalURL.'/airline');
8	8	die();
9	9	}
10		-$airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
	10	+$airline = urldecode(filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING));
11	11	$Spotter = new Spotter();
12	12	$alliance = false;
13		-if (strpos($airline,'alliance_') !== FALSE) {
	13	+if (strpos($airline, 'alliance_') !== FALSE) {
14	14	$alliance = true;
15	15	} else {
16		- $spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
	16	+ $spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
17	17	}
18	18
19	19	if (!empty($spotter_array) \|\| $alliance === true)
20	20	{
21	21	if ($alliance) {
22		- $title = sprintf(_("Most Common Departure Airports from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
	22	+ $title = sprintf(_("Most Common Departure Airports from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
23	23	} else {
24		- $title = sprintf(_("Most Common Departure Airports from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
	24	+ $title = sprintf(_("Most Common Departure Airports from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
25	25	}
26	26	require_once('header.php');
27	27	print '<div class="select-item">';
		@@ -31,10 +31,10 @@ discard block
		block discarded – undo
31	31	$alliances = $Spotter->getAllAllianceNames();
32	32	if (!empty($alliances)) {
33	33	foreach ($alliances as $al) {
34		- if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
35		- print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
	34	+ if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
	35	+ print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
36	36	} else {
37		- print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
	37	+ print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
38	38	}
39	39	}
40	40	print '<option disabled>───────────────────</option>';
		@@ -42,9 +42,9 @@ discard block
		block discarded – undo
42	42	$Stats = new Stats();
43	43	$airline_names = $Stats->getAllAirlineNames();
44	44	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
45		- foreach($airline_names as $airline_name)
	45	+ foreach ($airline_names as $airline_name)
46	46	{
47		- if($airline == $airline_name['airline_icao'])
	47	+ if ($airline == $airline_name['airline_icao'])
48	48	{
49	49	print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
50	50	} else {
		@@ -78,12 +78,12 @@ discard block
		block discarded – undo
78	78	print '</div>';
79	79	} else {
80	80	print '<div class="info column">';
81		- print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
82		- if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') \|\| @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
	81	+ print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
	82	+ if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') \|\| @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
83	83	{
84		- print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
	84	+ print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
85	85	}
86		- print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
	86	+ print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
87	87	print '</div>';
88	88	}
89	89	} else {
		@@ -94,9 +94,9 @@ discard block
		block discarded – undo
94	94	print '<div class="column">';
95	95	print '<h2>'._("Most Common Departure Airports").'</h2>';
96	96	if ($alliance) {
97		- print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
	97	+ print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
98	98	} else {
99		- print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
	99	+ print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
100	100	}
101	101	/*
102	102	if ($alliance) {
		@@ -105,7 +105,7 @@ discard block
		block discarded – undo
105	105	$airport_airport_array = $Spotter->countAllDepartureAirportsByAirline($airline);
106	106	}
107	107	*/
108		- $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline);
	108	+ $airport_airport_array = $Stats->countAllDepartureAirports(true, $airline);
109	109	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
110	110	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
111	111	print '<script type="text/javascript" src="'.$globalURL.'/js/datamaps.world.min.js"></script>';
		@@ -113,7 +113,7 @@ discard block
		block discarded – undo
113	113	print '<script>';
114	114	print 'var series = [';
115	115	$airport_data = '';
116		- foreach($airport_airport_array as $airport_item)
	116	+ foreach ($airport_airport_array as $airport_item)
117	117	{
118	118	$airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_name'].' ('.$airport_item['airport_departure_icao'].')",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],';
119	119	}
		@@ -168,7 +168,7 @@ discard block
		block discarded – undo
168	168	print '</thead>';
169	169	print '<tbody>';
170	170	$i = 1;
171		- foreach($airport_airport_array as $airport_item)
	171	+ foreach ($airport_airport_array as $airport_item)
172	172	{
173	173	print '<tr>';
174	174	print '<td><strong>'.$i.'</strong></td>';

		@@ -4,8 +4,8 @@ discard block
		block discarded – undo
4	4	require_once('require/class.Stats.php');
5	5	require_once('require/class.Language.php');
6	6	if (!isset($_GET['airline'])) {
7		- header('Location: '.$globalURL.'/airline');
8		- die();
	7	+ header('Location: '.$globalURL.'/airline');
	8	+ die();
9	9	}
10	10	$airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
11	11	$Spotter = new Spotter();
		@@ -118,11 +118,11 @@ discard block
		block discarded – undo
118	118	}
119	119	$country_data = substr($country_data, 0, -1);
120	120	print $country_data;
121		- print '];';
122		- print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
123		- print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
124		- print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});';
125		- print 'new Datamap({
	121	+ print '];';
	122	+ print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
	123	+ print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
	124	+ print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});';
	125	+ print 'new Datamap({
126	126	element: document.getElementById("chartCountry"),
127	127	projection: "mercator", // big world map
128	128	fills: { defaultFill: "#F5F5F5" },

		@@ -7,7 +7,7 @@ discard block
		block discarded – undo
7	7	$Spotter = new Spotter();
8	8	$orderby = $Spotter->getOrderBy();
9	9
10		-$ask = filter_input(INPUT_GET,'ask',FILTER_SANITIZE_STRING);
	10	+$ask = filter_input(INPUT_GET, 'ask', FILTER_SANITIZE_STRING);
11	11	if ($ask == 'aircraftsdetected') {
12	12	require_once('require/class.SpotterLive.php');
13	13	$SpotterLive = new SpotterLive();
		@@ -27,16 +27,16 @@ discard block
		block discarded – undo
27	27	$manufacturers = $Stats->getAllManufacturers();
28	28	if (empty($manufacturers)) $manufacturers = $Spotter->getAllManufacturers();
29	29	$all_manufacturers = array();
30		- foreach($manufacturers as $manufacturer)
	30	+ foreach ($manufacturers as $manufacturer)
31	31	{
32		- $all_manufacturers[] = array('value' => $manufacturer['aircraft_manufacturer'], 'id' => strtolower(str_replace(' ','-',$manufacturer['aircraft_manufacturer'])));
	32	+ $all_manufacturers[] = array('value' => $manufacturer['aircraft_manufacturer'], 'id' => strtolower(str_replace(' ', '-', $manufacturer['aircraft_manufacturer'])));
33	33	}
34	34	echo json_encode($all_manufacturers);
35	35	} elseif ($ask == 'aircrafttypes') {
36	36	$aircraft_types = $Stats->getAllAircraftTypes();
37	37	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
38	38	$all_aircraft_types = array();
39		- foreach($aircraft_types as $aircraft_type)
	39	+ foreach ($aircraft_types as $aircraft_type)
40	40	{
41	41	$all_aircraft_types[] = array('id' => $aircraft_type['aircraft_icao'], 'value' => $aircraft_type['aircraft_name'].' ('.$aircraft_type['aircraft_icao'].')');
42	42	}
		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	} elseif ($ask == 'airlinenames') {
45	45	$airline_names = $Stats->getAllAirlineNames();
46	46	$all_airline_names = array();
47		- foreach($airline_names as $airline_name)
	47	+ foreach ($airline_names as $airline_name)
48	48	{
49	49	$all_airline_names[] = array('id' => $airline_name['airline_icao'], 'value' => $airline_name['airline_name'].' ('.$airline_name['airline_icao'].')');
50	50	}
		@@ -52,7 +52,7 @@ discard block
		block discarded – undo
52	52	} elseif ($ask == 'airlinecountries') {
53	53	$airline_countries = $Spotter->getAllAirlineCountries();
54	54	$all_airline_countries = array();
55		- foreach($airline_countries as $airline_country)
	55	+ foreach ($airline_countries as $airline_country)
56	56	{
57	57	$all_airline_countries[] = array('id' => $airline_country['airline_country'], 'value' => $airline_country['airline_country']);
58	58	}
		@@ -62,7 +62,7 @@ discard block
		block discarded – undo
62	62	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
63	63	ksort($airport_names);
64	64	$all_airport_names = array();
65		- foreach($airport_names as $airport_name)
	65	+ foreach ($airport_names as $airport_name)
66	66	{
67	67	$all_airport_names[] = array('id' => $airport_name['airport_icao'], 'value' => $airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')');
68	68	}
		@@ -70,7 +70,7 @@ discard block
		block discarded – undo
70	70	} elseif ($ask == 'airportcountries') {
71	71	$airport_countries = $Spotter->getAllAirportCountries();
72	72	$all_airport_countries = array();
73		- foreach($airport_countries as $airport_country)
	73	+ foreach ($airport_countries as $airport_country)
74	74	{
75	75	$all_airport_countries[] = array('id' => $airport_country['airport_country'], 'value' => $airport_country['airport_country']);
76	76	}

		@@ -25,7 +25,9 @@ discard block
		block discarded – undo
25	25	echo json_encode($marinecnt);
26	26	} elseif ($ask == 'manufacturer') {
27	27	$manufacturers = $Stats->getAllManufacturers();
28		- if (empty($manufacturers)) $manufacturers = $Spotter->getAllManufacturers();
	28	+ if (empty($manufacturers)) {
	29	+ $manufacturers = $Spotter->getAllManufacturers();
	30	+ }
29	31	$all_manufacturers = array();
30	32	foreach($manufacturers as $manufacturer)
31	33	{
		@@ -34,7 +36,9 @@ discard block
		block discarded – undo
34	36	echo json_encode($all_manufacturers);
35	37	} elseif ($ask == 'aircrafttypes') {
36	38	$aircraft_types = $Stats->getAllAircraftTypes();
37		- if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
	39	+ if (empty($aircraft_types)) {
	40	+ $aircraft_types = $Spotter->getAllAircraftTypes();
	41	+ }
38	42	$all_aircraft_types = array();
39	43	foreach($aircraft_types as $aircraft_type)
40	44	{
		@@ -59,7 +63,9 @@ discard block
		block discarded – undo
59	63	echo json_encode($all_airline_countries);
60	64	} elseif ($ask == 'airportnames' \|\| $ask == 'departureairportnames' \|\| $ask == 'arrivalairportnames') {
61	65	$airport_names = $Stats->getAllAirportNames();
62		- if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
	66	+ if (empty($airport_names)) {
	67	+ $airport_names = $Spotter->getAllAirportNames();
	68	+ }
63	69	ksort($airport_names);
64	70	$all_airport_names = array();
65	71	foreach($airport_names as $airport_name)

		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	try {
21	21	$sth = $this->db->prepare($query);
22	22	$sth->execute(array(':name' => $name));
23		- } catch(PDOException $e) {
	23	+ } catch (PDOException $e) {
24	24	echo $e->getMessage();
25	25	}
26	26	$result = $sth->fetchAll(PDO::FETCH_ASSOC);
		@@ -32,7 +32,7 @@ discard block
		block discarded – undo
32	32	try {
33	33	$sth = $this->db->prepare($query);
34	34	$sth->execute();
35		- } catch(PDOException $e) {
	35	+ } catch (PDOException $e) {
36	36	echo $e->getMessage();
37	37	}
38	38	$result = $sth->fetchAll(PDO::FETCH_ASSOC);
		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	try {
45	45	$sth = $this->db->prepare($query);
46	46	$sth->execute();
47		- } catch(PDOException $e) {
	47	+ } catch (PDOException $e) {
48	48	echo $e->getMessage();
49	49	}
50	50	$result = $sth->fetchAll(PDO::FETCH_ASSOC);
		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	try {
57	57	$sth = $this->db->prepare($query);
58	58	$sth->execute(array(':type' => $type));
59		- } catch(PDOException $e) {
	59	+ } catch (PDOException $e) {
60	60	echo $e->getMessage();
61	61	}
62	62	$result = $sth->fetchAll(PDO::FETCH_ASSOC);
		@@ -64,49 +64,49 @@ discard block
		block discarded – undo
64	64	else return array();
65	65	}
66	66
67		- public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) {
	67	+ public function position_all($timestamp_begin = '', $timestamp_end = '', $second = 10) {
68	68	$all_sat = $this->get_tle_names();
69	69	$result = array();
70	70	foreach ($all_sat as $sat) {
71		- $position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
72		- $result = array_merge($position,$result);
	71	+ $position = $this->position($sat['tle_name'], $timestamp_begin, $timestamp_end, $second);
	72	+ $result = array_merge($position, $result);
73	73	}
74	74	return $result;
75	75	}
76	76
77		- public function position_all_type($type,$timestamp_begin = '',$timestamp_end = '',$second = 10) {
	77	+ public function position_all_type($type, $timestamp_begin = '', $timestamp_end = '', $second = 10) {
78	78	$all_sat = $this->get_tle_names_type($type);
79	79	$result = array();
80	80	foreach ($all_sat as $sat) {
81		- $position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
82		- if (isset($position[0])) $result = array_merge($position,$result);
	81	+ $position = $this->position($sat['tle_name'], $timestamp_begin, $timestamp_end, $second);
	82	+ if (isset($position[0])) $result = array_merge($position, $result);
83	83	else $result[] = $position;
84	84	}
85	85	return $result;
86	86	}
87	87
88		- public function position($name,$timestamp_begin = '',$timestamp_end = '',$second = 10) {
	88	+ public function position($name, $timestamp_begin = '', $timestamp_end = '', $second = 10) {
89	89	$qth = new Predict_QTH();
90	90	$qth->lat = floatval(37.790252);
91	91	$qth->lon = floatval(-122.419968);
92	92
93	93	$tle_file = $this->get_tle($name);
94	94	$type = $tle_file['tle_type'];
95		- $tle = new Predict_TLE($tle_file['tle_name'],$tle_file['tle_tle1'],$tle_file['tle_tle2']);
	95	+ $tle = new Predict_TLE($tle_file['tle_name'], $tle_file['tle_tle1'], $tle_file['tle_tle2']);
96	96	$sat = new Predict_Sat($tle);
97	97	$predict = new Predict();
98	98	//if ($timestamp == '') $now = Predict_Time::get_current_daynum();
99	99	if ($timestamp_begin == '') $timestamp_begin = time();
100	100	if ($timestamp_end == '') {
101	101	$now = Predict_Time::unix2daynum($timestamp_begin);
102		- $predict->predict_calc($sat,$qth,$now);
103		- return array('name' => $name, 'latitude' => $sat->ssplat,'longitude' => $sat->ssplon, 'altitude' => $sat->alt,'speed' => $sat->velo6060,'timestamp' => $timestamp_begin,'type' => $type);
	102	+ $predict->predict_calc($sat, $qth, $now);
	103	+ return array('name' => $name, 'latitude' => $sat->ssplat, 'longitude' => $sat->ssplon, 'altitude' => $sat->alt, 'speed' => $sat->velo6060, 'timestamp' => $timestamp_begin, 'type' => $type);
104	104	} else {
105	105	$result = array();
106		- for ($timestamp = $timestamp_begin; $timestamp <= $timestamp_end; $timestamp=$timestamp+$second) {
	106	+ for ($timestamp = $timestamp_begin; $timestamp <= $timestamp_end; $timestamp = $timestamp + $second) {
107	107	$now = Predict_Time::unix2daynum($timestamp);
108		- $predict->predict_calc($sat,$qth,$now);
109		- $result[] = array('name' => $name,'latitude' => $sat->ssplat,'longitude' => $sat->ssplon, 'altitude' => $sat->alt,'speed' => $sat->velo6060,'timestamp' => $timestamp,'type' => $type);
	108	+ $predict->predict_calc($sat, $qth, $now);
	109	+ $result[] = array('name' => $name, 'latitude' => $sat->ssplat, 'longitude' => $sat->ssplon, 'altitude' => $sat->alt, 'speed' => $sat->velo6060, 'timestamp' => $timestamp, 'type' => $type);
110	110	}
111	111	return $result;
112	112	}
		@@ -117,7 +117,7 @@ discard block
		block discarded – undo
117	117	try {
118	118	$sth = $this->db->prepare($query);
119	119	$sth->execute(array(':name' => $name.'%'));
120		- } catch(PDOException $e) {
	120	+ } catch (PDOException $e) {
121	121	echo $e->getMessage();
122	122	}
123	123	$result = $sth->fetchAll(PDO::FETCH_ASSOC);
		@@ -145,7 +145,7 @@ discard block
		block discarded – undo
145	145	$sth->execute($query_values);
146	146	$launch_site_array = array();
147	147	$temp_array = array();
148		- while($row = $sth->fetch(PDO::FETCH_ASSOC))
	148	+ while ($row = $sth->fetch(PDO::FETCH_ASSOC))
149	149	{
150	150	$temp_array['launch_site'] = $row['launch_site'];
151	151	$temp_array['launch_site_count'] = $row['launch_site_count'];
		@@ -174,7 +174,7 @@ discard block
		block discarded – undo
174	174	$sth->execute($query_values);
175	175	$owner_array = array();
176	176	$temp_array = array();
177		- while($row = $sth->fetch(PDO::FETCH_ASSOC))
	177	+ while ($row = $sth->fetch(PDO::FETCH_ASSOC))
178	178	{
179	179	$temp_array['owner_name'] = $row['owner_name'];
180	180	$temp_array['owner_count'] = $row['owner_count'];
		@@ -203,7 +203,7 @@ discard block
		block discarded – undo
203	203	$sth->execute($query_values);
204	204	$owner_array = array();
205	205	$temp_array = array();
206		- while($row = $sth->fetch(PDO::FETCH_ASSOC))
	206	+ while ($row = $sth->fetch(PDO::FETCH_ASSOC))
207	207	{
208	208	$temp_array['country_name'] = $row['country_name'];
209	209	$temp_array['country_count'] = $row['country_count'];
		@@ -247,7 +247,7 @@ discard block
		block discarded – undo
247	247	$sth->execute($query_data);
248	248	$date_array = array();
249	249	$temp_array = array();
250		- while($row = $sth->fetch(PDO::FETCH_ASSOC))
	250	+ while ($row = $sth->fetch(PDO::FETCH_ASSOC))
251	251	{
252	252	$temp_array['year_name'] = $row['year_name'];
253	253	$temp_array['month_name'] = $row['month_name'];
		@@ -292,7 +292,7 @@ discard block
		block discarded – undo
292	292	$sth->execute($query_data);
293	293	$date_array = array();
294	294	$temp_array = array();
295		- while($row = $sth->fetch(PDO::FETCH_ASSOC))
	295	+ while ($row = $sth->fetch(PDO::FETCH_ASSOC))
296	296	{
297	297	$temp_array['year_name'] = $row['year_name'];
298	298	$temp_array['date_count'] = $row['date_count'];

		@@ -12,7 +12,9 @@ discard block
		block discarded – undo
12	12	public function __construct($dbc = null) {
13	13	$Connection = new Connection($dbc);
14	14	$this->db = $Connection->db();
15		- if ($this->db === null) die('Error: No DB connection.');
	15	+ if ($this->db === null) {
	16	+ die('Error: No DB connection.');
	17	+ }
16	18	}
17	19
18	20	public function get_tle($name) {
		@@ -24,8 +26,11 @@ discard block
		block discarded – undo
24	26	echo $e->getMessage();
25	27	}
26	28	$result = $sth->fetchAll(PDO::FETCH_ASSOC);
27		- if (isset($result[0])) return $result[0];
28		- else return array();
	29	+ if (isset($result[0])) {
	30	+ return $result[0];
	31	+ } else {
	32	+ return array();
	33	+ }
29	34	}
30	35	public function get_tle_types() {
31	36	$query = 'SELECT DISTINCT tle_type FROM tle ORDER BY tle_type';
		@@ -36,8 +41,11 @@ discard block
		block discarded – undo
36	41	echo $e->getMessage();
37	42	}
38	43	$result = $sth->fetchAll(PDO::FETCH_ASSOC);
39		- if (isset($result[0])) return $result;
40		- else return array();
	44	+ if (isset($result[0])) {
	45	+ return $result;
	46	+ } else {
	47	+ return array();
	48	+ }
41	49	}
42	50	public function get_tle_names() {
43	51	$query = 'SELECT DISTINCT tle_name, tle_type FROM tle';
		@@ -48,8 +56,11 @@ discard block
		block discarded – undo
48	56	echo $e->getMessage();
49	57	}
50	58	$result = $sth->fetchAll(PDO::FETCH_ASSOC);
51		- if (isset($result[0])) return $result;
52		- else return array();
	59	+ if (isset($result[0])) {
	60	+ return $result;
	61	+ } else {
	62	+ return array();
	63	+ }
53	64	}
54	65	public function get_tle_names_type($type) {
55	66	$query = 'SELECT tle_name, tle_type FROM tle WHERE tle_type = :type ORDER BY tle_name';
		@@ -60,8 +71,11 @@ discard block
		block discarded – undo
60	71	echo $e->getMessage();
61	72	}
62	73	$result = $sth->fetchAll(PDO::FETCH_ASSOC);
63		- if (isset($result[0])) return $result;
64		- else return array();
	74	+ if (isset($result[0])) {
	75	+ return $result;
	76	+ } else {
	77	+ return array();
	78	+ }
65	79	}
66	80
67	81	public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) {
		@@ -79,8 +93,11 @@ discard block
		block discarded – undo
79	93	$result = array();
80	94	foreach ($all_sat as $sat) {
81	95	$position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
82		- if (isset($position[0])) $result = array_merge($position,$result);
83		- else $result[] = $position;
	96	+ if (isset($position[0])) {
	97	+ $result = array_merge($position,$result);
	98	+ } else {
	99	+ $result[] = $position;
	100	+ }
84	101	}
85	102	return $result;
86	103	}
		@@ -96,7 +113,9 @@ discard block
		block discarded – undo
96	113	$sat = new Predict_Sat($tle);
97	114	$predict = new Predict();
98	115	//if ($timestamp == '') $now = Predict_Time::get_current_daynum();
99		- if ($timestamp_begin == '') $timestamp_begin = time();
	116	+ if ($timestamp_begin == '') {
	117	+ $timestamp_begin = time();
	118	+ }
100	119	if ($timestamp_end == '') {
101	120	$now = Predict_Time::unix2daynum($timestamp_begin);
102	121	$predict->predict_calc($sat,$qth,$now);
		@@ -121,8 +140,11 @@ discard block
		block discarded – undo
121	140	echo $e->getMessage();
122	141	}
123	142	$result = $sth->fetchAll(PDO::FETCH_ASSOC);
124		- if (isset($result[0])) return $result[0];
125		- else return array();
	143	+ if (isset($result[0])) {
	144	+ return $result[0];
	145	+ } else {
	146	+ return array();
	147	+ }
126	148	}
127	149
128	150	/**
		@@ -140,7 +162,9 @@ discard block
		block discarded – undo
140	162	FROM satellite".$filter_query." satellite.launch_site <> '' AND satellite.launch_site IS NOT NULL";
141	163	$query_values = array();
142	164	$query .= " GROUP BY satellite.launch_site ORDER BY launch_site_count DESC";
143		- if ($limit) $query .= " LIMIT 10 OFFSET 0";
	165	+ if ($limit) {
	166	+ $query .= " LIMIT 10 OFFSET 0";
	167	+ }
144	168	$sth = $this->db->prepare($query);
145	169	$sth->execute($query_values);
146	170	$launch_site_array = array();
		@@ -169,7 +193,9 @@ discard block
		block discarded – undo
169	193	FROM satellite".$filter_query." satellite.owner <> '' AND satellite.owner IS NOT NULL";
170	194	$query_values = array();
171	195	$query .= " GROUP BY satellite.owner ORDER BY owner_count DESC";
172		- if ($limit) $query .= " LIMIT 10 OFFSET 0";
	196	+ if ($limit) {
	197	+ $query .= " LIMIT 10 OFFSET 0";
	198	+ }
173	199	$sth = $this->db->prepare($query);
174	200	$sth->execute($query_values);
175	201	$owner_array = array();
		@@ -198,7 +224,9 @@ discard block
		block discarded – undo
198	224	FROM satellite".$filter_query." satellite.country_owner <> '' AND satellite.country_owner IS NOT NULL";
199	225	$query_values = array();
200	226	$query .= " GROUP BY satellite.country_owner ORDER BY country_count DESC";
201		- if ($limit) $query .= " LIMIT 10 OFFSET 0";
	227	+ if ($limit) {
	228	+ $query .= " LIMIT 10 OFFSET 0";
	229	+ }
202	230	$sth = $this->db->prepare($query);
203	231	$sth->execute($query_values);
204	232	$owner_array = array();
		@@ -225,20 +253,26 @@ discard block
		block discarded – undo
225	253	date_default_timezone_set($globalTimezone);
226	254	$datetime = new DateTime();
227	255	$offset = $datetime->format('P');
228		- } else $offset = '+00:00';
	256	+ } else {
	257	+ $offset = '+00:00';
	258	+ }
229	259	//$filter_query = $this->getFilter($filters,true,true);
230	260	$filter_query = ' WHERE';
231	261	if ($globalDBdriver == 'mysql') {
232	262	$query = "SELECT MONTH(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS year_name, count(*) as date_count
233	263	FROM satellite".$filter_query." satellite.launch_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
234		- if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
	264	+ if ($sincedate != '') {
	265	+ $query .= " AND satellite.launch_date > '".$sincedate."'";
	266	+ }
235	267	$query .= " GROUP BY year_name, month_name
236	268	ORDER BY year_name, month_name ASC";
237	269	$query_data = array(':offset' => $offset);
238	270	} else {
239	271	$query = "SELECT EXTRACT(MONTH FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS month_name, EXTRACT(YEAR FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS year_name, count(*) as date_count
240	272	FROM satellite".$filter_query." satellite.launch_date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '1 YEARS'";
241		- if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
	273	+ if ($sincedate != '') {
	274	+ $query .= " AND satellite.launch_date > '".$sincedate."'";
	275	+ }
242	276	$query .= " GROUP BY year_name, month_name
243	277	ORDER BY year_name, month_name ASC";
244	278	$query_data = array(':offset' => $offset);
		@@ -270,20 +304,26 @@ discard block
		block discarded – undo
270	304	date_default_timezone_set($globalTimezone);
271	305	$datetime = new DateTime();
272	306	$offset = $datetime->format('P');
273		- } else $offset = '+00:00';
	307	+ } else {
	308	+ $offset = '+00:00';
	309	+ }
274	310	//$filter_query = $this->getFilter($filters,true,true);
275	311	$filter_query = ' WHERE';
276	312	if ($globalDBdriver == 'mysql') {
277	313	$query = "SELECT YEAR(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS year_name, count(*) as date_count
278	314	FROM satellite".$filter_query." satellite.launch_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 YEAR)";
279		- if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
	315	+ if ($sincedate != '') {
	316	+ $query .= " AND satellite.launch_date > '".$sincedate."'";
	317	+ }
280	318	$query .= " GROUP BY year_name
281	319	ORDER BY year_name ASC";
282	320	$query_data = array(':offset' => $offset);
283	321	} else {
284	322	$query = "SELECT EXTRACT(YEAR FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS year_name, count(*) as date_count
285	323	FROM satellite".$filter_query." satellite.launch_date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '10 YEARS'";
286		- if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
	324	+ if ($sincedate != '') {
	325	+ $query .= " AND satellite.launch_date > '".$sincedate."'";
	326	+ }
287	327	$query .= " GROUP BY year_name
288	328	ORDER BY year_name ASC";
289	329	$query_data = array(':offset' => $offset);

		@@ -9,7 +9,7 @@ discard block
		block discarded – undo
9	9	<button type="button" class="close">×</button>
10	10	<?php
11	11
12		-$sat = filter_input(INPUT_GET,'sat',FILTER_SANITIZE_STRING);
	12	+$sat = filter_input(INPUT_GET, 'sat', FILTER_SANITIZE_STRING);
13	13	$sat = urldecode($sat);
14	14	//$info = $Satellite->get_info(str_replace(' ','-',$sat));
15	15	//print_r($info);
		@@ -48,7 +48,7 @@ discard block
		block discarded – undo
48	48	$aircraft_name = 'INTEGRAL';
49	49	// $ground_speed = 14970;
50	50	$launch_date = '17 October 2002';
51		-} elseif (strpos($sat,'IRIDIUM') !== false) {
	51	+} elseif (strpos($sat, 'IRIDIUM') !== false) {
52	52	$image = 'https://upload.wikimedia.org/wikipedia/commons/b/b6/Iridium_Satellite.jpg';
53	53	$image_copyright = 'Cliff';
54	54	$ident = 'Iridium satellite constellation';
		@@ -56,23 +56,23 @@ discard block
		block discarded – undo
56	56	$aircraft_name = $sat;
57	57	// $ground_speed = 14970;
58	58	// $launch_date = '29 september 2011';
59		-} elseif (strpos($sat,'ORBCOMM') !== false) {
	59	+} elseif (strpos($sat, 'ORBCOMM') !== false) {
60	60	$ident = 'Orbcomm';
61	61	$aircraft_wiki = 'https://en.wikipedia.org/wiki/Orbcomm_(satellite)';
62	62	$aircraft_name = $sat;
63		-} elseif (strpos($sat,'GLOBALSTAR') !== false) {
	63	+} elseif (strpos($sat, 'GLOBALSTAR') !== false) {
64	64	$ident = 'Globalstar';
65	65	$aircraft_wiki = 'https://en.wikipedia.org/wiki/Globalstar';
66	66	$aircraft_name = $sat;
67		- $satname = str_replace(array('[+]','[-]'),'',$sat);
68		-} elseif (strpos($sat,'OSCAR 7') !== false) {
	67	+ $satname = str_replace(array('[+]', '[-]'), '', $sat);
	68	+} elseif (strpos($sat, 'OSCAR 7') !== false) {
69	69	$image = 'https://upload.wikimedia.org/wikipedia/en/a/ad/AMSAT-OSCAR_7.jpg';
70	70	$image_copyright = 'Amsat.org';
71	71	$ident = 'AMSAT-OSCAR 7';
72	72	$aircraft_wiki = 'https://en.wikipedia.org/wiki/AMSAT-OSCAR_7';
73	73	$aircraft_name = $sat;
74	74	$launch_date = '15 November 1974';
75		-} elseif (strpos($sat,'santaclaus') !== false) {
	75	+} elseif (strpos($sat, 'santaclaus') !== false) {
76	76	$image = 'https://upload.wikimedia.org/wikipedia/commons/4/49/Jonathan_G_Meath_portrays_Santa_Claus.jpg';
77	77	$image_copyright = 'Jonathan G Meath';
78	78	$ident = 'Santa Claus';
		@@ -81,8 +81,8 @@ discard block
		block discarded – undo
81	81	// $launch_date = '15 November 1974';
82	82	} else {
83	83	$ident = $sat;
84		- if (strpos($sat,'(')) $satname = $sat;
85		- else $satname = str_replace(array(' '),'-',$sat);
	84	+ if (strpos($sat, '(')) $satname = $sat;
	85	+ else $satname = str_replace(array(' '), '-', $sat);
86	86	}
87	87	if (!isset($satname)) $satname = $sat;
88	88	$info = $Satellite->get_info(strtolower(trim($satname)));
		@@ -145,7 +145,7 @@ discard block
		block discarded – undo
145	145	print '<div><span>'._("Orbit").'</span>'.$info['orbit'].'</div>';
146	146	}
147	147	if ($info['launch_date'] != '') {
148		- print '<div><span>'._("Launch Date").'</span>'.date('Y-m-d',strtotime($info['launch_date'])).'</div>';
	148	+ print '<div><span>'._("Launch Date").'</span>'.date('Y-m-d', strtotime($info['launch_date'])).'</div>';
149	149	}
150	150	if ($info['launch_site'] != '') {
151	151	print '<div><span>'._("Launch Site").'</span>'.$info['launch_site'].'</div>';

		@@ -81,10 +81,15 @@
		block discarded – undo
81	81	// $launch_date = '15 November 1974';
82	82	} else {
83	83	$ident = $sat;
84		- if (strpos($sat,'(')) $satname = $sat;
85		- else $satname = str_replace(array(' '),'-',$sat);
	84	+ if (strpos($sat,'(')) {
	85	+ $satname = $sat;
	86	+ } else {
	87	+ $satname = str_replace(array(' '),'-',$sat);
	88	+ }
	89	+ }
	90	+if (!isset($satname)) {
	91	+ $satname = $sat;
86	92	}
87		-if (!isset($satname)) $satname = $sat;
88	93	$info = $Satellite->get_info(strtolower(trim($satname)));
89	94	$position = $Satellite->position($sat);
90	95	$ground_speed = $position['speed'];

		@@ -52,7 +52,12 @@
		block discarded – undo
52	52	} else {
53	53	for (var i = 0; i < viewer.dataSources.get(dsn).entities.values.length; i++) {
54	54	var entity = viewer.dataSources.get(dsn).entities.values[i];
55		- if (parseInt(entity.lastupdatesat) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
	55	+ if (parseInt(entity.lastupdatesat) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) {
	56	+ print $globalMapRefresh*2000;
	57	+} else {
	58	+ print '60000';
	59	+}
	60	+?>)) {
56	61	viewer.dataSources.get(dsn).entities.remove(entity);
57	62	}
58	63	}

Ysurac / FlightAirMap

Push — master ( 87b863...3be42e )

Status

Category

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

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

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

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

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

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

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

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

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

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

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

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

Braces +9 added lines, -3 removed lines patch added patch discarded remove patch

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

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

Braces +63 added lines, -23 removed lines patch added patch discarded remove patch

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

Braces +8 added lines, -3 removed lines patch added patch discarded remove patch

Braces +6 added lines, -1 removed lines patch added patch discarded remove patch