Inspection of "Should solve problem on FreeBSD" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — master (3f174d)

by Yannick

created 2016-08-01 12:40 UTC

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

@@ -3,8 +3,8 @@  discard block
 block discarded – undo
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['country'])) {
-        header('Location: '.$globalURL.'/country');
-        die();
+		header('Location: '.$globalURL.'/country');
+		die();
 }
 $Spotter = new Spotter();
 $country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
           function drawChart() {
             var data = google.visualization.arrayToDataTable([
             	["'._("Hour").'", "'._("# of Flights").'"], ';
-            	$hour_data = '';
+				$hour_data = '';
 	foreach($hour_array as $hour_item)
 	{
 		$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';

Please login to merge, or discard this patch.

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

@@ -7,8 +7,8 @@  discard block
 block discarded – undo
         die();
 }
 $Spotter = new Spotter();
-$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING)));
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 
 if (isset($_GET['sort'])) {
 	$spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
@@ -18,16 +18,16 @@  discard block
 block discarded – undo
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Time of Day from %s"),$country);
+	$title = sprintf(_("Most Common Time of Day from %s"), $country);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/country" method="post">';
 	print '<select name="country" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$all_countries = $Spotter->getAllCountries();
-	foreach($all_countries as $all_country)
+	foreach ($all_countries as $all_country)
 	{
-		if($country == $all_country['country'])
+		if ($country == $all_country['country'])
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 		} else {
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
 	if ($_GET['country'] != "NA")
 	{
 		print '<div class="info column">';
-		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 		print '</div>';
 	} else {
 		print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
 	include('country-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Time of Day").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common time of day of airports &amp; airlines from <strong>%s</strong>."),$country).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common time of day of airports &amp; airlines from <strong>%s</strong>."), $country).'</p>';
 	$hour_array = $Spotter->countAllHoursByCountry($country);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
 	print '<div id="chartHour" class="chart" width="100%"></div>
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
             var data = google.visualization.arrayToDataTable([
             	["'._("Hour").'", "'._("# of Flights").'"], ';
             	$hour_data = '';
-	foreach($hour_array as $hour_item)
+	foreach ($hour_array as $hour_item)
 	{
 		$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';
 	}

Please login to merge, or discard this patch.

route-statistics-airline.php 2 patches

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

@@ -8,14 +8,14 @@  discard block
 block discarded – undo
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 if (isset($_GET['departure_airport']) && isset($_GET['arrival_airport'])) {
 	$spotter_array = $Spotter->getSpotterDataByRoute($_GET['departure_airport'], $_GET['arrival_airport'], "0,1", $sort);
 } else $spotter_array = array();
   
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Airlines between %s (%s), %s - %s (%s), %s"),$spotter_array[0]['departure_airport_name'],$spotter_array[0]['departure_airport_icao'],$spotter_array[0]['departure_airport_country'],$spotter_array[0]['arrival_airport_name'],$spotter_array[0]['arrival_airport_icao'],$spotter_array[0]['arrival_airport_country']);
+	$title = sprintf(_("Most Common Airlines between %s (%s), %s - %s (%s), %s"), $spotter_array[0]['departure_airport_name'], $spotter_array[0]['departure_airport_icao'], $spotter_array[0]['departure_airport_country'], $spotter_array[0]['arrival_airport_name'], $spotter_array[0]['arrival_airport_icao'], $spotter_array[0]['arrival_airport_country']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'._("Flights between").' '.$spotter_array[0]['departure_airport_name'].' ('.$spotter_array[0]['departure_airport_icao'].'), '.$spotter_array[0]['departure_airport_country'].' - '.$spotter_array[0]['arrival_airport_name'].' ('.$spotter_array[0]['arrival_airport_icao'].'), '.$spotter_array[0]['arrival_airport_country'].'</h1>';
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
 	include('route-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Airlines").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common airlines of flights between <strong>%s (%s), %s</strong> and <strong>%s (%s), %s</strong>."),$spotter_array[0]['departure_airport_name'],$spotter_array[0]['departure_airport_icao'],$spotter_array[0]['departure_airport_country'],$spotter_array[0]['arrival_airport_name'],$spotter_array[0]['arrival_airport_icao'],$spotter_array[0]['arrival_airport_country']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common airlines of flights between <strong>%s (%s), %s</strong> and <strong>%s (%s), %s</strong>."), $spotter_array[0]['departure_airport_name'], $spotter_array[0]['departure_airport_icao'], $spotter_array[0]['departure_airport_country'], $spotter_array[0]['arrival_airport_name'], $spotter_array[0]['arrival_airport_icao'], $spotter_array[0]['arrival_airport_country']).'</p>';
 	$airline_array = $Spotter->countAllAirlinesByRoute($_GET['departure_airport'], $_GET['arrival_airport']);
 	if (!empty($airline_array))
 	{
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airline_array as $airline_item)
+		foreach ($airline_array as $airline_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

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

@@ -11,7 +11,9 @@
 block discarded – undo
 $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
 if (isset($_GET['departure_airport']) && isset($_GET['arrival_airport'])) {
 	$spotter_array = $Spotter->getSpotterDataByRoute($_GET['departure_airport'], $_GET['arrival_airport'], "0,1", $sort);
-} else $spotter_array = array();
+} else {
+	$spotter_array = array();
+}
   
 if (!empty($spotter_array))
 {

Please login to merge, or discard this patch.

country-statistics-departure-airport.php 2 patches

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

@@ -3,8 +3,8 @@
 block discarded – undo
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['country'])) {
-        header('Location: '.$globalURL.'/country');
-        die();
+		header('Location: '.$globalURL.'/country');
+		die();
 }
 $Spotter = new Spotter();
 $country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));

Please login to merge, or discard this patch.

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

@@ -7,8 +7,8 @@  discard block
 block discarded – undo
         die();
 }
 $Spotter = new Spotter();
-$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING)));
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 
 if (isset($_GET['sort'])) {
 	$spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
@@ -18,16 +18,16 @@  discard block
 block discarded – undo
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports from %s"),$country);
+	$title = sprintf(_("Most Common Departure Airports from %s"), $country);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/country" method="post">';
 	print '<select name="country" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$all_countries = $Spotter->getAllCountries();
-	foreach($all_countries as $all_country)
+	foreach ($all_countries as $all_country)
 	{
-		if($country == $all_country['country'])
+		if ($country == $all_country['country'])
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 		} else {
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
 	if ($_GET['country'] != "NA")
 	{
 		print '<div class="info column">';
-		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 		print '</div>';
 	} else {
 		print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
 	include('country-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports of flights of airports &amp; airlines from <strong>%s</strong>."),$country).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports of flights of airports &amp; airlines from <strong>%s</strong>."), $country).'</p>';
 
 	$airport_airport_array = $Spotter->countAllDepartureAirportsByCountry($country);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
         	["'._("Airport").'", "'._("# of times").'"],';
 
 	$airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		$name = $airport_item['airport_departure_city'].', '.$airport_item['airport_departure_country'].' ('.$airport_item['airport_departure_icao'].')';
 		$name = str_replace("'", "", $name);
@@ -104,7 +104,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.

live-geojson.php 3 patches

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

@@ -11,10 +11,10 @@  discard block
 block discarded – undo
 $Common = new Common();
 
 if (isset($_GET['download'])) {
-    if ($_GET['download'] == "true")
-    {
+	if ($_GET['download'] == "true")
+	{
 	header('Content-disposition: attachment; filename="flightairmap.json"');
-    }
+	}
 }
 header('Content-Type: text/javascript');
 
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
 				}
 
 				//waypoint plotting
-                /*
+				/*
 				$output .= '{';
 					$output .= '"type": "Feature",';
 						$output .= '"properties": {';
@@ -343,29 +343,29 @@  discard block
 block discarded – undo
 				if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) || $globalMapHistory || $allhistory) 
 				|| (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))) 
 				|| (isset($history) && $history == '' && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])) {
-                                    if ($from_archive) {
-					    $spotter_history_array = $SpotterArchive->getAllArchiveSpotterDataById($spotter_item['flightaware_id']);
-                                    } else {
-					    $spotter_history_array = $SpotterLive->getAllLiveSpotterDataById($spotter_item['flightaware_id']);
-                                    }
-                            	$d = false;
+									if ($from_archive) {
+						$spotter_history_array = $SpotterArchive->getAllArchiveSpotterDataById($spotter_item['flightaware_id']);
+									} else {
+						$spotter_history_array = $SpotterLive->getAllLiveSpotterDataById($spotter_item['flightaware_id']);
+									}
+								$d = false;
 				foreach ($spotter_history_array as $key => $spotter_history)
 				{
-				    /*
+					/*
 				    if (abs($spotter_history['longitude']-$spotter_item['longitude']) > 200 || $d==true) {
 					if ($d == false) $d = true;
 				    } else {
 				    */
 					$alt = round($spotter_history['altitude']/10)*10;
 					if (!isset($prev_alt) || $prev_alt != $alt) {
-					    if (isset($prev_alt)) {
+						if (isset($prev_alt)) {
 						//$output_history .= '['.$spotter_history['longitude'].', '.$spotter_history['latitude'].','.$spotter_history['altitude'].']';
 						$output_history .= '['.$spotter_history['longitude'].', '.$spotter_history['latitude'].']';
 						$output_history .= ']}},';
 						$output .= $output_history;
-					    }
-					    if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
-					    else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
+						}
+						if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
+						else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
 					}
 					$output_history .= '[';
 					$output_history .=  $spotter_history['longitude'].', ';
@@ -373,41 +373,41 @@  discard block
 block discarded – undo
 					//$output_history .=  $spotter_history['altitude'];
 					$output_history .= '],';
 					$prev_alt = $alt;
-				    //}
+					//}
 				}
 				if (isset($output_history)) {
-				    $output_history  = substr($output_history, 0, -1);
-				    $output_history .= ']}},';
-				    $output .= $output_history;
-				    unset($prev_alt);
-				    unset($output_history);
+					$output_history  = substr($output_history, 0, -1);
+					$output_history .= ']}},';
+					$output .= $output_history;
+					unset($prev_alt);
+					unset($output_history);
 				}
 				}
 				
 				if (isset($history) && $history == $spotter_item['ident'] && isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA' && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
-				    $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
-				    if (isset($spotter_item['departure_airport_latitude'])) {
+					$output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
+					if (isset($spotter_item['departure_airport_latitude'])) {
 					$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
-				    } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
+					} elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
 					$dairport = $Spotter->getAllAirportInfo($spotter_item['departure_airport']);
 					//print_r($dairport);
 					//echo $spotter_item['departure_airport'];
 					if (isset($dairport[0]['latitude'])) {
-					    $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
+						$output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
 					}
-				    }
-				    if (isset($spotter_item['arrival_airport_latitude'])) {
+					}
+					if (isset($spotter_item['arrival_airport_latitude'])) {
 					$output_air .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].']';
-				    } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
+					} elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
 					//print_r($aairport);
 					$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
 					if (isset($aairport[0]['latitude'])) {
-					    $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
+						$output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
+					}
 					}
-				    }
-				    $output_air .= ']}},';
-				    $output .= $output_air;
-				    unset($output_air);
+					$output_air .= ']}},';
+					$output .= $output_air;
+					unset($output_air);
 				}
 			}
 			$output  = substr($output, 0, -1);

Please login to merge, or discard this patch.

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

@@ -25,13 +25,13 @@  discard block
 block discarded – undo
 $min = false;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',',$_COOKIE['Airlines']);
-if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
+if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',', $_COOKIE['Airlines']);
+if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',', $_COOKIE['Sources']);
 if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') $filter['airlinestype'] = $_COOKIE['airlinestype'];
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
 }
 
 if (isset($_GET['ident'])) {
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	$spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident);
 	if (empty($spotter_array)) {
 		$from_archive = true;
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
 	}
 	$allhistory = true;
 } elseif (isset($_GET['flightaware_id'])) {
-	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+	$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
 	if (empty($spotter_array)) {
 		$from_archive = true;
@@ -56,37 +56,37 @@  discard block
 block discarded – undo
 	$allhistory = true;
 } elseif (isset($_GET['coord']) && (!isset($globalMapPopup) || $globalMapPopup || (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true'))) {
 //if (isset($_GET['coord'])) {
-	$coord = explode(',',$_GET['coord']);
-	$spotter_array = $SpotterLive->getLiveSpotterDatabyCoord($coord,$filter);
+	$coord = explode(',', $_GET['coord']);
+	$spotter_array = $SpotterLive->getLiveSpotterDatabyCoord($coord, $filter);
 
 #} elseif (isset($globalMapPopup) && !$globalMapPopup) {
 } elseif (isset($_GET['archive']) && isset($_GET['begindate']) && isset($_GET['enddate']) && isset($_GET['speed'])) {
 	$from_archive = true;
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
 //	$enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
-	$begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
-	$enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
-	$archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
-	$begindate = date('Y-m-d H:i:s',$begindate);
-	$enddate = date('Y-m-d H:i:s',$enddate);
-	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
+	$begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
+	$enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
+	$archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
+	$begindate = date('Y-m-d H:i:s', $begindate);
+	$enddate = date('Y-m-d H:i:s', $enddate);
+	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
 } elseif ($min) {
 	$spotter_array = $SpotterLive->getMinLiveSpotterData($filter);
 #	$min = true;
 } else {
-	$spotter_array = $SpotterLive->getLiveSpotterData('','',$filter);
+	$spotter_array = $SpotterLive->getLiveSpotterData('', '', $filter);
 }
 
 if (!empty($spotter_array)) {
 	if (isset($_GET['archive'])) {
-		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
+		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
 	} else {
 		$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
 	}
 	if ($flightcnt == '') $flightcnt = 0;
 } else $flightcnt = 0;
 
-$sqltime = round(microtime(true)-$begintime,2);
+$sqltime = round(microtime(true) - $begintime, 2);
 
 $j = 0;
 
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
 		if (!empty($spotter_array) && is_array($spotter_array))
 		{
 			$output .= '"features": [';
-			foreach($spotter_array as $spotter_item)
+			foreach ($spotter_array as $spotter_item)
 			{
 				$j++;
 				date_default_timezone_set('UTC');
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
 						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
-							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
+							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ', '_', $spotter_item['aircraft_name'])).'",';
 						} elseif (isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "NA ('.$spotter_item['aircraft_type'].')",';
 						} elseif (!$min) {
@@ -250,15 +250,15 @@  discard block
 block discarded – undo
 						if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
 						else $output .= '"heading": "'.$spotter_item['heading'].'",';
 						
-						if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
-						else $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
+						if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading'], $archivespeed);
+						else $nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading']);
 						//$output .= '"nextlatitude": "'.$nextcoord['latitude'].'",';
 						//$output .= '"nextlongitude": "'.$nextcoord['longitude'].'",';
 						$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 
 						if (!$min) $output .= '"image": "'.$image.'",';
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
-							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
+							$output .= '"image_copyright": "'.str_replace('"', "'", trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $spotter_item['image_copyright']))).'",';
 						}
 						if (isset($spotter_item['image_source_website'])) {
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
 							$output .= '"waypoints": "'.$spotter_item['waypoints'].'",';
 						}
 						if (isset($spotter_item['acars'])) {
-							$output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",';
+							$output .= '"acars": "'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br />', $spotter_item['acars']['message'])).'",';
 						}
 							// FIXME : type when not aircraft ?
 						if ($compress) $output .= '"t": "aircraft"';
@@ -289,8 +289,8 @@  discard block
 block discarded – undo
 						$output .= '"geometry": {';
 							$output .= '"type": "Point",';
 								$output .= '"coordinates": [';
-										$output .=  $spotter_item['longitude'].', ';
-										$output .=  $spotter_item['latitude'];
+										$output .= $spotter_item['longitude'].', ';
+										$output .= $spotter_item['latitude'];
 								$output .= ']';
 							$output .= '}';
 				$output .= '},';
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
 */
 				//if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) || $globalMapHistory || $allhistory) || (isset($_GET['history']) && $_GET['history'] != '' && $_GET['history'] != 'NA' && ($_GET['history'] == $spotter_item['ident'] || $_GET['history'] == $spotter_item['flightaware_id'])))) {
 				//if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) || $globalMapHistory || $allhistory) || (isset($_GET['history']) && $_GET['history'] != '' && $_GET['history'] != 'NA' && ($_GET['history'] == $spotter_item['ident'] || $_GET['history'] == $spotter_item['flightaware_id']))) || (isset($_GET['history']) && $_GET['history'] == '' && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])) {
-				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
+				$history = filter_input(INPUT_GET, 'history', FILTER_SANITIZE_STRING);
 				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
 				if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) || $globalMapHistory || $allhistory) 
 				|| (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))) 
@@ -368,8 +368,8 @@  discard block
 block discarded – undo
 					    else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
 					}
 					$output_history .= '[';
-					$output_history .=  $spotter_history['longitude'].', ';
-					$output_history .=  $spotter_history['latitude'];
+					$output_history .= $spotter_history['longitude'].', ';
+					$output_history .= $spotter_history['latitude'];
 					//$output_history .=  $spotter_history['altitude'];
 					$output_history .= '],';
 					$prev_alt = $alt;
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
 			$output  = substr($output, 0, -1);
 			$output .= ']';
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
-			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
+			$output .= '"totaltime": "'.round(microtime(true) - $begintime, 2).'",';
 			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
 			$output .= '"fc": "'.$j.'"';
 		} else {

Please login to merge, or discard this patch.

Braces +128 added lines, -49 removed lines patch added patch discarded remove patch

@@ -18,21 +18,40 @@  discard block
 block discarded – undo
 }
 header('Content-Type: text/javascript');
 
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 
 $from_archive = false;
 $min = false;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',',$_COOKIE['Airlines']);
-if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
-if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') $filter['airlinestype'] = $_COOKIE['airlinestype'];
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('sbs'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
+}
+if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') {
+	$filter['airlines'] = explode(',',$_COOKIE['Airlines']);
+}
+if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') {
+	$filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
+}
+if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') {
+	$filter['airlinestype'] = $_COOKIE['airlinestype'];
+}
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
@@ -83,8 +102,12 @@  discard block
 block discarded – undo
 	} else {
 		$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
 	}
-	if ($flightcnt == '') $flightcnt = 0;
-} else $flightcnt = 0;
+	if ($flightcnt == '') {
+		$flightcnt = 0;
+	}
+	} else {
+	$flightcnt = 0;
+}
 
 $sqltime = round(microtime(true)-$begintime,2);
 
@@ -92,8 +115,11 @@  discard block
 block discarded – undo
 
 $output = '{';
 	$output .= '"type": "FeatureCollection",';
-		if ($min) $output .= '"minimal": "true",';
-		else $output .= '"minimal": "false",';
+		if ($min) {
+			$output .= '"minimal": "true",';
+		} else {
+			$output .= '"minimal": "false",';
+		}
 		$output .= '"fc": "'.$flightcnt.'",';
 		$output .= '"sqt": "'.$sqltime.'",';
 
@@ -162,11 +188,16 @@  discard block
 block discarded – undo
 						//$output .= '"fc": "'.$flightcnt.'",';
 						//$output .= '"sqt": "'.$sqltime.'",';
 						$output .= '"properties": {';
-							if ($compress) $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
-							else $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
+							if ($compress) {
+								$output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
+							} else {
+								$output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
+							}
 							$output .= '"fc": "'.$flightcnt.'",';
 							$output .= '"sqt": "'.$sqltime.'",';
-							if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
+							if (isset($begindate)) {
+								$output .= '"archive_date": "'.$begindate.'",';
+							}
 
 /*
 							if ($min) $output .= '"minimal": "true",';
@@ -174,13 +205,21 @@  discard block
 block discarded – undo
 */
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
-							if ($compress) $output .= '"c": "'.$spotter_item['ident'].'",';
-							else $output .= '"callsign": "'.$spotter_item['ident'].'",';
+							if ($compress) {
+								$output .= '"c": "'.$spotter_item['ident'].'",';
+							} else {
+								$output .= '"callsign": "'.$spotter_item['ident'].'",';
+							}
 						} else {
-							if ($compress) $output .= '"c": "NA",';
-							else $output .= '"callsign": "NA",';
+							if ($compress) {
+								$output .= '"c": "NA",';
+							} else {
+								$output .= '"callsign": "NA",';
+							}
+						}
+						if (isset($spotter_item['registration'])) {
+							$output .= '"registration": "'.$spotter_item['registration'].'",';
 						}
-						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
 							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
@@ -193,19 +232,29 @@  discard block
 block discarded – undo
 							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
 						}
 						if (!isset($spotter_item['aircraft_shadow'])) {
-							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = '';
-							else {
+							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') {
+								$spotter_item['aircraft_shadow'] = '';
+							} else {
 								$aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']);
-								if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
-								else $spotter_item['aircraft_shadow'] = '';
+								if (count($aircraft_info) > 0) {
+									$spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
+								} else {
+									$spotter_item['aircraft_shadow'] = '';
+								}
 							}
 						}
 						if ($spotter_item['aircraft_shadow'] == '') {
-							if ($compress) $output .= '"as": "default.png",';
-							else $output .= '"aircraft_shadow": "default.png",';
+							if ($compress) {
+								$output .= '"as": "default.png",';
+							} else {
+								$output .= '"aircraft_shadow": "default.png",';
+							}
 						} else {
-							if ($compress) $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
-							else $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
+							if ($compress) {
+								$output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
+							} else {
+								$output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
+							}
 						}
 						if (isset($spotter_item['airline_name'])) {
 							$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
@@ -213,8 +262,11 @@  discard block
 block discarded – undo
 							$output .= '"airline_name": "NA",';
 						}
 						if (isset($spotter_item['departure_airport'])) {
-							if ($compress) $output .= '"dac": "'.$spotter_item['departure_airport'].'",';
-							else $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
+							if ($compress) {
+								$output .= '"dac": "'.$spotter_item['departure_airport'].'",';
+							} else {
+								$output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
+							}
 						}
 						if (isset($spotter_item['departure_airport_city'])) {
 							$output .= '"departure_airport": "'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_country'].'",';
@@ -226,8 +278,11 @@  discard block
 block discarded – undo
 							$output .= '"arrival_airport_time": "'.$spotter_item['arrival_airport_time'].'",';
 						}
 						if (isset($spotter_item['arrival_airport'])) {
-							if ($compress) $output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
-							else $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
+							if ($compress) {
+								$output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
+							} else {
+								$output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
+							}
 						}
 						if (isset($spotter_item['arrival_airport_city'])) {
 							$output .= '"arrival_airport": "'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].'",';
@@ -245,18 +300,29 @@  discard block
 block discarded – undo
 							$output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
 						}
 						
-						if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",';
-						else $output .= '"altitude": "'.$spotter_item['altitude'].'",';
-						if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
-						else $output .= '"heading": "'.$spotter_item['heading'].'",';
+						if ($compress) {
+							$output .= '"a": "'.$spotter_item['altitude'].'",';
+						} else {
+							$output .= '"altitude": "'.$spotter_item['altitude'].'",';
+						}
+						if ($compress) {
+							$output .= '"h": "'.$spotter_item['heading'].'",';
+						} else {
+							$output .= '"heading": "'.$spotter_item['heading'].'",';
+						}
 						
-						if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
-						else $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
+						if (isset($archivespeed)) {
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
+						} else {
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
+						}
 						//$output .= '"nextlatitude": "'.$nextcoord['latitude'].'",';
 						//$output .= '"nextlongitude": "'.$nextcoord['longitude'].'",';
 						$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 
-						if (!$min) $output .= '"image": "'.$image.'",';
+						if (!$min) {
+							$output .= '"image": "'.$image.'",';
+						}
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
 							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
 						}
@@ -264,8 +330,11 @@  discard block
 block discarded – undo
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
 						}
 						if (isset($spotter_item['squawk'])) {
-							if ($compress) $output .= '"sq": "'.$spotter_item['squawk'].'",';
-							else $output .= '"squawk": "'.$spotter_item['squawk'].'",';
+							if ($compress) {
+								$output .= '"sq": "'.$spotter_item['squawk'].'",';
+							} else {
+								$output .= '"squawk": "'.$spotter_item['squawk'].'",';
+							}
 						}
 						if (isset($spotter_item['squawk_usage'])) {
 							$output .= '"squawk_usage": "'.$spotter_item['squawk_usage'].'",';
@@ -283,8 +352,11 @@  discard block
 block discarded – undo
 							$output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",';
 						}
 							// FIXME : type when not aircraft ?
-						if ($compress) $output .= '"t": "aircraft"';
-						else $output .= '"type": "aircraft"';
+						if ($compress) {
+							$output .= '"t": "aircraft"';
+						} else {
+							$output .= '"type": "aircraft"';
+						}
 						$output .= '},';
 						$output .= '"geometry": {';
 							$output .= '"type": "Point",';
@@ -339,7 +411,9 @@  discard block
 block discarded – undo
 				//if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) || $globalMapHistory || $allhistory) || (isset($_GET['history']) && $_GET['history'] != '' && $_GET['history'] != 'NA' && ($_GET['history'] == $spotter_item['ident'] || $_GET['history'] == $spotter_item['flightaware_id'])))) {
 				//if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) || $globalMapHistory || $allhistory) || (isset($_GET['history']) && $_GET['history'] != '' && $_GET['history'] != 'NA' && ($_GET['history'] == $spotter_item['ident'] || $_GET['history'] == $spotter_item['flightaware_id']))) || (isset($_GET['history']) && $_GET['history'] == '' && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])) {
 				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
-				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
+				if ($history == '' && isset($_COOKIE['history'])) {
+					$history = $_COOKIE['history'];
+				}
 				if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) || $globalMapHistory || $allhistory) 
 				|| (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))) 
 				|| (isset($history) && $history == '' && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])) {
@@ -364,8 +438,11 @@  discard block
 block discarded – undo
 						$output_history .= ']}},';
 						$output .= $output_history;
 					    }
-					    if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
-					    else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
+					    if ($compress) {
+					    	$output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
+					    } else {
+					    	$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
+					    }
 					}
 					$output_history .= '[';
 					$output_history .=  $spotter_history['longitude'].', ';
@@ -414,7 +491,9 @@  discard block
 block discarded – undo
 			$output .= ']';
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
 			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
-			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
+			if (isset($begindate)) {
+				$output .= '"archive_date": "'.$begindate.'",';
+			}
 			$output .= '"fc": "'.$j.'"';
 		} else {
 			$output .= '"features": ';

Please login to merge, or discard this patch.

aircraft-statistics-departure-airport-country.php 2 patches

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

@@ -3,8 +3,8 @@
 block discarded – undo
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['aircraft_type'])) {
-        header('Location: '.$globalURL.'/aircraft');
-        die();
+		header('Location: '.$globalURL.'/aircraft');
+		die();
 }
 $aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();

Please login to merge, or discard this patch.

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

@@ -6,23 +6,23 @@  discard block
 block discarded – undo
         header('Location: '.$globalURL.'/aircraft');
         die();
 }
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports by Country for %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+	$title = sprintf(_("Most Common Departure Airports by Country for %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="post">';
 	print '<select name="aircraft_type" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$aircraft_types = $Spotter->getAllAircraftTypes();
-	foreach($aircraft_types as $aircraft_type)
+	foreach ($aircraft_types as $aircraft_type)
 	{
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
 		{
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 		} else {
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
 	include('aircraft-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByAircraft($aircraft_type);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
 	print '<div id="chartCountry" class="chart" width="100%"></div>
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
             var data = google.visualization.arrayToDataTable([
             	["'._("Country").'", "'._("# of times").'"], ';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['departure_airport_country'].'",'.$airport_item['airport_departure_country_count'].'],';
 	}
@@ -93,7 +93,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.

airline-statistics-route.php 3 patches

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

@@ -3,8 +3,8 @@
 block discarded – undo
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['airline'])) {
-        header('Location: '.$globalURL.'/airline');
-        die();
+		header('Location: '.$globalURL.'/airline');
+		die();
 }
 $airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();

Please login to merge, or discard this patch.

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

@@ -6,22 +6,22 @@  discard block
 block discarded – undo
         header('Location: '.$globalURL.'/airline');
         die();
 }
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 
 if (!empty($spotter_array))
 {
-	$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">';
 	print '<form action="'.$globalURL.'/airline" method="post">';
 	print '<select name="airline" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$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 {
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
 	include('airline-sub-menu.php');
 	 print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
-	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>';
 	$route_array = $Spotter->countAllRoutesByAirline($airline);
 	if (!empty($route_array))
 	{
@@ -75,7 +75,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.

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

@@ -40,8 +40,7 @@
 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.

latest.php 2 patches

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

@@ -7,12 +7,12 @@  discard block
 block discarded – undo
 require_once('header.php');
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	$limit_start = 0;
 	$limit_end = 25;
 	$absolute_difference = 25;
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = $limit_explode[0];
 	$limit_end = $limit_explode[1];
@@ -34,10 +34,10 @@  discard block
 block discarded – undo
 print '<div class="table column">';
 print '<p>'._("The table below shows the detailed information of all recent flights.").'</p>';
 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 $sql_begin = microtime(true);
 $spotter_array = $Spotter->getLatestSpotterData($limit_start.",".$absolute_difference, $sort);
-$sql_time = microtime(true)-$sql_begin;
+$sql_time = microtime(true) - $sql_begin;
 
 $page_begin = microtime(true);
 if (!empty($spotter_array))
@@ -55,6 +55,6 @@  discard block
 block discarded – undo
 	print '</div>';
 	print '</div>';
 }
-$page_time = microtime(true)-$page_begin;
+$page_time = microtime(true) - $page_begin;
 require_once('footer.php');
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

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

@@ -12,7 +12,7 @@
 block discarded – undo
 	$limit_start = 0;
 	$limit_end = 25;
 	$absolute_difference = 25;
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = $limit_explode[0];
 	$limit_end = $limit_explode[1];

Please login to merge, or discard this patch.

tv.php 2 patches

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

@@ -29,7 +29,7 @@  discard block
 block discarded – undo
 <?php
 if (isset($_GET['q']))
 {
-	$spotter_array = $Spotter->searchSpotterData($_GET['q'],"","","","","","","","","","","","","","","","","","0,10","","");
+	$spotter_array = $Spotter->searchSpotterData($_GET['q'], "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "0,10", "", "");
 } else {
 	$spotter_array = $Spotter->getLatestSpotterData("0,10", "");
 }
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
 print '<div class="table-responsive">';
 print '<table id="table-tv">';
 print '<tbody>';
-foreach($spotter_array as $spotter_item)
+foreach ($spotter_array as $spotter_item)
 {
 	if (isset($globalTimezone)) {
 		date_default_timezone_set($globalTimezone);

Please login to merge, or discard this patch.

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

@@ -41,7 +41,9 @@  discard block
 block discarded – undo
 {
 	if (isset($globalTimezone)) {
 		date_default_timezone_set($globalTimezone);
-	} else date_default_timezone_set('UTC');
+	} else {
+		date_default_timezone_set('UTC');
+	}
 	print '<tr>';
 	if (isset($_GET['image']) && $_GET['image'] == "true")
 	{
@@ -98,10 +100,14 @@  discard block
 block discarded – undo
 	print '</div>';
 	print '<div class="other2">';
 	print '<span><i class="fa fa-arrow-up"></i> '.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'];
-	if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != '') print ' ('.$spotter_item['departure_airport_time'].')';
+	if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != '') {
+		print ' ('.$spotter_item['departure_airport_time'].')';
+	}
 	print '</span>';
 	print '<span><i class="fa fa-arrow-down"></i> '.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'];
-	if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != '') print ' ('.$spotter_item['arrival_airport_time'].')';
+	if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != '') {
+		print ' ('.$spotter_item['arrival_airport_time'].')';
+	}
 	print '</span>';
 	print '</div>';
 	print '<div class="other3">';

Please login to merge, or discard this patch.

statistics-callsign.php 1 patch

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

@@ -22,7 +22,7 @@  discard block
 block discarded – undo
             var data = google.visualization.arrayToDataTable([
             	["'._("Aircraft").'", "'._("# of times").'"], ';
 $callsign_data = '';
-foreach($callsign_array as $callsign_item)
+foreach ($callsign_array as $callsign_item)
 {
 	$callsign_data .= '[ "'.$callsign_item['callsign_icao'].' ('.$callsign_item['airline_name'].')",'.$callsign_item['callsign_icao_count'].'],';
 }
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($callsign_array as $callsign_item)
+	foreach ($callsign_array as $callsign_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

		@@ -3,8 +3,8 @@ discard block
		block discarded – undo
3	3	require_once('require/class.Spotter.php');
4	4	require_once('require/class.Language.php');
5	5	if (!isset($_GET['country'])) {
6		- header('Location: '.$globalURL.'/country');
7		- die();
	6	+ header('Location: '.$globalURL.'/country');
	7	+ die();
8	8	}
9	9	$Spotter = new Spotter();
10	10	$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
		@@ -61,7 +61,7 @@ discard block
		block discarded – undo
61	61	function drawChart() {
62	62	var data = google.visualization.arrayToDataTable([
63	63	["'._("Hour").'", "'._("# of Flights").'"], ';
64		- $hour_data = '';
	64	+ $hour_data = '';
65	65	foreach($hour_array as $hour_item)
66	66	{
67	67	$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';

		@@ -7,8 +7,8 @@ discard block
		block discarded – undo
7	7	die();
8	8	}
9	9	$Spotter = new Spotter();
10		-$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
11		-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
	10	+$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING)));
	11	+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
12	12
13	13	if (isset($_GET['sort'])) {
14	14	$spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
		@@ -18,16 +18,16 @@ discard block
		block discarded – undo
18	18
19	19	if (!empty($spotter_array))
20	20	{
21		- $title = sprintf(_("Most Common Time of Day from %s"),$country);
	21	+ $title = sprintf(_("Most Common Time of Day from %s"), $country);
22	22	require_once('header.php');
23	23	print '<div class="select-item">';
24	24	print '<form action="'.$globalURL.'/country" method="post">';
25	25	print '<select name="country" class="selectpicker" data-live-search="true">';
26	26	print '<option></option>';
27	27	$all_countries = $Spotter->getAllCountries();
28		- foreach($all_countries as $all_country)
	28	+ foreach ($all_countries as $all_country)
29	29	{
30		- if($country == $all_country['country'])
	30	+ if ($country == $all_country['country'])
31	31	{
32	32	print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
33	33	} else {
		@@ -42,7 +42,7 @@ discard block
		block discarded – undo
42	42	if ($_GET['country'] != "NA")
43	43	{
44	44	print '<div class="info column">';
45		- print '<h1>'.sprintf(_("Airports & Airlines from %s"),$country).'</h1>';
	45	+ print '<h1>'.sprintf(_("Airports & Airlines from %s"), $country).'</h1>';
46	46	print '</div>';
47	47	} else {
48	48	print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
		@@ -51,7 +51,7 @@ discard block
		block discarded – undo
51	51	include('country-sub-menu.php');
52	52	print '<div class="column">';
53	53	print '<h2>'._("Most Common Time of Day").'</h2>';
54		- print '<p>'.sprintf(_("The statistic below shows the most common time of day of airports & airlines from <strong>%s</strong>."),$country).'</p>';
	54	+ print '<p>'.sprintf(_("The statistic below shows the most common time of day of airports & airlines from <strong>%s</strong>."), $country).'</p>';
55	55	$hour_array = $Spotter->countAllHoursByCountry($country);
56	56	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
57	57	print '<div id="chartHour" class="chart" width="100%"></div>
		@@ -62,7 +62,7 @@ discard block
		block discarded – undo
62	62	var data = google.visualization.arrayToDataTable([
63	63	["'._("Hour").'", "'._("# of Flights").'"], ';
64	64	$hour_data = '';
65		- foreach($hour_array as $hour_item)
	65	+ foreach ($hour_array as $hour_item)
66	66	{
67	67	$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';
68	68	}

		@@ -8,14 +8,14 @@ discard block
		block discarded – undo
8	8	require_once('require/class.Spotter.php');
9	9	require_once('require/class.Language.php');
10	10	$Spotter = new Spotter();
11		-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
	11	+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
12	12	if (isset($_GET['departure_airport']) && isset($_GET['arrival_airport'])) {
13	13	$spotter_array = $Spotter->getSpotterDataByRoute($_GET['departure_airport'], $_GET['arrival_airport'], "0,1", $sort);
14	14	} else $spotter_array = array();
15	15
16	16	if (!empty($spotter_array))
17	17	{
18		- $title = sprintf(_("Most Common Airlines between %s (%s), %s - %s (%s), %s"),$spotter_array[0]['departure_airport_name'],$spotter_array[0]['departure_airport_icao'],$spotter_array[0]['departure_airport_country'],$spotter_array[0]['arrival_airport_name'],$spotter_array[0]['arrival_airport_icao'],$spotter_array[0]['arrival_airport_country']);
	18	+ $title = sprintf(_("Most Common Airlines between %s (%s), %s - %s (%s), %s"), $spotter_array[0]['departure_airport_name'], $spotter_array[0]['departure_airport_icao'], $spotter_array[0]['departure_airport_country'], $spotter_array[0]['arrival_airport_name'], $spotter_array[0]['arrival_airport_icao'], $spotter_array[0]['arrival_airport_country']);
19	19	require_once('header.php');
20	20	print '<div class="info column">';
21	21	print '<h1>'._("Flights between").' '.$spotter_array[0]['departure_airport_name'].' ('.$spotter_array[0]['departure_airport_icao'].'), '.$spotter_array[0]['departure_airport_country'].' - '.$spotter_array[0]['arrival_airport_name'].' ('.$spotter_array[0]['arrival_airport_icao'].'), '.$spotter_array[0]['arrival_airport_country'].'</h1>';
		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26	include('route-sub-menu.php');
27	27	print '<div class="column">';
28	28	print '<h2>'._("Most Common Airlines").'</h2>';
29		- print '<p>'.sprintf(_("The statistic below shows the most common airlines of flights between <strong>%s (%s), %s</strong> and <strong>%s (%s), %s</strong>."),$spotter_array[0]['departure_airport_name'],$spotter_array[0]['departure_airport_icao'],$spotter_array[0]['departure_airport_country'],$spotter_array[0]['arrival_airport_name'],$spotter_array[0]['arrival_airport_icao'],$spotter_array[0]['arrival_airport_country']).'</p>';
	29	+ print '<p>'.sprintf(_("The statistic below shows the most common airlines of flights between <strong>%s (%s), %s</strong> and <strong>%s (%s), %s</strong>."), $spotter_array[0]['departure_airport_name'], $spotter_array[0]['departure_airport_icao'], $spotter_array[0]['departure_airport_country'], $spotter_array[0]['arrival_airport_name'], $spotter_array[0]['arrival_airport_icao'], $spotter_array[0]['arrival_airport_country']).'</p>';
30	30	$airline_array = $Spotter->countAllAirlinesByRoute($_GET['departure_airport'], $_GET['arrival_airport']);
31	31	if (!empty($airline_array))
32	32	{
		@@ -42,7 +42,7 @@ discard block
		block discarded – undo
42	42	print '</thead>';
43	43	print '<tbody>';
44	44	$i = 1;
45		- foreach($airline_array as $airline_item)
	45	+ foreach ($airline_array as $airline_item)
46	46	{
47	47	print '<tr>';
48	48	print '<td><strong>'.$i.'</strong></td>';

		@@ -11,7 +11,9 @@
		block discarded – undo
11	11	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
12	12	if (isset($_GET['departure_airport']) && isset($_GET['arrival_airport'])) {
13	13	$spotter_array = $Spotter->getSpotterDataByRoute($_GET['departure_airport'], $_GET['arrival_airport'], "0,1", $sort);
14		-} else $spotter_array = array();
	14	+} else {
	15	+ $spotter_array = array();
	16	+}
15	17
16	18	if (!empty($spotter_array))
17	19	{

		@@ -3,8 +3,8 @@
		block discarded – undo
3	3	require_once('require/class.Spotter.php');
4	4	require_once('require/class.Language.php');
5	5	if (!isset($_GET['country'])) {
6		- header('Location: '.$globalURL.'/country');
7		- die();
	6	+ header('Location: '.$globalURL.'/country');
	7	+ die();
8	8	}
9	9	$Spotter = new Spotter();
10	10	$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));

		@@ -11,10 +11,10 @@ discard block
		block discarded – undo
11	11	$Common = new Common();
12	12
13	13	if (isset($_GET['download'])) {
14		- if ($_GET['download'] == "true")
15		- {
	14	+ if ($_GET['download'] == "true")
	15	+ {
16	16	header('Content-disposition: attachment; filename="flightairmap.json"');
17		- }
	17	+ }
18	18	}
19	19	header('Content-Type: text/javascript');
20	20
		@@ -113,7 +113,7 @@ discard block
		block discarded – undo
113	113	}
114	114
115	115	//waypoint plotting
116		- /*
	116	+ /*
117	117	$output .= '{';
118	118	$output .= '"type": "Feature",';
119	119	$output .= '"properties": {';
		@@ -343,29 +343,29 @@ discard block
		block discarded – undo
343	343	if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') \|\| (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) \|\| $globalMapHistory \|\| $allhistory)
344	344	\|\| (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] \|\| $history == $spotter_item['flightaware_id'])))
345	345	\|\| (isset($history) && $history == '' && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])) {
346		- if ($from_archive) {
347		- $spotter_history_array = $SpotterArchive->getAllArchiveSpotterDataById($spotter_item['flightaware_id']);
348		- } else {
349		- $spotter_history_array = $SpotterLive->getAllLiveSpotterDataById($spotter_item['flightaware_id']);
350		- }
351		- $d = false;
	346	+ if ($from_archive) {
	347	+ $spotter_history_array = $SpotterArchive->getAllArchiveSpotterDataById($spotter_item['flightaware_id']);
	348	+ } else {
	349	+ $spotter_history_array = $SpotterLive->getAllLiveSpotterDataById($spotter_item['flightaware_id']);
	350	+ }
	351	+ $d = false;
352	352	foreach ($spotter_history_array as $key => $spotter_history)
353	353	{
354		- /*
	354	+ /*
355	355	if (abs($spotter_history['longitude']-$spotter_item['longitude']) > 200 \|\| $d==true) {
356	356	if ($d == false) $d = true;
357	357	} else {
358	358	*/
359	359	$alt = round($spotter_history['altitude']/10)*10;
360	360	if (!isset($prev_alt) \|\| $prev_alt != $alt) {
361		- if (isset($prev_alt)) {
	361	+ if (isset($prev_alt)) {
362	362	//$output_history .= '['.$spotter_history['longitude'].', '.$spotter_history['latitude'].','.$spotter_history['altitude'].']';
363	363	$output_history .= '['.$spotter_history['longitude'].', '.$spotter_history['latitude'].']';
364	364	$output_history .= ']}},';
365	365	$output .= $output_history;
366		- }
367		- if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
368		- else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
	366	+ }
	367	+ if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
	368	+ else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
369	369	}
370	370	$output_history .= '[';
371	371	$output_history .= $spotter_history['longitude'].', ';
		@@ -373,41 +373,41 @@ discard block
		block discarded – undo
373	373	//$output_history .= $spotter_history['altitude'];
374	374	$output_history .= '],';
375	375	$prev_alt = $alt;
376		- //}
	376	+ //}
377	377	}
378	378	if (isset($output_history)) {
379		- $output_history = substr($output_history, 0, -1);
380		- $output_history .= ']}},';
381		- $output .= $output_history;
382		- unset($prev_alt);
383		- unset($output_history);
	379	+ $output_history = substr($output_history, 0, -1);
	380	+ $output_history .= ']}},';
	381	+ $output .= $output_history;
	382	+ unset($prev_alt);
	383	+ unset($output_history);
384	384	}
385	385	}
386	386
387	387	if (isset($history) && $history == $spotter_item['ident'] && isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA' && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") \|\| (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) \|\| (isset($globalMapRoute) && $globalMapRoute))))) {
388		- $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
389		- if (isset($spotter_item['departure_airport_latitude'])) {
	388	+ $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
	389	+ if (isset($spotter_item['departure_airport_latitude'])) {
390	390	$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
391		- } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
	391	+ } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
392	392	$dairport = $Spotter->getAllAirportInfo($spotter_item['departure_airport']);
393	393	//print_r($dairport);
394	394	//echo $spotter_item['departure_airport'];
395	395	if (isset($dairport[0]['latitude'])) {
396		- $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
	396	+ $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
397	397	}
398		- }
399		- if (isset($spotter_item['arrival_airport_latitude'])) {
	398	+ }
	399	+ if (isset($spotter_item['arrival_airport_latitude'])) {
400	400	$output_air .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].']';
401		- } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
	401	+ } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
402	402	//print_r($aairport);
403	403	$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
404	404	if (isset($aairport[0]['latitude'])) {
405		- $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
	405	+ $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
	406	+ }
406	407	}
407		- }
408		- $output_air .= ']}},';
409		- $output .= $output_air;
410		- unset($output_air);
	408	+ $output_air .= ']}},';
	409	+ $output .= $output_air;
	410	+ unset($output_air);
411	411	}
412	412	}
413	413	$output = substr($output, 0, -1);

		@@ -25,13 +25,13 @@ discard block
		block discarded – undo
25	25	$min = false;
26	26	$allhistory = false;
27	27	$filter['source'] = array();
28		-if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
29		-if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
30		-if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
31		-if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
32		-if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
33		-if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',',$_COOKIE['Airlines']);
34		-if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
	28	+if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
	29	+if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
	30	+if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
	31	+if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs'));
	32	+if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
	33	+if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',', $_COOKIE['Airlines']);
	34	+if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',', $_COOKIE['Sources']);
35	35	if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') $filter['airlinestype'] = $_COOKIE['airlinestype'];
36	36
37	37	if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
		@@ -39,7 +39,7 @@ discard block
		block discarded – undo
39	39	}
40	40
41	41	if (isset($_GET['ident'])) {
42		- $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
	42	+ $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
43	43	$spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident);
44	44	if (empty($spotter_array)) {
45	45	$from_archive = true;
		@@ -47,7 +47,7 @@ discard block
		block discarded – undo
47	47	}
48	48	$allhistory = true;
49	49	} elseif (isset($_GET['flightaware_id'])) {
50		- $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
	50	+ $flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
51	51	$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
52	52	if (empty($spotter_array)) {
53	53	$from_archive = true;
		@@ -56,37 +56,37 @@ discard block
		block discarded – undo
56	56	$allhistory = true;
57	57	} elseif (isset($_GET['coord']) && (!isset($globalMapPopup) \|\| $globalMapPopup \|\| (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true'))) {
58	58	//if (isset($_GET['coord'])) {
59		- $coord = explode(',',$_GET['coord']);
60		- $spotter_array = $SpotterLive->getLiveSpotterDatabyCoord($coord,$filter);
	59	+ $coord = explode(',', $_GET['coord']);
	60	+ $spotter_array = $SpotterLive->getLiveSpotterDatabyCoord($coord, $filter);
61	61
62	62	#} elseif (isset($globalMapPopup) && !$globalMapPopup) {
63	63	} elseif (isset($_GET['archive']) && isset($_GET['begindate']) && isset($_GET['enddate']) && isset($_GET['speed'])) {
64	64	$from_archive = true;
65	65	// $begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
66	66	// $enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
67		- $begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
68		- $enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
69		- $archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
70		- $begindate = date('Y-m-d H:i:s',$begindate);
71		- $enddate = date('Y-m-d H:i:s',$enddate);
72		- $spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
	67	+ $begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
	68	+ $enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
	69	+ $archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
	70	+ $begindate = date('Y-m-d H:i:s', $begindate);
	71	+ $enddate = date('Y-m-d H:i:s', $enddate);
	72	+ $spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
73	73	} elseif ($min) {
74	74	$spotter_array = $SpotterLive->getMinLiveSpotterData($filter);
75	75	# $min = true;
76	76	} else {
77		- $spotter_array = $SpotterLive->getLiveSpotterData('','',$filter);
	77	+ $spotter_array = $SpotterLive->getLiveSpotterData('', '', $filter);
78	78	}
79	79
80	80	if (!empty($spotter_array)) {
81	81	if (isset($_GET['archive'])) {
82		- $flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
	82	+ $flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
83	83	} else {
84	84	$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
85	85	}
86	86	if ($flightcnt == '') $flightcnt = 0;
87	87	} else $flightcnt = 0;
88	88
89		-$sqltime = round(microtime(true)-$begintime,2);
	89	+$sqltime = round(microtime(true) - $begintime, 2);
90	90
91	91	$j = 0;
92	92
		@@ -100,7 +100,7 @@ discard block
		block discarded – undo
100	100	if (!empty($spotter_array) && is_array($spotter_array))
101	101	{
102	102	$output .= '"features": [';
103		- foreach($spotter_array as $spotter_item)
	103	+ foreach ($spotter_array as $spotter_item)
104	104	{
105	105	$j++;
106	106	date_default_timezone_set('UTC');
		@@ -183,7 +183,7 @@ discard block
		block discarded – undo
183	183	if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
184	184	if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
185	185	$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
186		- $output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
	186	+ $output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ', '_', $spotter_item['aircraft_name'])).'",';
187	187	} elseif (isset($spotter_item['aircraft_type'])) {
188	188	$output .= '"aircraft_name": "NA ('.$spotter_item['aircraft_type'].')",';
189	189	} elseif (!$min) {
		@@ -250,15 +250,15 @@ discard block
		block discarded – undo
250	250	if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
251	251	else $output .= '"heading": "'.$spotter_item['heading'].'",';
252	252
253		- if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
254		- else $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
	253	+ if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading'], $archivespeed);
	254	+ else $nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading']);
255	255	//$output .= '"nextlatitude": "'.$nextcoord['latitude'].'",';
256	256	//$output .= '"nextlongitude": "'.$nextcoord['longitude'].'",';
257	257	$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
258	258
259	259	if (!$min) $output .= '"image": "'.$image.'",';
260	260	if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
261		- $output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
	261	+ $output .= '"image_copyright": "'.str_replace('"', "'", trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $spotter_item['image_copyright']))).'",';
262	262	}
263	263	if (isset($spotter_item['image_source_website'])) {
264	264	$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
		@@ -280,7 +280,7 @@ discard block
		block discarded – undo
280	280	$output .= '"waypoints": "'.$spotter_item['waypoints'].'",';
281	281	}
282	282	if (isset($spotter_item['acars'])) {
283		- $output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",';
	283	+ $output .= '"acars": "'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br />', $spotter_item['acars']['message'])).'",';
284	284	}
285	285	// FIXME : type when not aircraft ?
286	286	if ($compress) $output .= '"t": "aircraft"';
		@@ -289,8 +289,8 @@ discard block
		block discarded – undo
289	289	$output .= '"geometry": {';
290	290	$output .= '"type": "Point",';
291	291	$output .= '"coordinates": [';
292		- $output .= $spotter_item['longitude'].', ';
293		- $output .= $spotter_item['latitude'];
	292	+ $output .= $spotter_item['longitude'].', ';
	293	+ $output .= $spotter_item['latitude'];
294	294	$output .= ']';
295	295	$output .= '}';
296	296	$output .= '},';
		@@ -338,7 +338,7 @@ discard block
		block discarded – undo
338	338	*/
339	339	//if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') \|\| (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) \|\| $globalMapHistory \|\| $allhistory) \|\| (isset($_GET['history']) && $_GET['history'] != '' && $_GET['history'] != 'NA' && ($_GET['history'] == $spotter_item['ident'] \|\| $_GET['history'] == $spotter_item['flightaware_id'])))) {
340	340	//if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') \|\| (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) \|\| $globalMapHistory \|\| $allhistory) \|\| (isset($_GET['history']) && $_GET['history'] != '' && $_GET['history'] != 'NA' && ($_GET['history'] == $spotter_item['ident'] \|\| $_GET['history'] == $spotter_item['flightaware_id']))) \|\| (isset($_GET['history']) && $_GET['history'] == '' && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])) {
341		- $history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
	341	+ $history = filter_input(INPUT_GET, 'history', FILTER_SANITIZE_STRING);
342	342	if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
343	343	if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') \|\| (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) \|\| $globalMapHistory \|\| $allhistory)
344	344	\|\| (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] \|\| $history == $spotter_item['flightaware_id'])))
		@@ -368,8 +368,8 @@ discard block
		block discarded – undo
368	368	else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
369	369	}
370	370	$output_history .= '[';
371		- $output_history .= $spotter_history['longitude'].', ';
372		- $output_history .= $spotter_history['latitude'];
	371	+ $output_history .= $spotter_history['longitude'].', ';
	372	+ $output_history .= $spotter_history['latitude'];
373	373	//$output_history .= $spotter_history['altitude'];
374	374	$output_history .= '],';
375	375	$prev_alt = $alt;
		@@ -413,7 +413,7 @@ discard block
		block discarded – undo
413	413	$output = substr($output, 0, -1);
414	414	$output .= ']';
415	415	$output .= ',"initial_sqltime": "'.$sqltime.'",';
416		- $output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
	416	+ $output .= '"totaltime": "'.round(microtime(true) - $begintime, 2).'",';
417	417	if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
418	418	$output .= '"fc": "'.$j.'"';
419	419	} else {

		@@ -18,21 +18,40 @@ discard block
		block discarded – undo
18	18	}
19	19	header('Content-Type: text/javascript');
20	20
21		-if (!isset($globalJsonCompress)) $compress = true;
22		-else $compress = $globalJsonCompress;
	21	+if (!isset($globalJsonCompress)) {
	22	+ $compress = true;
	23	+} else {
	24	+ $compress = $globalJsonCompress;
	25	+}
23	26
24	27	$from_archive = false;
25	28	$min = false;
26	29	$allhistory = false;
27	30	$filter['source'] = array();
28		-if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
29		-if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
30		-if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
31		-if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
32		-if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
33		-if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',',$_COOKIE['Airlines']);
34		-if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
35		-if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') $filter['airlinestype'] = $_COOKIE['airlinestype'];
	31	+if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') {
	32	+ $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
	33	+}
	34	+if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') {
	35	+ $filter['source'] = array_merge($filter['source'],array('whazzup'));
	36	+}
	37	+if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') {
	38	+ $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
	39	+}
	40	+if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') {
	41	+ $filter['source'] = array_merge($filter['source'],array('sbs'));
	42	+}
	43	+if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') {
	44	+ $filter['source'] = array_merge($filter['source'],array('aprs'));
	45	+}
	46	+if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') {
	47	+ $filter['airlines'] = explode(',',$_COOKIE['Airlines']);
	48	+}
	49	+if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') {
	50	+ $filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
	51	+}
	52	+if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') {
	53	+ $filter['airlinestype'] = $_COOKIE['airlinestype'];
	54	+}
36	55
37	56	if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
38	57	$min = true;
		@@ -83,8 +102,12 @@ discard block
		block discarded – undo
83	102	} else {
84	103	$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
85	104	}
86		- if ($flightcnt == '') $flightcnt = 0;
87		-} else $flightcnt = 0;
	105	+ if ($flightcnt == '') {
	106	+ $flightcnt = 0;
	107	+ }
	108	+ } else {
	109	+ $flightcnt = 0;
	110	+}
88	111
89	112	$sqltime = round(microtime(true)-$begintime,2);
90	113
		@@ -92,8 +115,11 @@ discard block
		block discarded – undo
92	115
93	116	$output = '{';
94	117	$output .= '"type": "FeatureCollection",';
95		- if ($min) $output .= '"minimal": "true",';
96		- else $output .= '"minimal": "false",';
	118	+ if ($min) {
	119	+ $output .= '"minimal": "true",';
	120	+ } else {
	121	+ $output .= '"minimal": "false",';
	122	+ }
97	123	$output .= '"fc": "'.$flightcnt.'",';
98	124	$output .= '"sqt": "'.$sqltime.'",';
99	125
		@@ -162,11 +188,16 @@ discard block
		block discarded – undo
162	188	//$output .= '"fc": "'.$flightcnt.'",';
163	189	//$output .= '"sqt": "'.$sqltime.'",';
164	190	$output .= '"properties": {';
165		- if ($compress) $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
166		- else $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
	191	+ if ($compress) {
	192	+ $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
	193	+ } else {
	194	+ $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
	195	+ }
167	196	$output .= '"fc": "'.$flightcnt.'",';
168	197	$output .= '"sqt": "'.$sqltime.'",';
169		- if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
	198	+ if (isset($begindate)) {
	199	+ $output .= '"archive_date": "'.$begindate.'",';
	200	+ }
170	201
171	202	/*
172	203	if ($min) $output .= '"minimal": "true",';
		@@ -174,13 +205,21 @@ discard block
		block discarded – undo
174	205	*/
175	206	//$output .= '"fc": "'.$spotter_item['nb'].'",';
176	207	if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
177		- if ($compress) $output .= '"c": "'.$spotter_item['ident'].'",';
178		- else $output .= '"callsign": "'.$spotter_item['ident'].'",';
	208	+ if ($compress) {
	209	+ $output .= '"c": "'.$spotter_item['ident'].'",';
	210	+ } else {
	211	+ $output .= '"callsign": "'.$spotter_item['ident'].'",';
	212	+ }
179	213	} else {
180		- if ($compress) $output .= '"c": "NA",';
181		- else $output .= '"callsign": "NA",';
	214	+ if ($compress) {
	215	+ $output .= '"c": "NA",';
	216	+ } else {
	217	+ $output .= '"callsign": "NA",';
	218	+ }
	219	+ }
	220	+ if (isset($spotter_item['registration'])) {
	221	+ $output .= '"registration": "'.$spotter_item['registration'].'",';
182	222	}
183		- if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
184	223	if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
185	224	$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
186	225	$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
		@@ -193,19 +232,29 @@ discard block
		block discarded – undo
193	232	$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
194	233	}
195	234	if (!isset($spotter_item['aircraft_shadow'])) {
196		- if (!isset($spotter_item['aircraft_icao']) \|\| $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = '';
197		- else {
	235	+ if (!isset($spotter_item['aircraft_icao']) \|\| $spotter_item['aircraft_icao'] == '') {
	236	+ $spotter_item['aircraft_shadow'] = '';
	237	+ } else {
198	238	$aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']);
199		- if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
200		- else $spotter_item['aircraft_shadow'] = '';
	239	+ if (count($aircraft_info) > 0) {
	240	+ $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
	241	+ } else {
	242	+ $spotter_item['aircraft_shadow'] = '';
	243	+ }
201	244	}
202	245	}
203	246	if ($spotter_item['aircraft_shadow'] == '') {
204		- if ($compress) $output .= '"as": "default.png",';
205		- else $output .= '"aircraft_shadow": "default.png",';
	247	+ if ($compress) {
	248	+ $output .= '"as": "default.png",';
	249	+ } else {
	250	+ $output .= '"aircraft_shadow": "default.png",';
	251	+ }
206	252	} else {
207		- if ($compress) $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
208		- else $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
	253	+ if ($compress) {
	254	+ $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
	255	+ } else {
	256	+ $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
	257	+ }
209	258	}
210	259	if (isset($spotter_item['airline_name'])) {
211	260	$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
		@@ -213,8 +262,11 @@ discard block
		block discarded – undo
213	262	$output .= '"airline_name": "NA",';
214	263	}
215	264	if (isset($spotter_item['departure_airport'])) {
216		- if ($compress) $output .= '"dac": "'.$spotter_item['departure_airport'].'",';
217		- else $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
	265	+ if ($compress) {
	266	+ $output .= '"dac": "'.$spotter_item['departure_airport'].'",';
	267	+ } else {
	268	+ $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
	269	+ }
218	270	}
219	271	if (isset($spotter_item['departure_airport_city'])) {
220	272	$output .= '"departure_airport": "'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_country'].'",';
		@@ -226,8 +278,11 @@ discard block
		block discarded – undo
226	278	$output .= '"arrival_airport_time": "'.$spotter_item['arrival_airport_time'].'",';
227	279	}
228	280	if (isset($spotter_item['arrival_airport'])) {
229		- if ($compress) $output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
230		- else $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
	281	+ if ($compress) {
	282	+ $output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
	283	+ } else {
	284	+ $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
	285	+ }
231	286	}
232	287	if (isset($spotter_item['arrival_airport_city'])) {
233	288	$output .= '"arrival_airport": "'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].'",';
		@@ -245,18 +300,29 @@ discard block
		block discarded – undo
245	300	$output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
246	301	}
247	302
248		- if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",';
249		- else $output .= '"altitude": "'.$spotter_item['altitude'].'",';
250		- if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
251		- else $output .= '"heading": "'.$spotter_item['heading'].'",';
	303	+ if ($compress) {
	304	+ $output .= '"a": "'.$spotter_item['altitude'].'",';
	305	+ } else {
	306	+ $output .= '"altitude": "'.$spotter_item['altitude'].'",';
	307	+ }
	308	+ if ($compress) {
	309	+ $output .= '"h": "'.$spotter_item['heading'].'",';
	310	+ } else {
	311	+ $output .= '"heading": "'.$spotter_item['heading'].'",';
	312	+ }
252	313
253		- if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
254		- else $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
	314	+ if (isset($archivespeed)) {
	315	+ $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
	316	+ } else {
	317	+ $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
	318	+ }
255	319	//$output .= '"nextlatitude": "'.$nextcoord['latitude'].'",';
256	320	//$output .= '"nextlongitude": "'.$nextcoord['longitude'].'",';
257	321	$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
258	322
259		- if (!$min) $output .= '"image": "'.$image.'",';
	323	+ if (!$min) {
	324	+ $output .= '"image": "'.$image.'",';
	325	+ }
260	326	if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
261	327	$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
262	328	}
		@@ -264,8 +330,11 @@ discard block
		block discarded – undo
264	330	$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
265	331	}
266	332	if (isset($spotter_item['squawk'])) {
267		- if ($compress) $output .= '"sq": "'.$spotter_item['squawk'].'",';
268		- else $output .= '"squawk": "'.$spotter_item['squawk'].'",';
	333	+ if ($compress) {
	334	+ $output .= '"sq": "'.$spotter_item['squawk'].'",';
	335	+ } else {
	336	+ $output .= '"squawk": "'.$spotter_item['squawk'].'",';
	337	+ }
269	338	}
270	339	if (isset($spotter_item['squawk_usage'])) {
271	340	$output .= '"squawk_usage": "'.$spotter_item['squawk_usage'].'",';
		@@ -283,8 +352,11 @@ discard block
		block discarded – undo
283	352	$output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",';
284	353	}
285	354	// FIXME : type when not aircraft ?
286		- if ($compress) $output .= '"t": "aircraft"';
287		- else $output .= '"type": "aircraft"';
	355	+ if ($compress) {
	356	+ $output .= '"t": "aircraft"';
	357	+ } else {
	358	+ $output .= '"type": "aircraft"';
	359	+ }
288	360	$output .= '},';
289	361	$output .= '"geometry": {';
290	362	$output .= '"type": "Point",';
		@@ -339,7 +411,9 @@ discard block
		block discarded – undo
339	411	//if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') \|\| (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) \|\| $globalMapHistory \|\| $allhistory) \|\| (isset($_GET['history']) && $_GET['history'] != '' && $_GET['history'] != 'NA' && ($_GET['history'] == $spotter_item['ident'] \|\| $_GET['history'] == $spotter_item['flightaware_id'])))) {
340	412	//if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') \|\| (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) \|\| $globalMapHistory \|\| $allhistory) \|\| (isset($_GET['history']) && $_GET['history'] != '' && $_GET['history'] != 'NA' && ($_GET['history'] == $spotter_item['ident'] \|\| $_GET['history'] == $spotter_item['flightaware_id']))) \|\| (isset($_GET['history']) && $_GET['history'] == '' && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])) {
341	413	$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
342		- if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
	414	+ if ($history == '' && isset($_COOKIE['history'])) {
	415	+ $history = $_COOKIE['history'];
	416	+ }
343	417	if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') \|\| (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) \|\| $globalMapHistory \|\| $allhistory)
344	418	\|\| (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] \|\| $history == $spotter_item['flightaware_id'])))
345	419	\|\| (isset($history) && $history == '' && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])) {
		@@ -364,8 +438,11 @@ discard block
		block discarded – undo
364	438	$output_history .= ']}},';
365	439	$output .= $output_history;
366	440	}
367		- if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
368		- else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
	441	+ if ($compress) {
	442	+ $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
	443	+ } else {
	444	+ $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
	445	+ }
369	446	}
370	447	$output_history .= '[';
371	448	$output_history .= $spotter_history['longitude'].', ';
		@@ -414,7 +491,9 @@ discard block
		block discarded – undo
414	491	$output .= ']';
415	492	$output .= ',"initial_sqltime": "'.$sqltime.'",';
416	493	$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
417		- if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
	494	+ if (isset($begindate)) {
	495	+ $output .= '"archive_date": "'.$begindate.'",';
	496	+ }
418	497	$output .= '"fc": "'.$j.'"';
419	498	} else {
420	499	$output .= '"features": ';

		@@ -6,23 +6,23 @@ discard block
		block discarded – undo
6	6	header('Location: '.$globalURL.'/aircraft');
7	7	die();
8	8	}
9		-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
	9	+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
10	10	$Spotter = new Spotter();
11		-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
	11	+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
12	12
13	13
14	14	if (!empty($spotter_array))
15	15	{
16		- $title = sprintf(_("Most Common Departure Airports by Country for %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
	16	+ $title = sprintf(_("Most Common Departure Airports by Country for %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
17	17	require_once('header.php');
18	18	print '<div class="select-item">';
19	19	print '<form action="'.$globalURL.'/aircraft" method="post">';
20	20	print '<select name="aircraft_type" class="selectpicker" data-live-search="true">';
21	21	print '<option></option>';
22	22	$aircraft_types = $Spotter->getAllAircraftTypes();
23		- foreach($aircraft_types as $aircraft_type)
	23	+ foreach ($aircraft_types as $aircraft_type)
24	24	{
25		- if($aircraft_type == $aircrafttype['aircraft_icao'])
	25	+ if ($aircraft_type == $aircrafttype['aircraft_icao'])
26	26	{
27	27	print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
28	28	} else {
		@@ -48,7 +48,7 @@ discard block
		block discarded – undo
48	48	include('aircraft-sub-menu.php');
49	49	print '<div class="column">';
50	50	print '<h2>'._("Most Common Departure Airports by Country").'</h2>';
51		- print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
	51	+ print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
52	52	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByAircraft($aircraft_type);
53	53	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
54	54	print '<div id="chartCountry" class="chart" width="100%"></div>
		@@ -59,7 +59,7 @@ discard block
		block discarded – undo
59	59	var data = google.visualization.arrayToDataTable([
60	60	["'._("Country").'", "'._("# of times").'"], ';
61	61	$country_data = '';
62		- foreach($airport_country_array as $airport_item)
	62	+ foreach ($airport_country_array as $airport_item)
63	63	{
64	64	$country_data .= '[ "'.$airport_item['departure_airport_country'].'",'.$airport_item['airport_departure_country_count'].'],';
65	65	}
		@@ -93,7 +93,7 @@ discard block
		block discarded – undo
93	93	print '</thead>';
94	94	print '<tbody>';
95	95	$i = 1;
96		- foreach($airport_country_array as $airport_item)
	96	+ foreach ($airport_country_array as $airport_item)
97	97	{
98	98	print '<tr>';
99	99	print '<td><strong>'.$i.'</strong></td>';

		@@ -6,22 +6,22 @@ discard block
		block discarded – undo
6	6	header('Location: '.$globalURL.'/airline');
7	7	die();
8	8	}
9		-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
	9	+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
10	10	$Spotter = new Spotter();
11		-$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
	11	+$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
12	12
13	13	if (!empty($spotter_array))
14	14	{
15		- $title = sprintf(_("Most Common Routes from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
	15	+ $title = sprintf(_("Most Common Routes from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
16	16	require_once('header.php');
17	17	print '<div class="select-item">';
18	18	print '<form action="'.$globalURL.'/airline" method="post">';
19	19	print '<select name="airline" class="selectpicker" data-live-search="true">';
20	20	print '<option></option>';
21	21	$airline_names = $Spotter->getAllAirlineNames();
22		- foreach($airline_names as $airline_name)
	22	+ foreach ($airline_names as $airline_name)
23	23	{
24		- if($airline == $airline_name['airline_icao'])
	24	+ if ($airline == $airline_name['airline_icao'])
25	25	{
26	26	print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
27	27	} else {
		@@ -59,7 +59,7 @@ discard block
		block discarded – undo
59	59	include('airline-sub-menu.php');
60	60	print '<div class="column">';
61	61	print '<h2>'._("Most Common Routes").'</h2>';
62		- print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
	62	+ print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
63	63	$route_array = $Spotter->countAllRoutesByAirline($airline);
64	64	if (!empty($route_array))
65	65	{
		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	print '</thead>';
76	76	print '<tbody>';
77	77	$i = 1;
78		- foreach($route_array as $route_item)
	78	+ foreach ($route_array as $route_item)
79	79	{
80	80	print '<tr>';
81	81	print '<td><strong>'.$i.'</strong></td>';

		@@ -40,8 +40,7 @@
		block discarded – undo
40	40	if ($globalIVAO && @getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif'))
41	41	{
42	42	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" />';
43		- }
44		- elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
	43	+ } elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
45	44	{
46	45	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" />';
47	46	}

		@@ -7,12 +7,12 @@ discard block
		block discarded – undo
7	7	require_once('header.php');
8	8
9	9	//calculuation for the pagination
10		-if(!isset($_GET['limit']))
	10	+if (!isset($_GET['limit']))
11	11	{
12	12	$limit_start = 0;
13	13	$limit_end = 25;
14	14	$absolute_difference = 25;
15		-} else {
	15	+} else {
16	16	$limit_explode = explode(",", $_GET['limit']);
17	17	$limit_start = $limit_explode[0];
18	18	$limit_end = $limit_explode[1];
		@@ -34,10 +34,10 @@ discard block
		block discarded – undo
34	34	print '<div class="table column">';
35	35	print '<p>'._("The table below shows the detailed information of all recent flights.").'</p>';
36	36
37		-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
	37	+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
38	38	$sql_begin = microtime(true);
39	39	$spotter_array = $Spotter->getLatestSpotterData($limit_start.",".$absolute_difference, $sort);
40		-$sql_time = microtime(true)-$sql_begin;
	40	+$sql_time = microtime(true) - $sql_begin;
41	41
42	42	$page_begin = microtime(true);
43	43	if (!empty($spotter_array))
		@@ -55,6 +55,6 @@ discard block
		block discarded – undo
55	55	print '</div>';
56	56	print '</div>';
57	57	}
58		-$page_time = microtime(true)-$page_begin;
	58	+$page_time = microtime(true) - $page_begin;
59	59	require_once('footer.php');
60	60	?>
61	61	\ No newline at end of file

		@@ -12,7 +12,7 @@
		block discarded – undo
12	12	$limit_start = 0;
13	13	$limit_end = 25;
14	14	$absolute_difference = 25;
15		-} else {
	15	+} else {
16	16	$limit_explode = explode(",", $_GET['limit']);
17	17	$limit_start = $limit_explode[0];
18	18	$limit_end = $limit_explode[1];

		@@ -29,7 +29,7 @@ discard block
		block discarded – undo
29	29	<?php
30	30	if (isset($_GET['q']))
31	31	{
32		- $spotter_array = $Spotter->searchSpotterData($_GET['q'],"","","","","","","","","","","","","","","","","","0,10","","");
	32	+ $spotter_array = $Spotter->searchSpotterData($_GET['q'], "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "0,10", "", "");
33	33	} else {
34	34	$spotter_array = $Spotter->getLatestSpotterData("0,10", "");
35	35	}
		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	print '<div class="table-responsive">';
38	38	print '<table id="table-tv">';
39	39	print '<tbody>';
40		-foreach($spotter_array as $spotter_item)
	40	+foreach ($spotter_array as $spotter_item)
41	41	{
42	42	if (isset($globalTimezone)) {
43	43	date_default_timezone_set($globalTimezone);

		@@ -41,7 +41,9 @@ discard block
		block discarded – undo
41	41	{
42	42	if (isset($globalTimezone)) {
43	43	date_default_timezone_set($globalTimezone);
44		- } else date_default_timezone_set('UTC');
	44	+ } else {
	45	+ date_default_timezone_set('UTC');
	46	+ }
45	47	print '<tr>';
46	48	if (isset($_GET['image']) && $_GET['image'] == "true")
47	49	{
		@@ -98,10 +100,14 @@ discard block
		block discarded – undo
98	100	print '</div>';
99	101	print '<div class="other2">';
100	102	print '<span><i class="fa fa-arrow-up"></i> '.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'];
101		- if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != '') print ' ('.$spotter_item['departure_airport_time'].')';
	103	+ if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != '') {
	104	+ print ' ('.$spotter_item['departure_airport_time'].')';
	105	+ }
102	106	print '</span>';
103	107	print '<span><i class="fa fa-arrow-down"></i> '.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'];
104		- if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != '') print ' ('.$spotter_item['arrival_airport_time'].')';
	108	+ if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != '') {
	109	+ print ' ('.$spotter_item['arrival_airport_time'].')';
	110	+ }
105	111	print '</span>';
106	112	print '</div>';
107	113	print '<div class="other3">';

		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22	var data = google.visualization.arrayToDataTable([
23	23	["'._("Aircraft").'", "'._("# of times").'"], ';
24	24	$callsign_data = '';
25		-foreach($callsign_array as $callsign_item)
	25	+foreach ($callsign_array as $callsign_item)
26	26	{
27	27	$callsign_data .= '[ "'.$callsign_item['callsign_icao'].' ('.$callsign_item['airline_name'].')",'.$callsign_item['callsign_icao_count'].'],';
28	28	}
		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	print '</thead>';
57	57	print '<tbody>';
58	58	$i = 1;
59		- foreach($callsign_array as $callsign_item)
	59	+ foreach ($callsign_array as $callsign_item)
60	60	{
61	61	print '<tr>';
62	62	print '<td><strong>'.$i.'</strong></td>';

Ysurac / FlightAirMap

Branch — master (3f174d)

Category

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

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

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

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

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

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

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

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

Braces +128 added lines, -49 removed lines patch added patch discarded remove patch

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

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

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

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

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

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

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

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

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

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