Inspection of "Fixes and add marine type in precalc stats" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 79cbb4...2c41c0 )

by Yannick

created 2017-08-22 17:19 UTC

Status

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

@@ -7,7 +7,9 @@  discard block
 block discarded – undo
 $showRouteStop = $Common->multiKeyExists($spotter_array,'route_stop');
 $showDuration = $Common->multiKeyExists($spotter_array,'duration');
 
-if (!isset($type)) $type = 'aircraft';
+if (!isset($type)) {
+	$type = 'aircraft';
+}
 
 if (!isset($_GET['sort'])) 
 {
@@ -440,7 +442,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');
+	}
 	if ($showSpecial === true)
 	{
 		print '<tr class="special">'."\n";
@@ -455,7 +459,9 @@  discard block
 block discarded – undo
 			print '<tr class="active">';
 		} elseif (isset($spotter_item['spotted_registration'])) {
 			print '<tr class="info">';
-		} else print '<tr>';
+		} else {
+			print '<tr>';
+		}
 	}
 	if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive" || strtolower($current_page) == "currently" || strtolower($current_page) == "accident-latest" || strtolower($current_page) == "incident-latest" || strtolower($current_page) == "accident-detailed" || strtolower($current_page) == "incident-detailed") {
 		if ($type == 'aircraft') {
@@ -463,8 +469,9 @@  discard block
 block discarded – undo
 			{
 				print '<td class="aircraft_thumbnail">'."\n";
 				if ($spotter_item['image_source'] == 'planespotters') {
-					if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
-					else {
+					if ($spotter_item['image_source_website'] != '') {
+						$image_src = $spotter_item['image_source_website'];
+					} else {
 						$planespotter_url_array = explode("_", $spotter_item['image']);
 						$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
 						$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
@@ -477,7 +484,9 @@  discard block
 block discarded – undo
 				} else {
 					if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
 						$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-					} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+					} else {
+						$image_thumbnail = $spotter_item['image_thumbnail'];
+					}
 					if (isset($spotter_item['airline_name'])) {
 						print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 					} else {
@@ -496,7 +505,9 @@  discard block
 block discarded – undo
 				print '<td class="aircraft_thumbnail">'."\n";
 				if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
 					$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-				} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+				} else {
+					$image_thumbnail = $spotter_item['image_thumbnail'];
+				}
 				if (isset($spotter_item['airline_name'])) {
 					print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['mmsi'].'" alt="'.$spotter_item['mmsi'].'" data-content="'._("MMSI:").' '.$spotter_item['mmsi'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} else {
@@ -514,7 +525,9 @@  discard block
 block discarded – undo
 				print '<td class="aircraft_thumbnail">'."\n";
 				if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
 					$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-				} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+				} else {
+					$image_thumbnail = $spotter_item['image_thumbnail'];
+				}
 				print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['ident'].'" alt="'.$spotter_item['type'].'" data-content="'._("Type:").' '.$spotter_item['type'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				print '</td>'."\n";
 			} else {
@@ -565,8 +578,9 @@  discard block
 block discarded – undo
 				print '<td class="aircraft_thumbnail">'."\n";
 				//print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
 				if ($spotter_item['image_source'] == 'planespotters') {
-					if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
-					else {
+					if ($spotter_item['image_source_website'] != '') {
+						$image_src = $spotter_item['image_source_website'];
+					} else {
 						$planespotter_url_array = explode("_", $spotter_array[0]['image']);
 						$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
 						$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
@@ -583,7 +597,9 @@  discard block
 block discarded – undo
 				} else {
 					if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
 						$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-					} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+					} else {
+						$image_thumbnail = $spotter_item['image_thumbnail'];
+					}
 					if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
 						print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 					} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
@@ -616,7 +632,9 @@  discard block
 block discarded – undo
 				print '<td class="aircraft_thumbnail">'."\n";
 				if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
 					$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-				} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+				} else {
+					$image_thumbnail = $spotter_item['image_thumbnail'];
+				}
 				print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['mmsi'].'" alt="'.$spotter_item['mmsi'].'" data-content="'._("MMSI:").' '.$spotter_item['mmsi'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				print '</td>'."\n";
 			} else {
@@ -630,7 +648,9 @@  discard block
 block discarded – undo
 				print '<td class="aircraft_thumbnail">'."\n";
 				if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
 					$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-				} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+				} else {
+					$image_thumbnail = $spotter_item['image_thumbnail'];
+				}
 				print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['ident'].'" alt="'.$spotter_item['type'].'" data-content="'._("Type:").' '.$spotter_item['type'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				print '</td>'."\n";
 			} else {
@@ -783,15 +803,21 @@  discard block
 block discarded – undo
 			if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) {
 				if ($spotter_item['departure_airport_time'] > 2460) {
 					$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
-				} else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
+				} else {
+					$departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
+				}
 				if ($spotter_item['real_departure_airport_time'] > 2460) {
 					$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
-				} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
+				} else {
+					$real_departure_airport_time = $spotter_item['real_departure_airport_time'];
+				}
 				print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n";
 			} elseif (isset($spotter_item['real_departure_airport_time']) && $spotter_item['real_departure_airport_time'] != 'NULL') {
 				if ($spotter_item['real_departure_airport_time'] > 2460) {
 					$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
-				} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
+				} else {
+					$real_departure_airport_time = $spotter_item['real_departure_airport_time'];
+				}
 				print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n";
 			} elseif (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
 				if ($spotter_item['departure_airport_time'] > 2460) {
@@ -813,7 +839,9 @@  discard block
 block discarded – undo
 						$longitude = $spotter_item['longitude'];
 					}
 					$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
-				} else $distance = '';
+				} else {
+					$distance = '';
+				}
 				if ($distance != '') {
 					if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
 						echo '<br/><i>'.round($distance*0.539957).' nm</i>';
@@ -840,7 +868,9 @@  discard block
 block discarded – undo
 			} else {
 				if (isset($spotter_item['real_arrival_airport']) && $spotter_item['real_arrival_airport'] != $spotter_item['arrival_airport']) {
 					print '<span class="nomobile">Scheduled : <a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a></span>'."\n";
-					if (!isset($Spotter)) $Spotter = new Spotter();
+					if (!isset($Spotter)) {
+						$Spotter = new Spotter();
+					}
 					$arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['real_arrival_airport']);
 					print '<br /><span class="nomobile">'._("Real:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$arrival_airport_info[0]['city'].','.$arrival_airport_info[0]['country'].' ('.$spotter_item['real_arrival_airport'].')</a></span>'."\n";
 					print '<span class="mobile">'._("Scheduled:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$spotter_item['real_arrival_airport'].'</a></span>'."\n";
@@ -856,20 +886,28 @@  discard block
 block discarded – undo
 			if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) {
 				if ($spotter_item['arrival_airport_time'] > 2460) {
 					$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
-				} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
+				} else {
+					$arrival_airport_time = $spotter_item['arrival_airport_time'];
+				}
 				if ($spotter_item['real_arrival_airport_time'] > 2460) {
 					$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
-				} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
+				} else {
+					$real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
+				}
 				print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n";
 			} elseif (isset($spotter_item['real_arrival_airport_time'])) {
 				if ($spotter_item['real_arrival_airport_time'] > 2460) {
 					$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
-				} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
+				} else {
+					$real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
+				}
 				print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n";
 			} elseif (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
 				if ($spotter_item['arrival_airport_time'] > 2460) {
 					$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
-				} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
+				} else {
+					$arrival_airport_time = $spotter_item['arrival_airport_time'];
+				}
 				print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n";
 			}
 			if (!isset($spotter_item['real_arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
@@ -882,7 +920,9 @@  discard block
 block discarded – undo
 						$longitude = $spotter_item['longitude'];
 					}
 					$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude);
-				} else $distance = '';
+				} else {
+					$distance = '';
+				}
 				if ($distance != '') {
 					if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
 						echo '<br/><i>'.round($distance*0.539957).' nm</i>';

Please login to merge, or discard this patch.

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

@@ -277,7 +277,7 @@  discard block
 block discarded – undo
 				print '<th class="arrival"><span class="nomobile">'._("Going to").'</span><span class="mobile">'._("To").'</span></th>';
 			}
 		}
-    		if ($type == 'aircraft') {
+			if ($type == 'aircraft') {
 			if ((isset($globalUsePilot) && $globalUsePilot) || (!isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalVAM) && $globalVAM) || (isset($globalphpVMS) && $globalphpVMS)))) {
 				print '<th class="pilot"><span class="nomobile">'._("Pilot name").'</span><span class="mobile">'._("Pilot").'</span></a></th>';
 			}
@@ -579,7 +579,7 @@  discard block
 block discarded – undo
 	} elseif(strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest" && strtolower($current_page) != "accident-detailed" && strtolower($current_page) != "incident-detailed"){
 		if ($type == 'aircraft') {
 			if (!isset($spotter_item['squawk']) || $spotter_item['squawk'] == 0) {
-			    $spotter_item['squawk'] = '-';
+				$spotter_item['squawk'] = '-';
 			}
 			if ($spotter_item['image_thumbnail'] != "")
 			{
@@ -618,7 +618,7 @@  discard block
 block discarded – undo
 				print '</td>'."\n";
 			} else {
 				print '<td class="aircraft_thumbnail">'."\n";
-	       //   	 	print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
+		   //   	 	print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
 		//}
 				if (!isset($spotter_item['airline_name']) && !isset($spotter_item['aircraft_name'])) {
 					print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '._("Not available").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n";

Please login to merge, or discard this patch.

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

@@ -4,8 +4,8 @@  discard block
 block discarded – undo
 
 require_once(dirname(__FILE__).'/require/class.Common.php');
 $Common = new Common();
-$showRouteStop = $Common->multiKeyExists($spotter_array,'route_stop');
-$showDuration = $Common->multiKeyExists($spotter_array,'duration');
+$showRouteStop = $Common->multiKeyExists($spotter_array, 'route_stop');
+$showDuration = $Common->multiKeyExists($spotter_array, 'duration');
 
 if (!isset($type)) $type = 'aircraft';
 
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
 	}
 	print '<th class="more"></th>';
 	print '</thead>';
-} else if (strtolower($current_page) == "upcoming"){
+} else if (strtolower($current_page) == "upcoming") {
 	print '<thead>';
 	if (!isset($globalNoAirlines) || $globalNoAirlines === FALSE) {
 		if ($_GET['sort'] == "airline_name_asc")
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
 	}
 	*/
 	print '</thead>';
-} else if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive"){
+} else if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive") {
 	print '<thead>';
 	print '<th class="aircraft_thumbnail"></th>';
 	print '<th class="logo">'._("Airline").'</th>';
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
 	print '</thead>';
 } else {
 
-	if ($hide_th_links === true){
+	if ($hide_th_links === true) {
 		print '<thead>';
 		print '<th class="aircraft_thumbnail"></th>';
 		if ($type == 'aircraft') {
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
 }
 
 print '<tbody>'."\n";
-foreach($spotter_array as $spotter_item)
+foreach ($spotter_array as $spotter_item)
 {
 	if (isset($globalTimezone))
 	{
@@ -489,13 +489,13 @@  discard block
 block discarded – undo
 						$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
 					}
 					if (isset($spotter_item['airline_name'])) {
-						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 					} else {
-						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 					}
 				} else {
 					if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-						$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+						$image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 					} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 					if (isset($spotter_item['airline_name'])) {
 						print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
@@ -514,7 +514,7 @@  discard block
 block discarded – undo
 			{
 				print '<td class="aircraft_thumbnail">'."\n";
 				if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-					$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+					$image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 				} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 				if (isset($spotter_item['airline_name'])) {
 					print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['mmsi'].'" alt="'.$spotter_item['mmsi'].'" data-content="'._("MMSI:").' '.$spotter_item['mmsi'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
@@ -532,7 +532,7 @@  discard block
 block discarded – undo
 			{
 				print '<td class="aircraft_thumbnail">'."\n";
 				if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-					$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+					$image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 				} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 				print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['ident'].'" alt="'.$spotter_item['type'].'" data-content="'._("Type:").' '.$spotter_item['type'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				print '</td>'."\n";
@@ -576,7 +576,7 @@  discard block
 block discarded – undo
 				print '</td>'."\n";
 			}
 		}
-	} elseif(strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest" && strtolower($current_page) != "accident-detailed" && strtolower($current_page) != "incident-detailed"){
+	} elseif (strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest" && strtolower($current_page) != "accident-detailed" && strtolower($current_page) != "incident-detailed") {
 		if ($type == 'aircraft') {
 			if (!isset($spotter_item['squawk']) || $spotter_item['squawk'] == 0) {
 			    $spotter_item['squawk'] = '-';
@@ -593,17 +593,17 @@  discard block
 block discarded – undo
 						$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
 					}
 					if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
-						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 					} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
-						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 					} elseif (!isset($spotter_item['aircraft_name']) && !isset($spotter_item['airline_name'])) {
-						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 					} else {
-						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+						print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 					}
 				} else {
 					if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-						$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+						$image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 					} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 					if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
 						print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
 			{
 				print '<td class="aircraft_thumbnail">'."\n";
 				if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-					$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+					$image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 				} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 				print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['mmsi'].'" alt="'.$spotter_item['mmsi'].'" data-content="'._("MMSI:").' '.$spotter_item['mmsi'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				print '</td>'."\n";
@@ -650,7 +650,7 @@  discard block
 block discarded – undo
 			{
 				print '<td class="aircraft_thumbnail">'."\n";
 				if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-					$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+					$image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 				} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 				print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['ident'].'" alt="'.$spotter_item['type'].'" data-content="'._("Type:").' '.$spotter_item['type'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				print '</td>'."\n";
@@ -759,7 +759,7 @@  discard block
 block discarded – undo
 		print '</td>'."\n";
 	}
 	// Aircraft type
-	if(strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive"){
+	if (strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive") {
 		print '<td class="type">'."\n";
 		if ($type == 'aircraft') {
 			if (!isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_name'])) {
@@ -810,22 +810,22 @@  discard block
 block discarded – undo
 			}
 			if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) {
 				if ($spotter_item['departure_airport_time'] > 2460) {
-					$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
-				} else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
+					$departure_airport_time = date('H:m', $spotter_item['departure_airport_time']);
+				} else $departure_airport_time = substr($spotter_item['departure_airport_time'], 0, -2).':'.substr($spotter_item['departure_airport_time'], -2);
 				if ($spotter_item['real_departure_airport_time'] > 2460) {
-					$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
+					$real_departure_airport_time = date('H:m', $spotter_item['real_departure_airport_time']);
 				} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
 				print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n";
 			} elseif (isset($spotter_item['real_departure_airport_time']) && $spotter_item['real_departure_airport_time'] != 'NULL') {
 				if ($spotter_item['real_departure_airport_time'] > 2460) {
-					$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
+					$real_departure_airport_time = date('H:m', $spotter_item['real_departure_airport_time']);
 				} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
 				print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n";
 			} elseif (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
 				if ($spotter_item['departure_airport_time'] > 2460) {
-					$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
+					$departure_airport_time = date('H:m', $spotter_item['departure_airport_time']);
 				} else {
-					$departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
+					$departure_airport_time = substr($spotter_item['departure_airport_time'], 0, -2).':'.substr($spotter_item['departure_airport_time'], -2);
 				}
 				print '<br /><span class="airport_time">'.$departure_airport_time.'</span>'."\n";
 			}
@@ -840,7 +840,7 @@  discard block
 block discarded – undo
 						$latitude = $spotter_item['latitude'];
 						$longitude = $spotter_item['longitude'];
 					}
-					$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
+					$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'], $latitude, $longitude);
 				} else $distance = '';
 				if ($distance != '') {
 					if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
@@ -883,20 +883,20 @@  discard block
 block discarded – undo
 			}
 			if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) {
 				if ($spotter_item['arrival_airport_time'] > 2460) {
-					$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
+					$arrival_airport_time = date('H:m', $spotter_item['arrival_airport_time']);
 				} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
 				if ($spotter_item['real_arrival_airport_time'] > 2460) {
-					$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
+					$real_arrival_airport_time = date('H:m', $spotter_item['real_arrival_airport_time']);
 				} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
 				print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n";
 			} elseif (isset($spotter_item['real_arrival_airport_time'])) {
 				if ($spotter_item['real_arrival_airport_time'] > 2460) {
-					$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
+					$real_arrival_airport_time = date('H:m', $spotter_item['real_arrival_airport_time']);
 				} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
 				print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n";
 			} elseif (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
 				if ($spotter_item['arrival_airport_time'] > 2460) {
-					$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
+					$arrival_airport_time = date('H:m', $spotter_item['arrival_airport_time']);
 				} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
 				print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n";
 			}
@@ -909,7 +909,7 @@  discard block
 block discarded – undo
 						$latitude = $spotter_item['latitude'];
 						$longitude = $spotter_item['longitude'];
 					}
-					$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude);
+					$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'], $latitude, $longitude);
 				} else $distance = '';
 				if ($distance != '') {
 					if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
@@ -952,19 +952,19 @@  discard block
 block discarded – undo
 				print '<span class="mobile">-</span>'."\n";
 			} else {
 				if ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
-					print '<span class="nomobile">'.round($spotter_item['distance'],2).' km</span>'."\n";
-					print '<span class="mobile">'.round($spotter_item['distance'],2).' km</span><br />'."\n";
+					print '<span class="nomobile">'.round($spotter_item['distance'], 2).' km</span>'."\n";
+					print '<span class="mobile">'.round($spotter_item['distance'], 2).' km</span><br />'."\n";
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-					print '<span class="nomobile">'.round($spotter_item['distance']*0.621371,2).' mi</span>'."\n";
-					print '<span class="mobile">'.round($spotter_item['distance']*0.621371,2).' mi</span><br />'."\n";
+					print '<span class="nomobile">'.round($spotter_item['distance']*0.621371, 2).' mi</span>'."\n";
+					print '<span class="mobile">'.round($spotter_item['distance']*0.621371, 2).' mi</span><br />'."\n";
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-					print '<span class="nomobile">'.round($spotter_item['distance']*0.539957,2).' nm</span>'."\n";
-					print '<span class="mobile">'.round($spotter_item['distance']*0.539957,2).' nm</span><br />'."\n";
+					print '<span class="nomobile">'.round($spotter_item['distance']*0.539957, 2).' nm</span>'."\n";
+					print '<span class="mobile">'.round($spotter_item['distance']*0.539957, 2).' nm</span><br />'."\n";
 				}
 			}
 			print '</td>'."\n";
 		}
-		if(strtolower($current_page) != "upcoming"){
+		if (strtolower($current_page) != "upcoming") {
 			if ($type == 'aircraft') {
 				//if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 				if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
@@ -1007,7 +1007,7 @@  discard block
 block discarded – undo
 		
 		if ($showRouteStop) {
 		// Route stop
-			if(strtolower($current_page) != "upcoming"){
+			if (strtolower($current_page) != "upcoming") {
 				print '<td class="route_stop">'."\n";
 				if (!isset($spotter_item['route_stop']) || $spotter_item['route_stop'] == '' || $spotter_item['route_stop'] == 'NULL') {
 					print '<span class="nomobile">-</span>'."\n";
@@ -1026,11 +1026,11 @@  discard block
 block discarded – undo
 		}
 		if ($showDuration) {
 		// Duration
-			if(strtolower($current_page) != "upcoming"){
+			if (strtolower($current_page) != "upcoming") {
 				print '<td class="duration">'."\n";
 				if (isset($spotter_item['duration'])) {
-					print '<span class="nomobile">'.gmdate('H:i:s',$spotter_item['duration']).'</span>'."\n";
-					print '<span class="mobile">'.gmdate('H:i:s',$spotter_item['duration']).'</span>'."\n";
+					print '<span class="nomobile">'.gmdate('H:i:s', $spotter_item['duration']).'</span>'."\n";
+					print '<span class="mobile">'.gmdate('H:i:s', $spotter_item['duration']).'</span>'."\n";
 				} else {
 					print '<span class="nomobile">-</span>'."\n";
 					print '<span class="mobile">-</span>'."\n";
@@ -1043,7 +1043,7 @@  discard block
 block discarded – undo
 	if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive") {
 		if (isset($spotter_item['decode']) && $spotter_item['decode'] != '') {
 			print '<td class="message"><p>'."\n";
-			print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']);
+			print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']);
 			print '</p><p class="decode">';
 			$decode_array = json_decode($spotter_item['decode']);
 			foreach ($decode_array as $key => $value) {
@@ -1053,7 +1053,7 @@  discard block
 block discarded – undo
 			print '</td>'."\n";
 		} else {
 			print '<td class="message">'."\n";
-			print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']);
+			print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']);
 			print '</td>'."\n";
 		}
 	}
@@ -1078,7 +1078,7 @@  discard block
 block discarded – undo
 		}
 		print '</td>'."\n";
 		print '<td class="message">'."\n";
-		print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']);
+		print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']);
 		print '</td>'."\n";
 	}
 	if (strtolower($current_page) == "incident-latest" || strtolower($current_page) == "incident-detailed") {
@@ -1104,7 +1104,7 @@  discard block
 block discarded – undo
 		print '</td>'."\n";
 		*/
 		print '<td class="message">'."\n";
-		print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']);
+		print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']);
 		print '</td>'."\n";
 	}
 

Please login to merge, or discard this patch.

js/map-marine.2d.js.php 3 patches

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

@@ -2,7 +2,7 @@  discard block
 block discarded – undo
 require_once('../require/settings.php');
 require_once('../require/class.Language.php'); 
 
-setcookie("MapFormat",'2d');
+setcookie("MapFormat", '2d');
 
 // Compressed GeoJson is used if true
 if (!isset($globalJsonCompress)) $compress = true;
@@ -16,10 +16,10 @@  discard block
 block discarded – undo
 
 <?php
 	if (isset($_GET['fammarine_id'])) {
-		$fammarine_id = filter_input(INPUT_GET,'fammarine_id',FILTER_SANITIZE_STRING);
+		$fammarine_id = filter_input(INPUT_GET, 'fammarine_id', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['ident'])) {
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	}
 	if (!isset($ident) && !isset($fammarine_id)) {
 ?>
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
 			    /*
 			    shadowUrl: iconURLShadowpath,
 			    shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
-			    shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
+			    shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
 			    */
 			})
 		    })
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}

Please login to merge, or discard this patch.

Braces +42 added lines, -10 removed lines patch added patch discarded remove patch

@@ -5,8 +5,11 @@  discard block
 block discarded – undo
 setcookie("MapFormat",'2d');
 
 // Compressed GeoJson is used if true
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 ?>
 
 
@@ -156,9 +159,13 @@  discard block
 block discarded – undo
 		    if (callsign != ""){ markerMarineLabel += callsign; }
 		    if (type != ""){ markerMarineLabel += ' - '+type; }
 <?php
-	if (isset($_COOKIE['MarineIconColor'])) $MarineIconColor = $_COOKIE['MarineIconColor'];
-	elseif (isset($globalMarineIconColor)) $MarineIconColor = $globalMarineIconColor;
-	else $MarineIconColor = '1a3151';
+	if (isset($_COOKIE['MarineIconColor'])) {
+		$MarineIconColor = $_COOKIE['MarineIconColor'];
+	} elseif (isset($globalMarineIconColor)) {
+		$MarineIconColor = $globalMarineIconColor;
+	} else {
+		$MarineIconColor = '1a3151';
+	}
 	if (!isset($ident) && !isset($fammarine_id)) {
 ?>
 		    //info_marine_update(feature.properties.fc);
@@ -193,7 +200,12 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -249,7 +261,12 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -304,7 +321,12 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -594,14 +616,24 @@  discard block
 block discarded – undo
 	if (isset($archive) && $archive) {
 ?>
 //then load it again every 30 seconds
-//  var reload = setInterval(function(){if (noTimeout) getLiveMarineData(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>);
+//  var reload = setInterval(function(){if (noTimeout) getLiveMarineData(0)},<?php if (isset($globalMapRefresh)) {
+	print ($globalMapRefresh*1000)/2;
+} else {
+	print '15000';
+}
+?>);
 reloadMarinePage = setInterval(function(){if (noTimeout) getLiveMarineData(0)},<?php print $archiveupdatetime*1000; ?>);
 <?php
 	} else {
 ?>
 //then load it again every 30 seconds
 reloadMarinePage = setInterval(
-    function(){if (noTimeout) getLiveMarineData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+    function(){if (noTimeout) getLiveMarineData(0)},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 <?php
 	}
 ?>

Please login to merge, or discard this patch.

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

@@ -553,8 +553,8 @@  discard block
 block discarded – undo
 			}
                     }
 		    <?php
-            		} else {
-            	    ?>
+					} else {
+					?>
 		    if (map.getZoom() > 7) {
                 	var style = {
                     	    "color": "#1a3151",
@@ -573,7 +573,7 @@  discard block
 block discarded – undo
                 	layer_marine_data.addLayer(layer);
 		    }
 <?php
-            		}
+					}
 ?>
 				}
 			    }
@@ -598,11 +598,11 @@  discard block
 block discarded – undo
 $( document ).ready(function() {
     map.on('moveend', function() {
 <?php
-    if (isset($globalMapUseBbox) && $globalMapUseBbox) {
+	if (isset($globalMapUseBbox) && $globalMapUseBbox) {
 ?>
 	getLiveMarineData(1);
 <?php
-    }
+	}
 ?>
     });
  //load the function on startup

Please login to merge, or discard this patch.

js/map-tracker.2d.js.php 3 patches

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

@@ -2,7 +2,7 @@  discard block
 block discarded – undo
 require_once('../require/settings.php');
 require_once('../require/class.Language.php'); 
 
-setcookie("MapFormat",'2d');
+setcookie("MapFormat", '2d');
 
 // Compressed GeoJson is used if true
 if (!isset($globalJsonCompress)) $compress = true;
@@ -17,10 +17,10 @@  discard block
 block discarded – undo
 
 <?php
 	if (isset($_GET['famtrackid'])) {
-		$famtrackid = filter_input(INPUT_GET,'famtrackid',FILTER_SANITIZE_STRING);
+		$famtrackid = filter_input(INPUT_GET, 'famtrackid', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['ident'])) {
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	}
 	if (!isset($ident) && !isset($famtrackid)) {
 ?>
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
 			    /*
 			    shadowUrl: iconURLShadowpath,
 			    shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
-			    shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
+			    shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
 			    */
 			})
 		    })
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}

Please login to merge, or discard this patch.

Braces +42 added lines, -10 removed lines patch added patch discarded remove patch

@@ -5,8 +5,11 @@  discard block
 block discarded – undo
 setcookie("MapFormat",'2d');
 
 // Compressed GeoJson is used if true
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 ?>
 
 
@@ -157,9 +160,13 @@  discard block
 block discarded – undo
 		    if (callsign != ""){ markerTrackerLabel += callsign; }
 		    if (type != ""){ markerTrackerLabel += ' - '+type; }
 <?php
-	if (isset($_COOKIE['TrackerIconColor'])) $IconColor = $_COOKIE['TrackerIconColor'];
-	elseif (isset($globalTrackerIconColor)) $IconColor = $globalTrackerIconColor;
-	else $IconColor = '1a3151';
+	if (isset($_COOKIE['TrackerIconColor'])) {
+		$IconColor = $_COOKIE['TrackerIconColor'];
+	} elseif (isset($globalTrackerIconColor)) {
+		$IconColor = $globalTrackerIconColor;
+	} else {
+		$IconColor = '1a3151';
+	}
 	if (!isset($ident) && !isset($famtrackid)) {
 ?>
 		    //info_tracker_update(feature.properties.fc);
@@ -193,7 +200,12 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -249,7 +261,12 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -304,7 +321,12 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -595,14 +617,24 @@  discard block
 block discarded – undo
 	if (isset($archive) && $archive) {
 ?>
 //then load it again every 30 seconds
-//  var reload = setInterval(function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>);
+//  var reload = setInterval(function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) {
+	print ($globalMapRefresh*1000)/2;
+} else {
+	print '15000';
+}
+?>);
 reloadTrackerPage = setInterval(function(){if (noTimeout) getLiveTrackerData(0)},<?php print $archiveupdatetime*1000; ?>);
 <?php
 	} else {
 ?>
 //then load it again every 30 seconds
 reloadTrackerPage = setInterval(
-    function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+    function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 <?php
 	}
 ?>

Please login to merge, or discard this patch.

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

@@ -554,8 +554,8 @@  discard block
 block discarded – undo
 			}
                     }
 		    <?php
-            		} else {
-            	    ?>
+					} else {
+					?>
 		    if (map.getZoom() > 7) {
                 	var style = {
                     	    "color": "#1a3151",
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
                 	layer_tracker_data.addLayer(layer);
 		    }
 <?php
-            		}
+					}
 ?>
 				}
 			    }
@@ -599,11 +599,11 @@  discard block
 block discarded – undo
 $( document ).ready(function() {
 	map.on('moveend', function() {
 <?php
-    if (isset($globalMapUseBbox) && $globalMapUseBbox) {
+	if (isset($globalMapUseBbox) && $globalMapUseBbox) {
 ?>
 		getLiveTrackerData(1);
 <?php
-    }
+	}
 ?>
 	});
  //load the function on startup

Please login to merge, or discard this patch.

statistics-country.php 3 patches

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

@@ -21,7 +21,7 @@
 block discarded – undo
 }
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
+	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
 
 require_once('header.php');

Please login to merge, or discard this patch.

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

@@ -19,7 +19,7 @@  discard block
 block discarded – undo
 } else {
 	$title = _("Statistics").' - '._("Most common Country a flight was over");
 }
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
 }
 
 if ($type == 'aircraft') {
-	$flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name);
+	$flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name);
 } elseif ($type == 'marine') {
 	$flightover_array = $Marine->countAllMarineOverCountries();
 } elseif ($type == 'tracker') {
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
 print '<div id="chart" class="chart" width="100%"></div><script>';
 print 'var series = [';
 $flightover_data = '';
-foreach($flightover_array as $flightover_item)
+foreach ($flightover_array as $flightover_item)
 {
 	if ($type == 'aircraft') $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
 	elseif ($type == 'marine') $flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],';
@@ -113,8 +113,8 @@  discard block
 block discarded – undo
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	array_splice($flightover_array,10);
-	foreach($flightover_array as $flightover_item)
+	array_splice($flightover_array, 10);
+	foreach ($flightover_array as $flightover_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

Braces +15 added lines, -7 removed lines patch added patch discarded remove patch

@@ -4,7 +4,9 @@  discard block
 block discarded – undo
 require_once('require/class.Language.php');
 $Stats = new Stats();
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $type = 'aircraft';
 if (isset($_GET['marine'])) {
 	$type = 'marine';
@@ -21,8 +23,10 @@  discard block
 block discarded – undo
 }
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 
 require_once('header.php');
 include('statistics-sub-menu.php'); 
@@ -64,10 +68,14 @@  discard block
 block discarded – undo
 $flightover_data = '';
 foreach($flightover_array as $flightover_item)
 {
-	if ($type == 'aircraft') $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
-	elseif ($type == 'marine') $flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],';
-	elseif ($type == 'tracker') $flightover_data .= '[ "'.$flightover_item['tracker_country_iso3'].'",'.$flightover_item['tracker_count'].'],';
-}
+	if ($type == 'aircraft') {
+		$flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
+	} elseif ($type == 'marine') {
+		$flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],';
+	} elseif ($type == 'tracker') {
+		$flightover_data .= '[ "'.$flightover_item['tracker_country_iso3'].'",'.$flightover_item['tracker_count'].'],';
+	}
+	}
 $flightover_data = substr($flightover_data, 0, -1);
 print $flightover_data;
 print '];';

Please login to merge, or discard this patch.

statistics-sub-menu.php 3 patches

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

@@ -37,7 +37,7 @@  discard block
 block discarded – undo
 ?>
 	</div>
 <?php 
-    if (!isset($year) || (isset($year) && $year == '') && !isset($month) || (isset($month) && $month == '')) {
+	if (!isset($year) || (isset($year) && $year == '') && !isset($month) || (isset($month) && $month == '')) {
 ?>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav">
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
 		    </ul>
 		</li>
 		<?php
-		    if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) {
+			if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) {
 		?>
 		<li class="dropdown">
 		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
 		    </ul>
 		</li>
 		<?php
-		    }
+			}
 		?>
 <?php
 	} elseif ($type == 'marine' || $type == 'tracker') {
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
 	</ul>
 </div>
 <?php
-    } else {
+	} else {
 ?>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav">
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
 		</li>
 		-->
 		<?php
-		    if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) {
+			if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) {
 		?>
 		<!--
 		<li class="dropdown">
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
 		</li>
 		-->
 		<?php
-		    }
+			}
 		?>
 <?php
 	} elseif ($type == 'marine' || $type == 'tracker') {
@@ -224,5 +224,5 @@  discard block
 block discarded – undo
 	</ul>
 </div>
 <?php
-    }
+	}
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Braces +110 added lines, -27 removed lines patch added patch discarded remove patch

@@ -6,7 +6,13 @@  discard block
 block discarded – undo
 	if (!isset($type) || $type != 'satellite') {
 ?>
 		<form id="changedate" method="post">
-			<input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') echo $year.'-'; ?><?php if (isset($month) && $month != '') echo $month; ?>" />
+			<input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') {
+	echo $year.'-';
+}
+?><?php if (isset($month) && $month != '') {
+	echo $month;
+}
+?>" />
 		</form>
 <?php
 	}
@@ -38,7 +44,9 @@  discard block
 block discarded – undo
 						print '<option disabled>──────────</option>';
 					}
 					$Stats = new Stats();
-					if (!isset($filter_name)) $filter_name = '';
+					if (!isset($filter_name)) {
+						$filter_name = '';
+					}
 					$airlines = $Stats->getAllAirlineNames($filter_name);
 					foreach($airlines as $airline) {
 						if (isset($airline_icao) && $airline_icao == $airline['airline_icao']) {
@@ -67,10 +75,22 @@  discard block
 block discarded – undo
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu">
-			<li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Aircraft"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Registration"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Manufacturer"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Country"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Aircraft"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Registration"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Manufacturer"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Country"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -81,12 +101,21 @@  discard block
 block discarded – undo
 <?php
 		if (!isset($airline_icao) || $airline_icao == 'all') {
 ?>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Airline"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Airline by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Airline"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Airline by Country"); ?></a></li>
 <?php
 		}
 ?>
-		      <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Callsign"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Callsign"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -94,10 +123,22 @@  discard block
 block discarded – undo
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Departure Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Arrival Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Departure Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Departure Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Arrival Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -105,8 +146,14 @@  discard block
 block discarded – undo
 		      <?php echo _("Route"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/statistics/route-airport<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Route by Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/route-waypoint<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Route by Waypoint"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/route-airport<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Route by Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/route-waypoint<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Route by Waypoint"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -114,8 +161,14 @@  discard block
 block discarded – undo
 		      <?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Date"); ?></a></li>
-			  <li><a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Time"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Date"); ?></a></li>
+			  <li><a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Time"); ?></a></li>
 		    </ul>
 		</li>
 		<?php
@@ -163,9 +216,18 @@  discard block
 block discarded – undo
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu">
-			<li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Aircraft"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Registration"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Manufacturer"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Aircraft"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Registration"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Manufacturer"); ?></a></li>
 			<!-- <li><a href="<?php print $globalURL; ?>/statistics/country"><?php echo _("Country"); ?></a></li> -->
 		    </ul>
 		</li>
@@ -177,12 +239,21 @@  discard block
 block discarded – undo
 <?php
 		if (!isset($airline_icao) || $airline_icao == 'all') {
 ?>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline by Country"); ?></a></li>
 <?php
 		}
 ?>
-		      <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Callsign"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Callsign"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -190,10 +261,22 @@  discard block
 block discarded – undo
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
 		<!--

Please login to merge, or discard this patch.

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

@@ -28,11 +28,11 @@  discard block
 block discarded – undo
 					$Spotter = new Spotter();
 					$alliances = $Spotter->getAllAllianceNames();
 					if (!empty($alliances)) {
-						foreach($alliances as $alliance) {
-							if (isset($airline_icao) && str_replace('_',' ',str_replace('alliance_','',$airline_icao)) == $alliance['alliance']) {
-								print '<option value="alliance_'.str_replace(' ','_',$alliance['alliance']).'" selected>'.$alliance['alliance'].'</option>';
+						foreach ($alliances as $alliance) {
+							if (isset($airline_icao) && str_replace('_', ' ', str_replace('alliance_', '', $airline_icao)) == $alliance['alliance']) {
+								print '<option value="alliance_'.str_replace(' ', '_', $alliance['alliance']).'" selected>'.$alliance['alliance'].'</option>';
 							} else {
-								print '<option value="alliance_'.str_replace(' ','_',$alliance['alliance']).'">'.$alliance['alliance'].'</option>';
+								print '<option value="alliance_'.str_replace(' ', '_', $alliance['alliance']).'">'.$alliance['alliance'].'</option>';
 							}
 						}
 						print '<option disabled>──────────</option>';
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
 					$Stats = new Stats();
 					if (!isset($filter_name)) $filter_name = '';
 					$airlines = $Stats->getAllAirlineNames($filter_name);
-					foreach($airlines as $airline) {
+					foreach ($airlines as $airline) {
 						if (isset($airline_icao) && $airline_icao == $airline['airline_icao']) {
 							print '<option value="'.$airline['airline_icao'].'" selected>'.$airline['airline_name'].'</option>';
 						} else {
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
 	if (!isset($type) || $type == 'aircraft') {
 ?>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#" >
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#" >
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu">
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airline"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Route"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
 		    if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) {
 		?>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Fatalities"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
 	} elseif ($type == 'marine' || $type == 'tracker') {
 ?>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 			<?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
 	if (!isset($type) || $type == 'aircraft') {
 ?>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#" >
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#" >
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu">
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airline"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
 		</li>
 		<!--
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Route"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
 		-->
 		<!--
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
 		?>
 		<!--
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Fatalities"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
 	} elseif ($type == 'marine' || $type == 'tracker') {
 ?>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">

Please login to merge, or discard this patch.

atc-data.php 3 patches

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

@@ -40,15 +40,15 @@
 block discarded – undo
 //print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
 print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],3).', '.round($spotter_item['longitude'],3).'</div>';
 if ($spotter_item['atc_range'] > 0) {
-    print '<div><span>'._("Range").'</span>';
-    print $spotter_item['atc_range'];
-    print '</div>';
+	print '<div><span>'._("Range").'</span>';
+	print $spotter_item['atc_range'];
+	print '</div>';
 }
 print '</div>';
 if ($spotter_item['info'] != '') {
-    print '<div class="notamtext"><span>'._("Info").'</span>';
-    print $spotter_item['info'];
-    print '</div>';
+	print '<div class="notamtext"><span>'._("Info").'</span>';
+	print $spotter_item['info'];
+	print '</div>';
 }
 print '</div>';
 }

Please login to merge, or discard this patch.

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

@@ -5,8 +5,8 @@  discard block
 block discarded – undo
 $ATC = new ATC();
 
 if (isset($_GET['atcid'])) {
-	$atcid = filter_input(INPUT_GET,'atcid',FILTER_SANITIZE_NUMBER_INT);
-	$atcident = filter_input(INPUT_GET,'atcident',FILTER_SANITIZE_STRING);
+	$atcid = filter_input(INPUT_GET, 'atcid', FILTER_SANITIZE_NUMBER_INT);
+	$atcident = filter_input(INPUT_GET, 'atcident', FILTER_SANITIZE_STRING);
 	$atc_data = $ATC->getById($atcid);
 	if (!isset($atc_data[0])) $atc_data = $ATC->getByIdent($atcident);
  ?>
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
 print '</div>';
 
 //print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
-print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],3).', '.round($spotter_item['longitude'],3).'</div>';
+print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'], 3).', '.round($spotter_item['longitude'], 3).'</div>';
 if ($spotter_item['atc_range'] > 0) {
     print '<div><span>'._("Range").'</span>';
     print $spotter_item['atc_range'];

Please login to merge, or discard this patch.

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

@@ -8,7 +8,9 @@
 block discarded – undo
 	$atcid = filter_input(INPUT_GET,'atcid',FILTER_SANITIZE_NUMBER_INT);
 	$atcident = filter_input(INPUT_GET,'atcident',FILTER_SANITIZE_STRING);
 	$atc_data = $ATC->getById($atcid);
-	if (!isset($atc_data[0])) $atc_data = $ATC->getByIdent($atcident);
+	if (!isset($atc_data[0])) {
+		$atc_data = $ATC->getByIdent($atcident);
+	}
  ?>
 <div class="alldetails">
 <button type="button" class="close">&times;</button>

Please login to merge, or discard this patch.

require/class.Elevation.php 3 patches

Doc Comments +11 added lines, -1 removed lines patch added patch discarded remove patch

@@ -52,6 +52,10 @@  discard block
 block discarded – undo
 		$this->openedFiles = [];
 	}
 
+	/**
+	 * @param double $row
+	 * @param double $column
+	 */
 	private function getElevationAtPosition($fileName, $row, $column) {
 		if (!array_key_exists($fileName, $this->openedFiles)) {
 			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
@@ -85,7 +89,7 @@  discard block
 block discarded – undo
 	 * @param float $lon
 	 * @param null  $fName
 	 *
-	 * @return mixed
+	 * @return double
 	 * @throws \Exception
 	 */
 	public function getElevation($lat, $lon, &$fName = null) {
@@ -142,6 +146,9 @@  discard block
 block discarded – undo
 		return $zN;
 	}
 
+	/**
+	 * @param integer $numPrefix
+	 */
 	private function getDeg($deg, $numPrefix) {
 		$deg = abs($deg);
 		$d   = floor($deg);     // round degrees
@@ -156,6 +163,9 @@  discard block
 block discarded – undo
 		return $d;
 	}
 
+	/**
+	 * @param double $deg
+	 */
 	private function getSec($deg) {
 		$deg = abs($deg);
 		$sec = round($deg * 3600, 4);

Please login to merge, or discard this patch.

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

@@ -28,7 +28,9 @@  discard block
 block discarded – undo
 	private $openedFiles = [];
 
 	public function __construct($htgFilesDestination = '', $resolution = 3) {
-		if ($htgFilesDestination == '') $htgFilesDestination = dirname(__FILE__).'/../data/';
+		if ($htgFilesDestination == '') {
+			$htgFilesDestination = dirname(__FILE__).'/../data/';
+		}
 		$this->htgFilesDestination = $htgFilesDestination;
 		$this->resolution          = $resolution;
 		switch ($resolution) {
@@ -171,16 +173,26 @@  discard block
 block discarded – undo
 		$fileName  = "N{$N}E{$E}.hgt";
 		if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
 			$Common = new Common();
-			if ($debug) echo 'Downloading '.$fileName.'.gz ...';
+			if ($debug) {
+				echo 'Downloading '.$fileName.'.gz ...';
+			}
 			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
 			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz')) {
-				if ($debug) echo "File '{$fileName}.gz' not exists.";
+				if ($debug) {
+					echo "File '{$fileName}.gz' not exists.";
+				}
 				return false;
 			}
-			if ($debug) echo 'Done'."\n";
-			if ($debug) echo 'Decompress '.$fileName.' ....';
+			if ($debug) {
+				echo 'Done'."\n";
+			}
+			if ($debug) {
+				echo 'Decompress '.$fileName.' ....';
+			}
 			$Common->gunzip($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName);
-			if ($debug) echo 'Done'."\n";
+			if ($debug) {
+				echo 'Done'."\n";
+			}
 			unlink($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
 		}
 		return true;

Please login to merge, or discard this patch.

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

@@ -41,7 +41,7 @@  discard block
 block discarded – undo
 			default:
 				throw new \Exception("bad resolution can be only one of 1,3");
 		}
-		register_shutdown_function(function () {
+		register_shutdown_function(function() {
 			$this->closeAllFiles();
 		});
 	}
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
 
 	private function getElevationAtPosition($fileName, $row, $column) {
 		if (!array_key_exists($fileName, $this->openedFiles)) {
-			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
+			if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
 				throw new \Exception("File '{$fileName}' not exists.");
 			}
-			$file = fopen($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName, "r");
+			$file = fopen($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName, "r");
 			if ($file === false) {
 				throw new \Exception("Cant open file '{$fileName}' for reading.");
 			}
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
 			throw new \Exception("Not implemented yet");
 		}
 		$aRow     = $this->measPerDeg - $row;
-		$position = ($this->measPerDeg * ($aRow - 1)) + $column;
+		$position = ($this->measPerDeg*($aRow - 1)) + $column;
 		$position *= 2;
 		fseek($file, $position);
 		$short  = fread($file, 2);
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
 		$latSec = $this->getSec($lat);
 		$lonSec = $this->getSec($lon);
 
-		$Xn = round($latSec / $this->resolution, 3);
-		$Yn = round($lonSec / $this->resolution, 3);
+		$Xn = round($latSec/$this->resolution, 3);
+		$Yn = round($lonSec/$this->resolution, 3);
 
 		$a1 = round($Xn);
 		$a2 = round($Yn);
@@ -133,55 +133,55 @@  discard block
 block discarded – undo
 		$b3 = $this->getElevationAtPosition($fName, $b1, $b2);
 		$c3 = $this->getElevationAtPosition($fName, $c1, $c2);
 
-		$n1 = ($c2 - $a2) * ($b3 - $a3) - ($c3 - $a3) * ($b2 - $a2);
-		$n2 = ($c3 - $a3) * ($b1 - $a1) - ($c1 - $a1) * ($b3 - $a3);
-		$n3 = ($c1 - $a1) * ($b2 - $a2) - ($c2 - $a2) * ($b1 - $a1);
+		$n1 = ($c2 - $a2)*($b3 - $a3) - ($c3 - $a3)*($b2 - $a2);
+		$n2 = ($c3 - $a3)*($b1 - $a1) - ($c1 - $a1)*($b3 - $a3);
+		$n3 = ($c1 - $a1)*($b2 - $a2) - ($c2 - $a2)*($b1 - $a1);
 
-		$d  = -$n1 * $a1 - $n2 * $a2 - $n3 * $a3;
-		$zN = (-$n1 * $Xn - $n2 * $Yn - $d) / $n3;
+		$d  = -$n1*$a1 - $n2*$a2 - $n3*$a3;
+		$zN = (-$n1*$Xn - $n2*$Yn - $d)/$n3;
 
 		return $zN;
 	}
 
 	private function getDeg($deg, $numPrefix) {
 		$deg = abs($deg);
-		$d   = floor($deg);     // round degrees
+		$d   = floor($deg); // round degrees
 		if ($numPrefix >= 3) {
 			if ($d < 100) {
-				$d = '0' . $d;
+				$d = '0'.$d;
 			}
 		} // pad with leading zeros
 		if ($d < 10) {
-			$d = '0' . $d;
+			$d = '0'.$d;
 		}
 		return $d;
 	}
 
 	private function getSec($deg) {
 		$deg = abs($deg);
-		$sec = round($deg * 3600, 4);
-		$m   = fmod(floor($sec / 60), 60);
+		$sec = round($deg*3600, 4);
+		$m   = fmod(floor($sec/60), 60);
 		$s   = round(fmod($sec, 60), 4);
-		return ($m * 60) + $s;
+		return ($m*60) + $s;
 	}
 
-	public function download($lat,$lon, $debug = false) {
+	public function download($lat, $lon, $debug = false) {
 		$N      = $this->getDeg($lat, 2);
 		$E      = $this->getDeg($lon, 3);
-		$fileName  = "N{$N}E{$E}.hgt";
-		if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
+		$fileName = "N{$N}E{$E}.hgt";
+		if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
 			$Common = new Common();
 			if ($debug) echo 'Downloading '.$fileName.'.gz ...';
-			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
-			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz')) {
+			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
+			if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz')) {
 				if ($debug) echo "File '{$fileName}.gz' not exists.";
 				return false;
 			}
 			if ($debug) echo 'Done'."\n";
 			if ($debug) echo 'Decompress '.$fileName.' ....';
-			$Common->gunzip($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName);
+			$Common->gunzip($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName);
 			if ($debug) echo 'Done'."\n";
-			unlink($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
+			unlink($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
 		}
 		return true;
 	}
@@ -194,22 +194,22 @@  discard block
 block discarded – undo
 		try {
 			$sth = $db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
-			$this->download($data['latitude'],$data['longitude'],true);
+			$this->download($data['latitude'], $data['longitude'], true);
 		}
 		$query = 'SELECT latitude, longitude FROM tracker_output WHERE latitude <> 0 AND longitude <> 0 ORDER BY date DESC LIMIT 10';
 		$query_values = array();
 		try {
 			$sth = $db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
-			$this->download($data['latitude'],$data['longitude'],true);
+			$this->download($data['latitude'], $data['longitude'], true);
 		}
 	}
 }

Please login to merge, or discard this patch.

aircraft-data.php 2 patches

Braces +51 added lines, -20 removed lines patch added patch discarded remove patch

@@ -57,7 +57,9 @@  discard block
 block discarded – undo
 {
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
 		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-	} else $image = $spotter_item['image_thumbnail'];
+	} else {
+		$image = $spotter_item['image_thumbnail'];
+	}
 
 }
 /* else {
@@ -70,8 +72,12 @@  discard block
 block discarded – undo
 }
 print '<div class="right">';
 print '<div class="callsign-details">';
-if ($spotter_item['ident'] != 'Not Available') print '<div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a></div>';
-if (isset($spotter_item['airline_name']) && $spotter_item['airline_name'] != 'Not Available') print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
+if ($spotter_item['ident'] != 'Not Available') {
+	print '<div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a></div>';
+}
+if (isset($spotter_item['airline_name']) && $spotter_item['airline_name'] != 'Not Available') {
+	print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
+}
 print '</div>';
 if ($spotter_item['departure_airport'] != 'NA' && $spotter_item['arrival_airport'] != 'NA') {
 	print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country'];
@@ -103,10 +109,16 @@  discard block
 block discarded – undo
 print '</div>';
 print '<div id="aircraft">';
 print '<span>'._("Aircraft").'</span>';
-if (isset($spotter_item['aircraft_wiki'])) print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
-if (isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
-elseif (isset($spotter_item['aircraft_type'])) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
-else print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
+if (isset($spotter_item['aircraft_wiki'])) {
+	print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
+}
+if (isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') {
+	print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
+} elseif (isset($spotter_item['aircraft_type'])) {
+	print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
+} else {
+	print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
+}
 print '</div>';
 print '<div id ="altitude"><span>'._("Altitude").'</span>';
 if (isset($globalGroundAltitude) && $globalGroundAltitude) {
@@ -117,12 +129,18 @@  discard block
 block discarded – undo
 }
 
 if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
-	if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') print $spotter_item['real_altitude'].' feet (FL'.$spotter_item['altitude'].')';
-	else print $spotter_item['altitude'].'00 feet (FL'.$spotter_item['altitude'].')';
-} else {
-	if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') print round($spotter_item['real_altitude']*0.3048).' m (FL'.$spotter_item['altitude'].')';
-	else print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
-}
+	if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
+		print $spotter_item['real_altitude'].' feet (FL'.$spotter_item['altitude'].')';
+	} else {
+		print $spotter_item['altitude'].'00 feet (FL'.$spotter_item['altitude'].')';
+	}
+	} else {
+	if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
+		print round($spotter_item['real_altitude']*0.3048).' m (FL'.$spotter_item['altitude'].')';
+	} else {
+		print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
+	}
+	}
 
 if (isset($groundAltitude) && $groundAltitude < $spotter_item['altitude']*30.48) {
 	print '<br>';
@@ -136,7 +154,9 @@  discard block
 block discarded – undo
 }
 
 print '</div>';
-if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
+if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') {
+	print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
+}
 print '<div id="speed"><span>'._("Speed").'</span>';
 if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) {
 	print round($spotter_item['ground_speed']*1.15078).' mph';
@@ -150,8 +170,11 @@  discard block
 block discarded – undo
 print '<div id="heading"><span>'._("Heading").'</span>'.$spotter_item['heading'].'°</div>';
 if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != '') {
 	print '<div id="pilot"><span>'._("Pilot").'</span>';
-	if (isset($spotter_item['pilot_id'])) print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
-	else print $spotter_item['pilot_name'];
+	if (isset($spotter_item['pilot_id'])) {
+		print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
+	} else {
+		print $spotter_item['pilot_name'];
+	}
 	print '</div>';
 }
 
@@ -179,10 +202,18 @@  discard block
 block discarded – undo
 print '</div>';
 print '</div>';
 
-if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
-if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
-if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
-if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
+if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') {
+	print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
+}
+if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') {
+	print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
+}
+if (isset($spotter_item['acars']['message'])) {
+	print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
+}
+if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) {
+	print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
+}
 print '</div>';
 ?>
 </div>
\ No newline at end of file

Please login to merge, or discard this patch.

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

@@ -11,14 +11,14 @@  discard block
 block discarded – undo
 
 $from_archive = false;
 if (isset($_GET['ident'])) {
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident,$currenttime);
+		$spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident, $currenttime);
 		if (empty($spotter_array)) {
 			$from_archive = true;
-			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident,$currenttime);
+			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident, $currenttime);
 		}
 	} else {
 		$spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident);
@@ -29,15 +29,15 @@  discard block
 block discarded – undo
 	}
 }
 if (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);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id,$currenttime);
+		$spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id, $currenttime);
 		if (empty($spotter_array)) {
 			$from_archive = true;
 //			$spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
-			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id,$currenttime);
+			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id, $currenttime);
 		}
 	} else {
 		$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "")
 {
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
-		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+		$image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 	} else $image = $spotter_item['image_thumbnail'];
 
 }
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
 	print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country'];
 	if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
 		if ($spotter_item['departure_airport_time'] > 2460) {
-			print '<br /><span class="time">'.date('H:m',$spotter_item['departure_airport_time']).'</span>';
+			print '<br /><span class="time">'.date('H:m', $spotter_item['departure_airport_time']).'</span>';
 		} else {
 			print '<br /><span class="time">'.$spotter_item['departure_airport_time'].'</span>';
 		}
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
 	print '<span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport'].'</a></span>'.$spotter_item['arrival_airport_city'].' '.$spotter_item['arrival_airport_country'];
 	if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
 		if ($spotter_item['arrival_airport_time'] > 2460) {
-			print '<br /><span class="time">'.date('H:m',$spotter_item['arrival_airport_time']).'</span>';
+			print '<br /><span class="time">'.date('H:m', $spotter_item['arrival_airport_time']).'</span>';
 		} else {
 			print '<br /><span class="time">'.$spotter_item['arrival_airport_time'].'</span>';
 		}
@@ -111,8 +111,8 @@  discard block
 block discarded – undo
 print '<div id ="altitude"><span>'._("Altitude").'</span>';
 if (isset($globalGroundAltitude) && $globalGroundAltitude) {
 	try {
-		$groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']);
-	} catch(Exception $e) {
+		$groundAltitude = $Elevation->getElevation($spotter_item['latitude'], $spotter_item['longitude']);
+	} catch (Exception $e) {
 		// If catched not exist
 	}
 }
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
 
 if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
 if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
-if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
+if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br/>', $spotter_item['acars']['message'])).'</div>';
 if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
 print '</div>';
 ?>

Please login to merge, or discard this patch.

require/class.GeoidHeight.php 3 patches

Doc Comments +4 added lines patch added patch discarded remove patch

		@@ -91,6 +91,10 @@
		block discarded – undo
91	91	$this->rlatres = (($this->height - 1) / 180.0);
92	92	}
93	93
	94	+ /**
	95	+ * @param integer $ix
	96	+ * @param integer $iy
	97	+ */
94	98	private function _rawval($ix,$iy) {
95	99	if (($iy < 0)) {
96	100	$iy = -$iy;

Please login to merge, or discard this patch.

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

		@@ -11,7 +11,7 @@ discard block
		block discarded – undo
11	11	* Translated to PHP of GeographicLib/src/Geoid.cpp
12	12	* by Ycarus <[email protected]> in 2017
13	13	*/
14		-class GeoidHeight {
	14	+class GeoidHeight {
15	15	private $c0 = 240;
16	16	private $c3 = [[9, -18, -88, 0, 96, 90, 0, 0, -60, -20], [-9, 18, 8, 0, -96, 30, 0, 0, 60, -20], [9, -88, -18, 90, 96, 0, -20, -60, 0, 0], [186, -42, -42, -150, -96, -150, 60, 60, 60, 60], [54, 162, -78, 30, -24, -90, -60, 60, -60, 60], [-9, -32, 18, 30, 24, 0, 20, -60, 0, 0], [-9, 8, 18, 30, -96, 0, -20, 60, 0, 0], [54, -78, 162, -90, -24, 30, 60, -60, 60, -60], [-54, 78, 78, 90, 144, 90, -60, -60, -60, -60], [9, -8, -18, -30, -24, 0, 20, 60, 0, 0], [-9, 18, -32, 0, 24, 30, 0, 0, -60, 20], [9, -18, -8, 0, -24, -30, 0, 0, 60, 20]];
17	17	private $c0n = 372;
		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	private $v10 = null;
35	35	private $v11 = null;
36	36
37		- public function __construct($name='') {
	37	+ public function __construct($name = '') {
38	38	global $globalGeoidSource;
39	39	//if ($name == '') $name = dirname(__FILE__).'/../install/tmp/egm2008-1.pgm';
40	40	if ($name == '') {
		@@ -42,35 +42,35 @@ discard block
		block discarded – undo
42	42	else $name = dirname(__FILE__).'/../data/egm96-15.pgm';
43	43	}
44	44
45		- $f = @fopen($name,"r");
	45	+ $f = @fopen($name, "r");
46	46	if ($f === FALSE) {
47	47	throw new Exception("Can't open ".$name);
48	48	}
49		- $line = fgets($f,4096);
	49	+ $line = fgets($f, 4096);
50	50	if (trim($line) != 'P5') {
51	51	throw new Exception('No PGM header');
52	52	}
53	53	$headerlen = strlen($line);
54	54	while (true) {
55		- $line = fgets($f,4096);
	55	+ $line = fgets($f, 4096);
56	56	if ((strlen($line) == 0)) {
57	57	throw new Exception('EOF before end of file header');
58	58	}
59	59	$headerlen += strlen($line);
60		- if (strpos($line,'# Offset ') !== FALSE) {
	60	+ if (strpos($line, '# Offset ') !== FALSE) {
61	61	$this->offset = substr($line, 9);
62		- } else if (strpos($line,'# Scale ') !== FALSE) {
	62	+ } else if (strpos($line, '# Scale ') !== FALSE) {
63	63	$this->scale = substr($line, 8);
64		- } else if ((strpos($line,'#') === FALSE)) {
65		- list($this->width, $this->height) = preg_split('/\s+/',$line);
	64	+ } else if ((strpos($line, '#') === FALSE)) {
	65	+ list($this->width, $this->height) = preg_split('/\s+/', $line);
66	66	break;
67	67	}
68	68	}
69		- $line = fgets($f,4096);
	69	+ $line = fgets($f, 4096);
70	70	$headerlen += strlen($line);
71		- $levels = (int)$line;
72		- $this->width = (int)$this->width;
73		- $this->height = (int)$this->height;
	71	+ $levels = (int) $line;
	72	+ $this->width = (int) $this->width;
	73	+ $this->height = (int) $this->height;
74	74	if (($levels != 65535)) {
75	75	throw new Exception('PGM file must have 65535 gray levels ('.$levels.')');
76	76	}
		@@ -85,42 +85,42 @@ discard block
		block discarded – undo
85	85	}
86	86
87	87	$fullsize = filesize($name);
88		- if ((($fullsize - $headerlen) != (($this->width * $this->height) * 2))) {
	88	+ if ((($fullsize - $headerlen) != (($this->width$this->height)2))) {
89	89	throw new Exception('File has the wrong length');
90	90	}
91	91
92	92	$this->headerlen = $headerlen;
93		- $this->raw= $f;
94		- $this->rlonres = ($this->width / 360.0);
95		- $this->rlatres = (($this->height - 1) / 180.0);
	93	+ $this->raw = $f;
	94	+ $this->rlonres = ($this->width/360.0);
	95	+ $this->rlatres = (($this->height - 1)/180.0);
96	96	}
97	97
98		- private function _rawval($ix,$iy) {
	98	+ private function _rawval($ix, $iy) {
99	99	if (($iy < 0)) {
100	100	$iy = -$iy;
101		- $ix += ($this->width / 2);
	101	+ $ix += ($this->width/2);
102	102	} else if (($iy >= $this->height)) {
103		- $iy = ((2 * ($this->height - 1)) - $iy);
104		- $ix += ($this->width / 2);
	103	+ $iy = ((2*($this->height - 1)) - $iy);
	104	+ $ix += ($this->width/2);
105	105	}
106	106	if (($ix < 0)) {
107	107	$ix += $this->width;
108	108	} else if (($ix >= $this->width)) {
109	109	$ix -= $this->width;
110	110	}
111		- $k = ((($iy * $this->width) + $ix) * 2) + $this->headerlen;
112		- fseek($this->raw,$k);
113		- return unpack('n',fread($this->raw,2))[1];
	111	+ $k = ((($iy$this->width) + $ix)2) + $this->headerlen;
	112	+ fseek($this->raw, $k);
	113	+ return unpack('n', fread($this->raw, 2))[1];
114	114	}
115	115
116		- public function get($lat,$lon,$cubic=true) {
	116	+ public function get($lat, $lon, $cubic = true) {
117	117	if (($lon < 0)) {
118	118	$lon += 360;
119	119	}
120		- $fy = ((90 - $lat) * $this->rlatres);
121		- $fx = ($lon * $this->rlonres);
122		- $iy = (int)$fy;
123		- $ix = (int)$fx;
	120	+ $fy = ((90 - $lat)*$this->rlatres);
	121	+ $fx = ($lon*$this->rlonres);
	122	+ $iy = (int) $fy;
	123	+ $ix = (int) $fx;
124	124	$fx -= $ix;
125	125	$fy -= $iy;
126	126	$t = array();
		@@ -147,7 +147,7 @@ discard block
		block discarded – undo
147	147	$c3x = $this->c3;
148	148	$c0x = $this->c0;
149	149	}
150		- for ($i = 0; $i < 10;++$i) {
	150	+ for ($i = 0; $i < 10; ++$i) {
151	151	$t[$i] = 0;
152	152	for ($j = 0; $j < 12; ++$j) {
153	153	$t[$i] += $v[$j]*$c3x[$j][$i];
		@@ -158,13 +158,13 @@ discard block
		block discarded – undo
158	158	$this->t = $t;
159	159	} else $t = $this->t;
160	160	if (!($cubic)) {
161		- $a = (((1 - $fx) * $this->v00) + ($fx * $this->v01));
162		- $b = (((1 - $fx) * $this->v10) + ($fx * $this->v11));
163		- $h = (((1 - $fy) * $a) + ($fy * $b));
	161	+ $a = (((1 - $fx)$this->v00) + ($fx$this->v01));
	162	+ $b = (((1 - $fx)$this->v10) + ($fx$this->v11));
	163	+ $h = (((1 - $fy)$a) + ($fy$b));
164	164	} else {
165		- $h = (($t[0] + ($fx * ($t[1] + ($fx * ($t[3] + ($fx * $t[6])))))) + ($fy * (($t[2] + ($fx * ($t[4] + ($fx * $t[7])))) + ($fy * (($t[5] + ($fx * $t[8])) + ($fy * $t[9]))))));
	165	+ $h = (($t[0] + ($fx($t[1] + ($fx($t[3] + ($fx$t[6])))))) + ($fy(($t[2] + ($fx($t[4] + ($fx$t[7])))) + ($fy(($t[5] + ($fx$t[8])) + ($fy*$t[9]))))));
166	166	}
167		- return ((float)$this->offset + ((float)$this->scale * (float)$h));
	167	+ return ((float) $this->offset + ((float) $this->scale*(float) $h));
168	168	}
169	169	}
170	170	/*

Please login to merge, or discard this patch.

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

@@ -38,8 +38,11 @@  discard block
 block discarded – undo
 		global $globalGeoidSource;
 		//if ($name == '') $name = dirname(__FILE__).'/../install/tmp/egm2008-1.pgm';
 		if ($name == '') {
-			if (isset($globalGeoidSource) && $globalGeoidSource != '') $name = dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm';
-			else $name = dirname(__FILE__).'/../data/egm96-15.pgm';
+			if (isset($globalGeoidSource) && $globalGeoidSource != '') {
+				$name = dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm';
+			} else {
+				$name = dirname(__FILE__).'/../data/egm96-15.pgm';
+			}
 		}
 
 		$f = @fopen($name,"r");
@@ -156,7 +159,9 @@  discard block
 block discarded – undo
 				}
 			}
 			$this->t = $t;
-		} else $t = $this->t;
+		} else {
+			$t = $this->t;
+		}
 		if (!($cubic)) {
 			$a = (((1 - $fx) * $this->v00) + ($fx * $this->v01));
 			$b = (((1 - $fx) * $this->v10) + ($fx * $this->v11));

Please login to merge, or discard this patch.

		@@ -7,7 +7,9 @@ discard block
		block discarded – undo
7	7	$showRouteStop = $Common->multiKeyExists($spotter_array,'route_stop');
8	8	$showDuration = $Common->multiKeyExists($spotter_array,'duration');
9	9
10		-if (!isset($type)) $type = 'aircraft';
	10	+if (!isset($type)) {
	11	+ $type = 'aircraft';
	12	+}
11	13
12	14	if (!isset($_GET['sort']))
13	15	{
		@@ -440,7 +442,9 @@ discard block
		block discarded – undo
440	442	if (isset($globalTimezone))
441	443	{
442	444	date_default_timezone_set($globalTimezone);
443		- } else date_default_timezone_set('UTC');
	445	+ } else {
	446	+ date_default_timezone_set('UTC');
	447	+ }
444	448	if ($showSpecial === true)
445	449	{
446	450	print '<tr class="special">'."\n";
		@@ -455,7 +459,9 @@ discard block
		block discarded – undo
455	459	print '<tr class="active">';
456	460	} elseif (isset($spotter_item['spotted_registration'])) {
457	461	print '<tr class="info">';
458		- } else print '<tr>';
	462	+ } else {
	463	+ print '<tr>';
	464	+ }
459	465	}
460	466	if (strtolower($current_page) == "acars-latest" \|\| strtolower($current_page) == "acars-archive" \|\| strtolower($current_page) == "currently" \|\| strtolower($current_page) == "accident-latest" \|\| strtolower($current_page) == "incident-latest" \|\| strtolower($current_page) == "accident-detailed" \|\| strtolower($current_page) == "incident-detailed") {
461	467	if ($type == 'aircraft') {
		@@ -463,8 +469,9 @@ discard block
		block discarded – undo
463	469	{
464	470	print '<td class="aircraft_thumbnail">'."\n";
465	471	if ($spotter_item['image_source'] == 'planespotters') {
466		- if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
467		- else {
	472	+ if ($spotter_item['image_source_website'] != '') {
	473	+ $image_src = $spotter_item['image_source_website'];
	474	+ } else {
468	475	$planespotter_url_array = explode("_", $spotter_item['image']);
469	476	$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
470	477	$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
		@@ -477,7 +484,9 @@ discard block
		block discarded – undo
477	484	} else {
478	485	if ($spotter_item['image_source'] == 'wikimedia' \|\| $spotter_item['image_source'] == 'devianart' \|\| $spotter_item['image_source'] == 'flickr') {
479	486	$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
480		- } else $image_thumbnail = $spotter_item['image_thumbnail'];
	487	+ } else {
	488	+ $image_thumbnail = $spotter_item['image_thumbnail'];
	489	+ }
481	490	if (isset($spotter_item['airline_name'])) {
482	491	print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>';
483	492	} else {
		@@ -496,7 +505,9 @@ discard block
		block discarded – undo
496	505	print '<td class="aircraft_thumbnail">'."\n";
497	506	if ($spotter_item['image_source'] == 'wikimedia' \|\| $spotter_item['image_source'] == 'devianart' \|\| $spotter_item['image_source'] == 'flickr') {
498	507	$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
499		- } else $image_thumbnail = $spotter_item['image_thumbnail'];
	508	+ } else {
	509	+ $image_thumbnail = $spotter_item['image_thumbnail'];
	510	+ }
500	511	if (isset($spotter_item['airline_name'])) {
501	512	print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['mmsi'].'" alt="'.$spotter_item['mmsi'].'" data-content="'._("MMSI:").' '.$spotter_item['mmsi'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>';
502	513	} else {
		@@ -514,7 +525,9 @@ discard block
		block discarded – undo
514	525	print '<td class="aircraft_thumbnail">'."\n";
515	526	if ($spotter_item['image_source'] == 'wikimedia' \|\| $spotter_item['image_source'] == 'devianart' \|\| $spotter_item['image_source'] == 'flickr') {
516	527	$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
517		- } else $image_thumbnail = $spotter_item['image_thumbnail'];
	528	+ } else {
	529	+ $image_thumbnail = $spotter_item['image_thumbnail'];
	530	+ }
518	531	print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['ident'].'" alt="'.$spotter_item['type'].'" data-content="'._("Type:").' '.$spotter_item['type'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>';
519	532	print '</td>'."\n";
520	533	} else {
		@@ -565,8 +578,9 @@ discard block
		block discarded – undo
565	578	print '<td class="aircraft_thumbnail">'."\n";
566	579	//print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
567	580	if ($spotter_item['image_source'] == 'planespotters') {
568		- if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
569		- else {
	581	+ if ($spotter_item['image_source_website'] != '') {
	582	+ $image_src = $spotter_item['image_source_website'];
	583	+ } else {
570	584	$planespotter_url_array = explode("_", $spotter_array[0]['image']);
571	585	$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
572	586	$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
		@@ -583,7 +597,9 @@ discard block
		block discarded – undo
583	597	} else {
584	598	if ($spotter_item['image_source'] == 'wikimedia' \|\| $spotter_item['image_source'] == 'devianart' \|\| $spotter_item['image_source'] == 'flickr') {
585	599	$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
586		- } else $image_thumbnail = $spotter_item['image_thumbnail'];
	600	+ } else {
	601	+ $image_thumbnail = $spotter_item['image_thumbnail'];
	602	+ }
587	603	if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
588	604	print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>';
589	605	} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
		@@ -616,7 +632,9 @@ discard block
		block discarded – undo
616	632	print '<td class="aircraft_thumbnail">'."\n";
617	633	if ($spotter_item['image_source'] == 'wikimedia' \|\| $spotter_item['image_source'] == 'devianart' \|\| $spotter_item['image_source'] == 'flickr') {
618	634	$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
619		- } else $image_thumbnail = $spotter_item['image_thumbnail'];
	635	+ } else {
	636	+ $image_thumbnail = $spotter_item['image_thumbnail'];
	637	+ }
620	638	print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['mmsi'].'" alt="'.$spotter_item['mmsi'].'" data-content="'._("MMSI:").' '.$spotter_item['mmsi'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>';
621	639	print '</td>'."\n";
622	640	} else {
		@@ -630,7 +648,9 @@ discard block
		block discarded – undo
630	648	print '<td class="aircraft_thumbnail">'."\n";
631	649	if ($spotter_item['image_source'] == 'wikimedia' \|\| $spotter_item['image_source'] == 'devianart' \|\| $spotter_item['image_source'] == 'flickr') {
632	650	$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
633		- } else $image_thumbnail = $spotter_item['image_thumbnail'];
	651	+ } else {
	652	+ $image_thumbnail = $spotter_item['image_thumbnail'];
	653	+ }
634	654	print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['ident'].'" alt="'.$spotter_item['type'].'" data-content="'._("Type:").' '.$spotter_item['type'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>';
635	655	print '</td>'."\n";
636	656	} else {
		@@ -783,15 +803,21 @@ discard block
		block discarded – undo
783	803	if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) {
784	804	if ($spotter_item['departure_airport_time'] > 2460) {
785	805	$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
786		- } else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
	806	+ } else {
	807	+ $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
	808	+ }
787	809	if ($spotter_item['real_departure_airport_time'] > 2460) {
788	810	$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
789		- } else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
	811	+ } else {
	812	+ $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
	813	+ }
790	814	print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n";
791	815	} elseif (isset($spotter_item['real_departure_airport_time']) && $spotter_item['real_departure_airport_time'] != 'NULL') {
792	816	if ($spotter_item['real_departure_airport_time'] > 2460) {
793	817	$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
794		- } else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
	818	+ } else {
	819	+ $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
	820	+ }
795	821	print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n";
796	822	} elseif (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
797	823	if ($spotter_item['departure_airport_time'] > 2460) {
		@@ -813,7 +839,9 @@ discard block
		block discarded – undo
813	839	$longitude = $spotter_item['longitude'];
814	840	}
815	841	$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
816		- } else $distance = '';
	842	+ } else {
	843	+ $distance = '';
	844	+ }
817	845	if ($distance != '') {
818	846	if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') \|\| (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
819	847	echo '<br/><i>'.round($distance*0.539957).' nm</i>';
		@@ -840,7 +868,9 @@ discard block
		block discarded – undo
840	868	} else {
841	869	if (isset($spotter_item['real_arrival_airport']) && $spotter_item['real_arrival_airport'] != $spotter_item['arrival_airport']) {
842	870	print '<span class="nomobile">Scheduled : <a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a></span>'."\n";
843		- if (!isset($Spotter)) $Spotter = new Spotter();
	871	+ if (!isset($Spotter)) {
	872	+ $Spotter = new Spotter();
	873	+ }
844	874	$arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['real_arrival_airport']);
845	875	print '<br /><span class="nomobile">'._("Real:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$arrival_airport_info[0]['city'].','.$arrival_airport_info[0]['country'].' ('.$spotter_item['real_arrival_airport'].')</a></span>'."\n";
846	876	print '<span class="mobile">'._("Scheduled:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$spotter_item['real_arrival_airport'].'</a></span>'."\n";
		@@ -856,20 +886,28 @@ discard block
		block discarded – undo
856	886	if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) {
857	887	if ($spotter_item['arrival_airport_time'] > 2460) {
858	888	$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
859		- } else $arrival_airport_time = $spotter_item['arrival_airport_time'];
	889	+ } else {
	890	+ $arrival_airport_time = $spotter_item['arrival_airport_time'];
	891	+ }
860	892	if ($spotter_item['real_arrival_airport_time'] > 2460) {
861	893	$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
862		- } else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
	894	+ } else {
	895	+ $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
	896	+ }
863	897	print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n";
864	898	} elseif (isset($spotter_item['real_arrival_airport_time'])) {
865	899	if ($spotter_item['real_arrival_airport_time'] > 2460) {
866	900	$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
867		- } else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
	901	+ } else {
	902	+ $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
	903	+ }
868	904	print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n";
869	905	} elseif (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
870	906	if ($spotter_item['arrival_airport_time'] > 2460) {
871	907	$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
872		- } else $arrival_airport_time = $spotter_item['arrival_airport_time'];
	908	+ } else {
	909	+ $arrival_airport_time = $spotter_item['arrival_airport_time'];
	910	+ }
873	911	print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n";
874	912	}
875	913	if (!isset($spotter_item['real_arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
		@@ -882,7 +920,9 @@ discard block
		block discarded – undo
882	920	$longitude = $spotter_item['longitude'];
883	921	}
884	922	$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude);
885		- } else $distance = '';
	923	+ } else {
	924	+ $distance = '';
	925	+ }
886	926	if ($distance != '') {
887	927	if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') \|\| (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
888	928	echo '<br/><i>'.round($distance*0.539957).' nm</i>';

		@@ -277,7 +277,7 @@ discard block
		block discarded – undo
277	277	print '<th class="arrival"><span class="nomobile">'._("Going to").'</span><span class="mobile">'._("To").'</span></th>';
278	278	}
279	279	}
280		- if ($type == 'aircraft') {
	280	+ if ($type == 'aircraft') {
281	281	if ((isset($globalUsePilot) && $globalUsePilot) \|\| (!isset($globalUsePilot) && ((isset($globalVA) && $globalVA) \|\| (isset($globalIVAO) && $globalIVAO) \|\| (isset($globalVATSIM) && $globalVATSIM) \|\| (isset($globalVAM) && $globalVAM) \|\| (isset($globalphpVMS) && $globalphpVMS)))) {
282	282	print '<th class="pilot"><span class="nomobile">'._("Pilot name").'</span><span class="mobile">'._("Pilot").'</span></a></th>';
283	283	}
		@@ -579,7 +579,7 @@ discard block
		block discarded – undo
579	579	} elseif(strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest" && strtolower($current_page) != "accident-detailed" && strtolower($current_page) != "incident-detailed"){
580	580	if ($type == 'aircraft') {
581	581	if (!isset($spotter_item['squawk']) \|\| $spotter_item['squawk'] == 0) {
582		- $spotter_item['squawk'] = '-';
	582	+ $spotter_item['squawk'] = '-';
583	583	}
584	584	if ($spotter_item['image_thumbnail'] != "")
585	585	{
		@@ -618,7 +618,7 @@ discard block
		block discarded – undo
618	618	print '</td>'."\n";
619	619	} else {
620	620	print '<td class="aircraft_thumbnail">'."\n";
621		- // print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
	621	+ // print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
622	622	//}
623	623	if (!isset($spotter_item['airline_name']) && !isset($spotter_item['aircraft_name'])) {
624	624	print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '._("Not available").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n";

		@@ -2,7 +2,7 @@ discard block
		block discarded – undo
2	2	require_once('../require/settings.php');
3	3	require_once('../require/class.Language.php');
4	4
5		-setcookie("MapFormat",'2d');
	5	+setcookie("MapFormat", '2d');
6	6
7	7	// Compressed GeoJson is used if true
8	8	if (!isset($globalJsonCompress)) $compress = true;
		@@ -16,10 +16,10 @@ discard block
		block discarded – undo
16	16
17	17	<?php
18	18	if (isset($_GET['fammarine_id'])) {
19		- $fammarine_id = filter_input(INPUT_GET,'fammarine_id',FILTER_SANITIZE_STRING);
	19	+ $fammarine_id = filter_input(INPUT_GET, 'fammarine_id', FILTER_SANITIZE_STRING);
20	20	}
21	21	if (isset($_GET['ident'])) {
22		- $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
	22	+ $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
23	23	}
24	24	if (!isset($ident) && !isset($fammarine_id)) {
25	25	?>
		@@ -182,7 +182,7 @@ discard block
		block discarded – undo
182	182	<?php
183	183	} else {
184	184	?>
185		- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000+20000; ?>+feature.properties.sqt*1000);
	185	+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000 + 20000; ?>+feature.properties.sqt*1000);
186	186	return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
187	187	<?php
188	188	}
		@@ -198,7 +198,7 @@ discard block
		block discarded – undo
198	198	/*
199	199	shadowUrl: iconURLShadowpath,
200	200	shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
201		- shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
	201	+ shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
202	202	*/
203	203	})
204	204	})
		@@ -231,7 +231,7 @@ discard block
		block discarded – undo
231	231	<?php
232	232	} else {
233	233	?>
234		- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000+20000; ?>+feature.properties.sqt*1000);
	234	+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000 + 20000; ?>+feature.properties.sqt*1000);
235	235	return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
236	236	<?php
237	237	}
		@@ -279,7 +279,7 @@ discard block
		block discarded – undo
279	279	<?php
280	280	} else {
281	281	?>
282		- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000+20000; ?>+feature.properties.sqt*1000);
	282	+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000 + 20000; ?>+feature.properties.sqt*1000);
283	283	return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
284	284	<?php
285	285	}

		@@ -5,8 +5,11 @@ discard block
		block discarded – undo
5	5	setcookie("MapFormat",'2d');
6	6
7	7	// Compressed GeoJson is used if true
8		-if (!isset($globalJsonCompress)) $compress = true;
9		-else $compress = $globalJsonCompress;
	8	+if (!isset($globalJsonCompress)) {
	9	+ $compress = true;
	10	+} else {
	11	+ $compress = $globalJsonCompress;
	12	+}
10	13	?>
11	14
12	15
		@@ -156,9 +159,13 @@ discard block
		block discarded – undo
156	159	if (callsign != ""){ markerMarineLabel += callsign; }
157	160	if (type != ""){ markerMarineLabel += ' - '+type; }
158	161	<?php
159		- if (isset($_COOKIE['MarineIconColor'])) $MarineIconColor = $_COOKIE['MarineIconColor'];
160		- elseif (isset($globalMarineIconColor)) $MarineIconColor = $globalMarineIconColor;
161		- else $MarineIconColor = '1a3151';
	162	+ if (isset($_COOKIE['MarineIconColor'])) {
	163	+ $MarineIconColor = $_COOKIE['MarineIconColor'];
	164	+ } elseif (isset($globalMarineIconColor)) {
	165	+ $MarineIconColor = $globalMarineIconColor;
	166	+ } else {
	167	+ $MarineIconColor = '1a3151';
	168	+ }
162	169	if (!isset($ident) && !isset($fammarine_id)) {
163	170	?>
164	171	//info_marine_update(feature.properties.fc);
		@@ -193,7 +200,12 @@ discard block
		block discarded – undo
193	200	<?php
194	201	} else {
195	202	?>
196		- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000+20000; ?>+feature.properties.sqt*1000);
	203	+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
	204	+ print $archiveupdatetime*1000;
	205	+} else {
	206	+ print $globalMapRefresh*1000+20000;
	207	+}
	208	+?>+feature.properties.sqt*1000);
197	209	return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
198	210	<?php
199	211	}
		@@ -249,7 +261,12 @@ discard block
		block discarded – undo
249	261	<?php
250	262	} else {
251	263	?>
252		- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000+20000; ?>+feature.properties.sqt*1000);
	264	+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
	265	+ print $archiveupdatetime*1000;
	266	+} else {
	267	+ print $globalMapRefresh*1000+20000;
	268	+}
	269	+?>+feature.properties.sqt*1000);
253	270	return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
254	271	<?php
255	272	}
		@@ -304,7 +321,12 @@ discard block
		block discarded – undo
304	321	<?php
305	322	} else {
306	323	?>
307		- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000+20000; ?>+feature.properties.sqt*1000);
	324	+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
	325	+ print $archiveupdatetime*1000;
	326	+} else {
	327	+ print $globalMapRefresh*1000+20000;
	328	+}
	329	+?>+feature.properties.sqt*1000);
308	330	return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
309	331	<?php
310	332	}
		@@ -594,14 +616,24 @@ discard block
		block discarded – undo
594	616	if (isset($archive) && $archive) {
595	617	?>
596	618	//then load it again every 30 seconds
597		-// var reload = setInterval(function(){if (noTimeout) getLiveMarineData(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>);
	619	+// var reload = setInterval(function(){if (noTimeout) getLiveMarineData(0)},<?php if (isset($globalMapRefresh)) {
	620	+ print ($globalMapRefresh*1000)/2;
	621	+} else {
	622	+ print '15000';
	623	+}
	624	+?>);
598	625	reloadMarinePage = setInterval(function(){if (noTimeout) getLiveMarineData(0)},<?php print $archiveupdatetime*1000; ?>);
599	626	<?php
600	627	} else {
601	628	?>
602	629	//then load it again every 30 seconds
603	630	reloadMarinePage = setInterval(
604		- function(){if (noTimeout) getLiveMarineData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
	631	+ function(){if (noTimeout) getLiveMarineData(0)},<?php if (isset($globalMapRefresh)) {
	632	+ print $globalMapRefresh*1000;
	633	+} else {
	634	+ print '30000';
	635	+}
	636	+?>);
605	637	<?php
606	638	}
607	639	?>

		@@ -553,8 +553,8 @@ discard block
		block discarded – undo
553	553	}
554	554	}
555	555	<?php
556		- } else {
557		- ?>
	556	+ } else {
	557	+ ?>
558	558	if (map.getZoom() > 7) {
559	559	var style = {
560	560	"color": "#1a3151",
		@@ -573,7 +573,7 @@ discard block
		block discarded – undo
573	573	layer_marine_data.addLayer(layer);
574	574	}
575	575	<?php
576		- }
	576	+ }
577	577	?>
578	578	}
579	579	}
		@@ -598,11 +598,11 @@ discard block
		block discarded – undo
598	598	$( document ).ready(function() {
599	599	map.on('moveend', function() {
600	600	<?php
601		- if (isset($globalMapUseBbox) && $globalMapUseBbox) {
	601	+ if (isset($globalMapUseBbox) && $globalMapUseBbox) {
602	602	?>
603	603	getLiveMarineData(1);
604	604	<?php
605		- }
	605	+ }
606	606	?>
607	607	});
608	608	//load the function on startup

		@@ -554,8 +554,8 @@ discard block
		block discarded – undo
554	554	}
555	555	}
556	556	<?php
557		- } else {
558		- ?>
	557	+ } else {
	558	+ ?>
559	559	if (map.getZoom() > 7) {
560	560	var style = {
561	561	"color": "#1a3151",
		@@ -574,7 +574,7 @@ discard block
		block discarded – undo
574	574	layer_tracker_data.addLayer(layer);
575	575	}
576	576	<?php
577		- }
	577	+ }
578	578	?>
579	579	}
580	580	}
		@@ -599,11 +599,11 @@ discard block
		block discarded – undo
599	599	$( document ).ready(function() {
600	600	map.on('moveend', function() {
601	601	<?php
602		- if (isset($globalMapUseBbox) && $globalMapUseBbox) {
	602	+ if (isset($globalMapUseBbox) && $globalMapUseBbox) {
603	603	?>
604	604	getLiveTrackerData(1);
605	605	<?php
606		- }
	606	+ }
607	607	?>
608	608	});
609	609	//load the function on startup

		@@ -21,7 +21,7 @@
		block discarded – undo
21	21	}
22	22	$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
23	23	if ($airline_icao == '' && isset($globalFilter)) {
24		- if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
	24	+ if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
25	25	}
26	26
27	27	require_once('header.php');

		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19	} else {
20	20	$title = _("Statistics").' - '._("Most common Country a flight was over");
21	21	}
22		-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
	22	+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
23	23	if ($airline_icao == '' && isset($globalFilter)) {
24	24	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
25	25	}
		@@ -48,7 +48,7 @@ discard block
		block discarded – undo
48	48	}
49	49
50	50	if ($type == 'aircraft') {
51		- $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name);
	51	+ $flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name);
52	52	} elseif ($type == 'marine') {
53	53	$flightover_array = $Marine->countAllMarineOverCountries();
54	54	} elseif ($type == 'tracker') {
		@@ -62,7 +62,7 @@ discard block
		block discarded – undo
62	62	print '<div id="chart" class="chart" width="100%"></div><script>';
63	63	print 'var series = [';
64	64	$flightover_data = '';
65		-foreach($flightover_array as $flightover_item)
	65	+foreach ($flightover_array as $flightover_item)
66	66	{
67	67	if ($type == 'aircraft') $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
68	68	elseif ($type == 'marine') $flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],';
		@@ -113,8 +113,8 @@ discard block
		block discarded – undo
113	113	print '</thead>';
114	114	print '<tbody>';
115	115	$i = 1;
116		- array_splice($flightover_array,10);
117		- foreach($flightover_array as $flightover_item)
	116	+ array_splice($flightover_array, 10);
	117	+ foreach ($flightover_array as $flightover_item)
118	118	{
119	119	print '<tr>';
120	120	print '<td><strong>'.$i.'</strong></td>';

		@@ -4,7 +4,9 @@ discard block
		block discarded – undo
4	4	require_once('require/class.Language.php');
5	5	$Stats = new Stats();
6	6
7		-if (!isset($filter_name)) $filter_name = '';
	7	+if (!isset($filter_name)) {
	8	+ $filter_name = '';
	9	+}
8	10	$type = 'aircraft';
9	11	if (isset($_GET['marine'])) {
10	12	$type = 'marine';
		@@ -21,8 +23,10 @@ discard block
		block discarded – undo
21	23	}
22	24	$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
23	25	if ($airline_icao == '' && isset($globalFilter)) {
24		- if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
25		-}
	26	+ if (isset($globalFilter['airline'])) {
	27	+ $airline_icao = $globalFilter['airline'][0];
	28	+ }
	29	+ }
26	30
27	31	require_once('header.php');
28	32	include('statistics-sub-menu.php');
		@@ -64,10 +68,14 @@ discard block
		block discarded – undo
64	68	$flightover_data = '';
65	69	foreach($flightover_array as $flightover_item)
66	70	{
67		- if ($type == 'aircraft') $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
68		- elseif ($type == 'marine') $flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],';
69		- elseif ($type == 'tracker') $flightover_data .= '[ "'.$flightover_item['tracker_country_iso3'].'",'.$flightover_item['tracker_count'].'],';
70		-}
	71	+ if ($type == 'aircraft') {
	72	+ $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
	73	+ } elseif ($type == 'marine') {
	74	+ $flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],';
	75	+ } elseif ($type == 'tracker') {
	76	+ $flightover_data .= '[ "'.$flightover_item['tracker_country_iso3'].'",'.$flightover_item['tracker_count'].'],';
	77	+ }
	78	+ }
71	79	$flightover_data = substr($flightover_data, 0, -1);
72	80	print $flightover_data;
73	81	print '];';

		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	?>
38	38	</div>
39	39	<?php
40		- if (!isset($year) \|\| (isset($year) && $year == '') && !isset($month) \|\| (isset($month) && $month == '')) {
	40	+ if (!isset($year) \|\| (isset($year) && $year == '') && !isset($month) \|\| (isset($month) && $month == '')) {
41	41	?>
42	42	<div class="sub-menu sub-menu-container">
43	43	<ul class="nav">
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	</ul>
96	96	</li>
97	97	<?php
98		- if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) \|\| $airline_icao == '' \|\| $airline_icao == 'all')) {
	98	+ if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) \|\| $airline_icao == '' \|\| $airline_icao == 'all')) {
99	99	?>
100	100	<li class="dropdown">
101	101	<a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" \|\| strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107	</ul>
108	108	</li>
109	109	<?php
110		- }
	110	+ }
111	111	?>
112	112	<?php
113	113	} elseif ($type == 'marine' \|\| $type == 'tracker') {
		@@ -127,7 +127,7 @@ discard block
		block discarded – undo
127	127	</ul>
128	128	</div>
129	129	<?php
130		- } else {
	130	+ } else {
131	131	?>
132	132	<div class="sub-menu sub-menu-container">
133	133	<ul class="nav">
		@@ -189,7 +189,7 @@ discard block
		block discarded – undo
189	189	</li>
190	190	-->
191	191	<?php
192		- if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) \|\| $airline_icao == '' \|\| $airline_icao == 'all')) {
	192	+ if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) \|\| $airline_icao == '' \|\| $airline_icao == 'all')) {
193	193	?>
194	194	<!--
195	195	<li class="dropdown">
		@@ -203,7 +203,7 @@ discard block
		block discarded – undo
203	203	</li>
204	204	-->
205	205	<?php
206		- }
	206	+ }
207	207	?>
208	208	<?php
209	209	} elseif ($type == 'marine' \|\| $type == 'tracker') {
		@@ -224,5 +224,5 @@ discard block
		block discarded – undo
224	224	</ul>
225	225	</div>
226	226	<?php
227		- }
	227	+ }
228	228	?>
229	229	\ No newline at end of file

		@@ -6,7 +6,13 @@ discard block
		block discarded – undo
6	6	if (!isset($type) \|\| $type != 'satellite') {
7	7	?>
8	8	<form id="changedate" method="post">
9		- <input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') echo $year.'-'; ?><?php if (isset($month) && $month != '') echo $month; ?>" />
	9	+ <input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') {
	10	+ echo $year.'-';
	11	+}
	12	+?><?php if (isset($month) && $month != '') {
	13	+ echo $month;
	14	+}
	15	+?>" />
10	16	</form>
11	17	<?php
12	18	}
		@@ -38,7 +44,9 @@ discard block
		block discarded – undo
38	44	print '<option disabled>──────────</option>';
39	45	}
40	46	$Stats = new Stats();
41		- if (!isset($filter_name)) $filter_name = '';
	47	+ if (!isset($filter_name)) {
	48	+ $filter_name = '';
	49	+ }
42	50	$airlines = $Stats->getAllAirlineNames($filter_name);
43	51	foreach($airlines as $airline) {
44	52	if (isset($airline_icao) && $airline_icao == $airline['airline_icao']) {
		@@ -67,10 +75,22 @@ discard block
		block discarded – undo
67	75	<?php echo _("Aircraft"); ?> <span class="caret"></span>
68	76	</a>
69	77	<ul class="dropdown-menu">
70		- <li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Aircraft"); ?></a></li>
71		- <li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Registration"); ?></a></li>
72		- <li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Manufacturer"); ?></a></li>
73		- <li><a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Country"); ?></a></li>
	78	+ <li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	79	+ echo '/'.$airline_icao;
	80	+}
	81	+?>"><?php echo _("Aircraft"); ?></a></li>
	82	+ <li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	83	+ echo '/'.$airline_icao;
	84	+}
	85	+?>"><?php echo _("Registration"); ?></a></li>
	86	+ <li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	87	+ echo '/'.$airline_icao;
	88	+}
	89	+?>"><?php echo _("Manufacturer"); ?></a></li>
	90	+ <li><a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	91	+ echo '/'.$airline_icao;
	92	+}
	93	+?>"><?php echo _("Country"); ?></a></li>
74	94	</ul>
75	95	</li>
76	96	<li class="dropdown">
		@@ -81,12 +101,21 @@ discard block
		block discarded – undo
81	101	<?php
82	102	if (!isset($airline_icao) \|\| $airline_icao == 'all') {
83	103	?>
84		- <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Airline"); ?></a></li>
85		- <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Airline by Country"); ?></a></li>
	104	+ <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	105	+ echo '/'.$airline_icao;
	106	+}
	107	+?>"><?php echo _("Airline"); ?></a></li>
	108	+ <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	109	+ echo '/'.$airline_icao;
	110	+}
	111	+?>"><?php echo _("Airline by Country"); ?></a></li>
86	112	<?php
87	113	}
88	114	?>
89		- <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Callsign"); ?></a></li>
	115	+ <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	116	+ echo '/'.$airline_icao;
	117	+}
	118	+?>"><?php echo _("Callsign"); ?></a></li>
90	119	</ul>
91	120	</li>
92	121	<li class="dropdown">
		@@ -94,10 +123,22 @@ discard block
		block discarded – undo
94	123	<?php echo _("Airport"); ?> <span class="caret"></span>
95	124	</a>
96	125	<ul class="dropdown-menu" role="menu">
97		- <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Departure Airport"); ?></a></li>
98		- <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
99		- <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Arrival Airport"); ?></a></li>
100		- <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
	126	+ <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	127	+ echo '/'.$airline_icao;
	128	+}
	129	+?>"><?php echo _("Departure Airport"); ?></a></li>
	130	+ <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	131	+ echo '/'.$airline_icao;
	132	+}
	133	+?>"><?php echo _("Departure Airport by Country"); ?></a></li>
	134	+ <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	135	+ echo '/'.$airline_icao;
	136	+}
	137	+?>"><?php echo _("Arrival Airport"); ?></a></li>
	138	+ <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	139	+ echo '/'.$airline_icao;
	140	+}
	141	+?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
101	142	</ul>
102	143	</li>
103	144	<li class="dropdown">
		@@ -105,8 +146,14 @@ discard block
		block discarded – undo
105	146	<?php echo _("Route"); ?> <span class="caret"></span>
106	147	</a>
107	148	<ul class="dropdown-menu" role="menu">
108		- <li><a href="<?php print $globalURL; ?>/statistics/route-airport<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Route by Airport"); ?></a></li>
109		- <li><a href="<?php print $globalURL; ?>/statistics/route-waypoint<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Route by Waypoint"); ?></a></li>
	149	+ <li><a href="<?php print $globalURL; ?>/statistics/route-airport<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	150	+ echo '/'.$airline_icao;
	151	+}
	152	+?>"><?php echo _("Route by Airport"); ?></a></li>
	153	+ <li><a href="<?php print $globalURL; ?>/statistics/route-waypoint<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	154	+ echo '/'.$airline_icao;
	155	+}
	156	+?>"><?php echo _("Route by Waypoint"); ?></a></li>
110	157	</ul>
111	158	</li>
112	159	<li class="dropdown">
		@@ -114,8 +161,14 @@ discard block
		block discarded – undo
114	161	<?php echo _("Date & Time"); ?> <span class="caret"></span>
115	162	</a>
116	163	<ul class="dropdown-menu" role="menu">
117		- <li><a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Date"); ?></a></li>
118		- <li><a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Time"); ?></a></li>
	164	+ <li><a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	165	+ echo '/'.$airline_icao;
	166	+}
	167	+?>"><?php echo _("Date"); ?></a></li>
	168	+ <li><a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	169	+ echo '/'.$airline_icao;
	170	+}
	171	+?>"><?php echo _("Time"); ?></a></li>
119	172	</ul>
120	173	</li>
121	174	<?php
		@@ -163,9 +216,18 @@ discard block
		block discarded – undo
163	216	<?php echo _("Aircraft"); ?> <span class="caret"></span>
164	217	</a>
165	218	<ul class="dropdown-menu">
166		- <li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Aircraft"); ?></a></li>
167		- <li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Registration"); ?></a></li>
168		- <li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Manufacturer"); ?></a></li>
	219	+ <li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	220	+ echo '/'.$airline_icao;
	221	+}
	222	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Aircraft"); ?></a></li>
	223	+ <li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	224	+ echo '/'.$airline_icao;
	225	+}
	226	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Registration"); ?></a></li>
	227	+ <li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	228	+ echo '/'.$airline_icao;
	229	+}
	230	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Manufacturer"); ?></a></li>
169	231	<!-- <li><a href="<?php print $globalURL; ?>/statistics/country"><?php echo _("Country"); ?></a></li> -->
170	232	</ul>
171	233	</li>
		@@ -177,12 +239,21 @@ discard block
		block discarded – undo
177	239	<?php
178	240	if (!isset($airline_icao) \|\| $airline_icao == 'all') {
179	241	?>
180		- <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline"); ?></a></li>
181		- <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline by Country"); ?></a></li>
	242	+ <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	243	+ echo '/'.$airline_icao;
	244	+}
	245	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline"); ?></a></li>
	246	+ <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	247	+ echo '/'.$airline_icao;
	248	+}
	249	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline by Country"); ?></a></li>
182	250	<?php
183	251	}
184	252	?>
185		- <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Callsign"); ?></a></li>
	253	+ <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	254	+ echo '/'.$airline_icao;
	255	+}
	256	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Callsign"); ?></a></li>
186	257	</ul>
187	258	</li>
188	259	<li class="dropdown">
		@@ -190,10 +261,22 @@ discard block
		block discarded – undo
190	261	<?php echo _("Airport"); ?> <span class="caret"></span>
191	262	</a>
192	263	<ul class="dropdown-menu" role="menu">
193		- <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport"); ?></a></li>
194		- <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
195		- <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport"); ?></a></li>
196		- <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
	264	+ <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	265	+ echo '/'.$airline_icao;
	266	+}
	267	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport"); ?></a></li>
	268	+ <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	269	+ echo '/'.$airline_icao;
	270	+}
	271	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
	272	+ <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	273	+ echo '/'.$airline_icao;
	274	+}
	275	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport"); ?></a></li>
	276	+ <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	277	+ echo '/'.$airline_icao;
	278	+}
	279	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
197	280	</ul>
198	281	</li>
199	282	<!--

		@@ -28,11 +28,11 @@ discard block
		block discarded – undo
28	28	$Spotter = new Spotter();
29	29	$alliances = $Spotter->getAllAllianceNames();
30	30	if (!empty($alliances)) {
31		- foreach($alliances as $alliance) {
32		- if (isset($airline_icao) && str_replace('_',' ',str_replace('alliance_','',$airline_icao)) == $alliance['alliance']) {
33		- print '<option value="alliance_'.str_replace(' ','_',$alliance['alliance']).'" selected>'.$alliance['alliance'].'</option>';
	31	+ foreach ($alliances as $alliance) {
	32	+ if (isset($airline_icao) && str_replace('_', ' ', str_replace('alliance_', '', $airline_icao)) == $alliance['alliance']) {
	33	+ print '<option value="alliance_'.str_replace(' ', '_', $alliance['alliance']).'" selected>'.$alliance['alliance'].'</option>';
34	34	} else {
35		- print '<option value="alliance_'.str_replace(' ','_',$alliance['alliance']).'">'.$alliance['alliance'].'</option>';
	35	+ print '<option value="alliance_'.str_replace(' ', '_', $alliance['alliance']).'">'.$alliance['alliance'].'</option>';
36	36	}
37	37	}
38	38	print '<option disabled>──────────</option>';
		@@ -40,7 +40,7 @@ discard block
		block discarded – undo
40	40	$Stats = new Stats();
41	41	if (!isset($filter_name)) $filter_name = '';
42	42	$airlines = $Stats->getAllAirlineNames($filter_name);
43		- foreach($airlines as $airline) {
	43	+ foreach ($airlines as $airline) {
44	44	if (isset($airline_icao) && $airline_icao == $airline['airline_icao']) {
45	45	print '<option value="'.$airline['airline_icao'].'" selected>'.$airline['airline_name'].'</option>';
46	46	} else {
		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	if (!isset($type) \|\| $type == 'aircraft') {
64	64	?>
65	65	<li class="dropdown">
66		- <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-aircraft" \|\| strtolower($current_page) == "statistics-registration" \|\| strtolower($current_page) == "statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#" >
	66	+ <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-aircraft" \|\| strtolower($current_page) == "statistics-registration" \|\| strtolower($current_page) == "statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#" >
67	67	<?php echo _("Aircraft"); ?> <span class="caret"></span>
68	68	</a>
69	69	<ul class="dropdown-menu">
		@@ -74,7 +74,7 @@ discard block
		block discarded – undo
74	74	</ul>
75	75	</li>
76	76	<li class="dropdown">
77		- <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airline" \|\| strtolower($current_page) == "statistics-airline-country" \|\| strtolower($current_page) == "statistics-callsign"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
	77	+ <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airline" \|\| strtolower($current_page) == "statistics-airline-country" \|\| strtolower($current_page) == "statistics-callsign") { print 'active'; } ?>" data-toggle="dropdown" href="#">
78	78	<?php echo _("Airline"); ?> <span class="caret"></span>
79	79	</a>
80	80	<ul class="dropdown-menu" role="menu">
		@@ -90,7 +90,7 @@ discard block
		block discarded – undo
90	90	</ul>
91	91	</li>
92	92	<li class="dropdown">
93		- <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airport-departure" \|\| strtolower($current_page) == "statistics-airport-departure-country" \|\| strtolower($current_page) == "statistics-airport-arrival" \|\| strtolower($current_page) == "statistics-airport-arrival-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
	93	+ <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airport-departure" \|\| strtolower($current_page) == "statistics-airport-departure-country" \|\| strtolower($current_page) == "statistics-airport-arrival" \|\| strtolower($current_page) == "statistics-airport-arrival-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
94	94	<?php echo _("Airport"); ?> <span class="caret"></span>
95	95	</a>
96	96	<ul class="dropdown-menu" role="menu">
		@@ -101,7 +101,7 @@ discard block
		block discarded – undo
101	101	</ul>
102	102	</li>
103	103	<li class="dropdown">
104		- <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-route-airport" \|\| strtolower($current_page) == "statistics-route-waypoint"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
	104	+ <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-route-airport" \|\| strtolower($current_page) == "statistics-route-waypoint") { print 'active'; } ?>" data-toggle="dropdown" href="#">
105	105	<?php echo _("Route"); ?> <span class="caret"></span>
106	106	</a>
107	107	<ul class="dropdown-menu" role="menu">
		@@ -110,7 +110,7 @@ discard block
		block discarded – undo
110	110	</ul>
111	111	</li>
112	112	<li class="dropdown">
113		- <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" \|\| strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
	113	+ <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" \|\| strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
114	114	<?php echo _("Date & Time"); ?> <span class="caret"></span>
115	115	</a>
116	116	<ul class="dropdown-menu" role="menu">
		@@ -122,7 +122,7 @@ discard block
		block discarded – undo
122	122	if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) \|\| $airline_icao == '' \|\| $airline_icao == 'all')) {
123	123	?>
124	124	<li class="dropdown">
125		- <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" \|\| strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
	125	+ <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-fatalities-year" \|\| strtolower($current_page) == "statistics-fatalities-month") { print 'active'; } ?>" data-toggle="dropdown" href="#">
126	126	<?php echo _("Fatalities"); ?> <span class="caret"></span>
127	127	</a>
128	128	<ul class="dropdown-menu" role="menu">
		@@ -137,7 +137,7 @@ discard block
		block discarded – undo
137	137	} elseif ($type == 'marine' \|\| $type == 'tracker') {
138	138	?>
139	139	<li class="dropdown">
140		- <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" \|\| strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
	140	+ <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" \|\| strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
141	141	<?php echo _("Date & Time"); ?> <span class="caret"></span>
142	142	</a>
143	143	<ul class="dropdown-menu" role="menu">
		@@ -161,7 +161,7 @@ discard block
		block discarded – undo
161	161	if (!isset($type) \|\| $type == 'aircraft') {
162	162	?>
163	163	<li class="dropdown">
164		- <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-aircraft" \|\| strtolower($current_page) == "statistics-registration" \|\| strtolower($current_page) == "statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#" >
	164	+ <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-aircraft" \|\| strtolower($current_page) == "statistics-registration" \|\| strtolower($current_page) == "statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#" >
165	165	<?php echo _("Aircraft"); ?> <span class="caret"></span>
166	166	</a>
167	167	<ul class="dropdown-menu">
		@@ -172,7 +172,7 @@ discard block
		block discarded – undo
172	172	</ul>
173	173	</li>
174	174	<li class="dropdown">
175		- <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airline" \|\| strtolower($current_page) == "statistics-airline-country" \|\| strtolower($current_page) == "statistics-callsign"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
	175	+ <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airline" \|\| strtolower($current_page) == "statistics-airline-country" \|\| strtolower($current_page) == "statistics-callsign") { print 'active'; } ?>" data-toggle="dropdown" href="#">
176	176	<?php echo _("Airline"); ?> <span class="caret"></span>
177	177	</a>
178	178	<ul class="dropdown-menu" role="menu">
		@@ -188,7 +188,7 @@ discard block
		block discarded – undo
188	188	</ul>
189	189	</li>
190	190	<li class="dropdown">
191		- <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airport-departure" \|\| strtolower($current_page) == "statistics-airport-departure-country" \|\| strtolower($current_page) == "statistics-airport-arrival" \|\| strtolower($current_page) == "statistics-airport-arrival-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
	191	+ <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airport-departure" \|\| strtolower($current_page) == "statistics-airport-departure-country" \|\| strtolower($current_page) == "statistics-airport-arrival" \|\| strtolower($current_page) == "statistics-airport-arrival-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
192	192	<?php echo _("Airport"); ?> <span class="caret"></span>
193	193	</a>
194	194	<ul class="dropdown-menu" role="menu">
		@@ -200,7 +200,7 @@ discard block
		block discarded – undo
200	200	</li>
201	201	<!--
202	202	<li class="dropdown">
203		- <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-route-airport" \|\| strtolower($current_page) == "statistics-route-waypoint"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
	203	+ <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-route-airport" \|\| strtolower($current_page) == "statistics-route-waypoint") { print 'active'; } ?>" data-toggle="dropdown" href="#">
204	204	<?php echo _("Route"); ?> <span class="caret"></span>
205	205	</a>
206	206	<ul class="dropdown-menu" role="menu">
		@@ -211,7 +211,7 @@ discard block
		block discarded – undo
211	211	-->
212	212	<!--
213	213	<li class="dropdown">
214		- <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" \|\| strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
	214	+ <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" \|\| strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
215	215	<?php echo _("Date & Time"); ?> <span class="caret"></span>
216	216	</a>
217	217	<ul class="dropdown-menu" role="menu">
		@@ -225,7 +225,7 @@ discard block
		block discarded – undo
225	225	?>
226	226	<!--
227	227	<li class="dropdown">
228		- <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" \|\| strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
	228	+ <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-fatalities-year" \|\| strtolower($current_page) == "statistics-fatalities-month") { print 'active'; } ?>" data-toggle="dropdown" href="#">
229	229	<?php echo _("Fatalities"); ?> <span class="caret"></span>
230	230	</a>
231	231	<ul class="dropdown-menu" role="menu">
		@@ -241,7 +241,7 @@ discard block
		block discarded – undo
241	241	} elseif ($type == 'marine' \|\| $type == 'tracker') {
242	242	?>
243	243	<li class="dropdown">
244		- <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" \|\| strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
	244	+ <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" \|\| strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
245	245	<?php echo _("Date & Time"); ?> <span class="caret"></span>
246	246	</a>
247	247	<ul class="dropdown-menu" role="menu">

		@@ -40,15 +40,15 @@
		block discarded – undo
40	40	//print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
41	41	print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],3).', '.round($spotter_item['longitude'],3).'</div>';
42	42	if ($spotter_item['atc_range'] > 0) {
43		- print '<div><span>'._("Range").'</span>';
44		- print $spotter_item['atc_range'];
45		- print '</div>';
	43	+ print '<div><span>'._("Range").'</span>';
	44	+ print $spotter_item['atc_range'];
	45	+ print '</div>';
46	46	}
47	47	print '</div>';
48	48	if ($spotter_item['info'] != '') {
49		- print '<div class="notamtext"><span>'._("Info").'</span>';
50		- print $spotter_item['info'];
51		- print '</div>';
	49	+ print '<div class="notamtext"><span>'._("Info").'</span>';
	50	+ print $spotter_item['info'];
	51	+ print '</div>';
52	52	}
53	53	print '</div>';
54	54	}

		@@ -5,8 +5,8 @@ discard block
		block discarded – undo
5	5	$ATC = new ATC();
6	6
7	7	if (isset($_GET['atcid'])) {
8		- $atcid = filter_input(INPUT_GET,'atcid',FILTER_SANITIZE_NUMBER_INT);
9		- $atcident = filter_input(INPUT_GET,'atcident',FILTER_SANITIZE_STRING);
	8	+ $atcid = filter_input(INPUT_GET, 'atcid', FILTER_SANITIZE_NUMBER_INT);
	9	+ $atcident = filter_input(INPUT_GET, 'atcident', FILTER_SANITIZE_STRING);
10	10	$atc_data = $ATC->getById($atcid);
11	11	if (!isset($atc_data[0])) $atc_data = $ATC->getByIdent($atcident);
12	12	?>
		@@ -38,7 +38,7 @@ discard block
		block discarded – undo
38	38	print '</div>';
39	39
40	40	//print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
41		-print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],3).', '.round($spotter_item['longitude'],3).'</div>';
	41	+print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'], 3).', '.round($spotter_item['longitude'], 3).'</div>';
42	42	if ($spotter_item['atc_range'] > 0) {
43	43	print '<div><span>'._("Range").'</span>';
44	44	print $spotter_item['atc_range'];

		@@ -8,7 +8,9 @@
		block discarded – undo
8	8	$atcid = filter_input(INPUT_GET,'atcid',FILTER_SANITIZE_NUMBER_INT);
9	9	$atcident = filter_input(INPUT_GET,'atcident',FILTER_SANITIZE_STRING);
10	10	$atc_data = $ATC->getById($atcid);
11		- if (!isset($atc_data[0])) $atc_data = $ATC->getByIdent($atcident);
	11	+ if (!isset($atc_data[0])) {
	12	+ $atc_data = $ATC->getByIdent($atcident);
	13	+ }
12	14	?>
13	15	<div class="alldetails">
14	16	<button type="button" class="close">×</button>

		@@ -52,6 +52,10 @@ discard block
		block discarded – undo
52	52	$this->openedFiles = [];
53	53	}
54	54
	55	+ /**
	56	+ * @param double $row
	57	+ * @param double $column
	58	+ */
55	59	private function getElevationAtPosition($fileName, $row, $column) {
56	60	if (!array_key_exists($fileName, $this->openedFiles)) {
57	61	if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
		@@ -85,7 +89,7 @@ discard block
		block discarded – undo
85	89	* @param float $lon
86	90	* @param null $fName
87	91	*
88		- * @return mixed
	92	+ * @return double
89	93	* @throws \Exception
90	94	*/
91	95	public function getElevation($lat, $lon, &$fName = null) {
		@@ -142,6 +146,9 @@ discard block
		block discarded – undo
142	146	return $zN;
143	147	}
144	148
	149	+ /**
	150	+ * @param integer $numPrefix
	151	+ */
145	152	private function getDeg($deg, $numPrefix) {
146	153	$deg = abs($deg);
147	154	$d = floor($deg); // round degrees
		@@ -156,6 +163,9 @@ discard block
		block discarded – undo
156	163	return $d;
157	164	}
158	165
	166	+ /**
	167	+ * @param double $deg
	168	+ */
159	169	private function getSec($deg) {
160	170	$deg = abs($deg);
161	171	$sec = round($deg * 3600, 4);

		@@ -28,7 +28,9 @@ discard block
		block discarded – undo
28	28	private $openedFiles = [];
29	29
30	30	public function __construct($htgFilesDestination = '', $resolution = 3) {
31		- if ($htgFilesDestination == '') $htgFilesDestination = dirname(__FILE__).'/../data/';
	31	+ if ($htgFilesDestination == '') {
	32	+ $htgFilesDestination = dirname(__FILE__).'/../data/';
	33	+ }
32	34	$this->htgFilesDestination = $htgFilesDestination;
33	35	$this->resolution = $resolution;
34	36	switch ($resolution) {
		@@ -171,16 +173,26 @@ discard block
		block discarded – undo
171	173	$fileName = "N{$N}E{$E}.hgt";
172	174	if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
173	175	$Common = new Common();
174		- if ($debug) echo 'Downloading '.$fileName.'.gz ...';
	176	+ if ($debug) {
	177	+ echo 'Downloading '.$fileName.'.gz ...';
	178	+ }
175	179	$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
176	180	if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz')) {
177		- if ($debug) echo "File '{$fileName}.gz' not exists.";
	181	+ if ($debug) {
	182	+ echo "File '{$fileName}.gz' not exists.";
	183	+ }
178	184	return false;
179	185	}
180		- if ($debug) echo 'Done'."\n";
181		- if ($debug) echo 'Decompress '.$fileName.' ....';
	186	+ if ($debug) {
	187	+ echo 'Done'."\n";
	188	+ }
	189	+ if ($debug) {
	190	+ echo 'Decompress '.$fileName.' ....';
	191	+ }
182	192	$Common->gunzip($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName);
183		- if ($debug) echo 'Done'."\n";
	193	+ if ($debug) {
	194	+ echo 'Done'."\n";
	195	+ }
184	196	unlink($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
185	197	}
186	198	return true;

		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	default:
42	42	throw new \Exception("bad resolution can be only one of 1,3");
43	43	}
44		- register_shutdown_function(function () {
	44	+ register_shutdown_function(function() {
45	45	$this->closeAllFiles();
46	46	});
47	47	}
		@@ -55,10 +55,10 @@ discard block
		block discarded – undo
55	55
56	56	private function getElevationAtPosition($fileName, $row, $column) {
57	57	if (!array_key_exists($fileName, $this->openedFiles)) {
58		- if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
	58	+ if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
59	59	throw new \Exception("File '{$fileName}' not exists.");
60	60	}
61		- $file = fopen($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName, "r");
	61	+ $file = fopen($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName, "r");
62	62	if ($file === false) {
63	63	throw new \Exception("Cant open file '{$fileName}' for reading.");
64	64	}
		@@ -72,7 +72,7 @@ discard block
		block discarded – undo
72	72	throw new \Exception("Not implemented yet");
73	73	}
74	74	$aRow = $this->measPerDeg - $row;
75		- $position = ($this->measPerDeg * ($aRow - 1)) + $column;
	75	+ $position = ($this->measPerDeg*($aRow - 1)) + $column;
76	76	$position *= 2;
77	77	fseek($file, $position);
78	78	$short = fread($file, 2);
		@@ -100,8 +100,8 @@ discard block
		block discarded – undo
100	100	$latSec = $this->getSec($lat);
101	101	$lonSec = $this->getSec($lon);
102	102
103		- $Xn = round($latSec / $this->resolution, 3);
104		- $Yn = round($lonSec / $this->resolution, 3);
	103	+ $Xn = round($latSec/$this->resolution, 3);
	104	+ $Yn = round($lonSec/$this->resolution, 3);
105	105
106	106	$a1 = round($Xn);
107	107	$a2 = round($Yn);
		@@ -133,55 +133,55 @@ discard block
		block discarded – undo
133	133	$b3 = $this->getElevationAtPosition($fName, $b1, $b2);
134	134	$c3 = $this->getElevationAtPosition($fName, $c1, $c2);
135	135
136		- $n1 = ($c2 - $a2) * ($b3 - $a3) - ($c3 - $a3) * ($b2 - $a2);
137		- $n2 = ($c3 - $a3) * ($b1 - $a1) - ($c1 - $a1) * ($b3 - $a3);
138		- $n3 = ($c1 - $a1) * ($b2 - $a2) - ($c2 - $a2) * ($b1 - $a1);
	136	+ $n1 = ($c2 - $a2)($b3 - $a3) - ($c3 - $a3)($b2 - $a2);
	137	+ $n2 = ($c3 - $a3)($b1 - $a1) - ($c1 - $a1)($b3 - $a3);
	138	+ $n3 = ($c1 - $a1)($b2 - $a2) - ($c2 - $a2)($b1 - $a1);
139	139
140		- $d = -$n1 * $a1 - $n2 * $a2 - $n3 * $a3;
141		- $zN = (-$n1 * $Xn - $n2 * $Yn - $d) / $n3;
	140	+ $d = -$n1$a1 - $n2$a2 - $n3*$a3;
	141	+ $zN = (-$n1$Xn - $n2$Yn - $d)/$n3;
142	142
143	143	return $zN;
144	144	}
145	145
146	146	private function getDeg($deg, $numPrefix) {
147	147	$deg = abs($deg);
148		- $d = floor($deg); // round degrees
	148	+ $d = floor($deg); // round degrees
149	149	if ($numPrefix >= 3) {
150	150	if ($d < 100) {
151		- $d = '0' . $d;
	151	+ $d = '0'.$d;
152	152	}
153	153	} // pad with leading zeros
154	154	if ($d < 10) {
155		- $d = '0' . $d;
	155	+ $d = '0'.$d;
156	156	}
157	157	return $d;
158	158	}
159	159
160	160	private function getSec($deg) {
161	161	$deg = abs($deg);
162		- $sec = round($deg * 3600, 4);
163		- $m = fmod(floor($sec / 60), 60);
	162	+ $sec = round($deg*3600, 4);
	163	+ $m = fmod(floor($sec/60), 60);
164	164	$s = round(fmod($sec, 60), 4);
165		- return ($m * 60) + $s;
	165	+ return ($m*60) + $s;
166	166	}
167	167
168		- public function download($lat,$lon, $debug = false) {
	168	+ public function download($lat, $lon, $debug = false) {
169	169	$N = $this->getDeg($lat, 2);
170	170	$E = $this->getDeg($lon, 3);
171		- $fileName = "N{$N}E{$E}.hgt";
172		- if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
	171	+ $fileName = "N{$N}E{$E}.hgt";
	172	+ if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
173	173	$Common = new Common();
174	174	if ($debug) echo 'Downloading '.$fileName.'.gz ...';
175		- $Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
176		- if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz')) {
	175	+ $Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
	176	+ if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz')) {
177	177	if ($debug) echo "File '{$fileName}.gz' not exists.";
178	178	return false;
179	179	}
180	180	if ($debug) echo 'Done'."\n";
181	181	if ($debug) echo 'Decompress '.$fileName.' ....';
182		- $Common->gunzip($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName);
	182	+ $Common->gunzip($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName);
183	183	if ($debug) echo 'Done'."\n";
184		- unlink($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
	184	+ unlink($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
185	185	}
186	186	return true;
187	187	}
		@@ -194,22 +194,22 @@ discard block
		block discarded – undo
194	194	try {
195	195	$sth = $db->prepare($query);
196	196	$sth->execute($query_values);
197		- } catch(PDOException $e) {
	197	+ } catch (PDOException $e) {
198	198	return "error : ".$e->getMessage();
199	199	}
200	200	while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
201		- $this->download($data['latitude'],$data['longitude'],true);
	201	+ $this->download($data['latitude'], $data['longitude'], true);
202	202	}
203	203	$query = 'SELECT latitude, longitude FROM tracker_output WHERE latitude <> 0 AND longitude <> 0 ORDER BY date DESC LIMIT 10';
204	204	$query_values = array();
205	205	try {
206	206	$sth = $db->prepare($query);
207	207	$sth->execute($query_values);
208		- } catch(PDOException $e) {
	208	+ } catch (PDOException $e) {
209	209	return "error : ".$e->getMessage();
210	210	}
211	211	while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
212		- $this->download($data['latitude'],$data['longitude'],true);
	212	+ $this->download($data['latitude'], $data['longitude'], true);
213	213	}
214	214	}
215	215	}

		@@ -57,7 +57,9 @@ discard block
		block discarded – undo
57	57	{
58	58	if ($spotter_item['image_source'] == 'flickr' \|\| $spotter_item['image_source'] == 'wikimedia' \|\| $spotter_item['image_source'] == 'devianart') {
59	59	$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
60		- } else $image = $spotter_item['image_thumbnail'];
	60	+ } else {
	61	+ $image = $spotter_item['image_thumbnail'];
	62	+ }
61	63
62	64	}
63	65	/* else {
		@@ -70,8 +72,12 @@ discard block
		block discarded – undo
70	72	}
71	73	print '<div class="right">';
72	74	print '<div class="callsign-details">';
73		-if ($spotter_item['ident'] != 'Not Available') print '<div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a></div>';
74		-if (isset($spotter_item['airline_name']) && $spotter_item['airline_name'] != 'Not Available') print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
	75	+if ($spotter_item['ident'] != 'Not Available') {
	76	+ print '<div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a></div>';
	77	+}
	78	+if (isset($spotter_item['airline_name']) && $spotter_item['airline_name'] != 'Not Available') {
	79	+ print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
	80	+}
75	81	print '</div>';
76	82	if ($spotter_item['departure_airport'] != 'NA' && $spotter_item['arrival_airport'] != 'NA') {
77	83	print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country'];
		@@ -103,10 +109,16 @@ discard block
		block discarded – undo
103	109	print '</div>';
104	110	print '<div id="aircraft">';
105	111	print '<span>'._("Aircraft").'</span>';
106		-if (isset($spotter_item['aircraft_wiki'])) print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
107		-if (isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
108		-elseif (isset($spotter_item['aircraft_type'])) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
109		-else print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
	112	+if (isset($spotter_item['aircraft_wiki'])) {
	113	+ print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
	114	+}
	115	+if (isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') {
	116	+ print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
	117	+} elseif (isset($spotter_item['aircraft_type'])) {
	118	+ print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
	119	+} else {
	120	+ print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
	121	+}
110	122	print '</div>';
111	123	print '<div id ="altitude"><span>'._("Altitude").'</span>';
112	124	if (isset($globalGroundAltitude) && $globalGroundAltitude) {
		@@ -117,12 +129,18 @@ discard block
		block discarded – undo
117	129	}
118	130
119	131	if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') \|\| (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
120		- if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') print $spotter_item['real_altitude'].' feet (FL'.$spotter_item['altitude'].')';
121		- else print $spotter_item['altitude'].'00 feet (FL'.$spotter_item['altitude'].')';
122		-} else {
123		- if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') print round($spotter_item['real_altitude']*0.3048).' m (FL'.$spotter_item['altitude'].')';
124		- else print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
125		-}
	132	+ if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
	133	+ print $spotter_item['real_altitude'].' feet (FL'.$spotter_item['altitude'].')';
	134	+ } else {
	135	+ print $spotter_item['altitude'].'00 feet (FL'.$spotter_item['altitude'].')';
	136	+ }
	137	+ } else {
	138	+ if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
	139	+ print round($spotter_item['real_altitude']*0.3048).' m (FL'.$spotter_item['altitude'].')';
	140	+ } else {
	141	+ print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
	142	+ }
	143	+ }
126	144
127	145	if (isset($groundAltitude) && $groundAltitude < $spotter_item['altitude']*30.48) {
128	146	print '<br>';
		@@ -136,7 +154,9 @@ discard block
		block discarded – undo
136	154	}
137	155
138	156	print '</div>';
139		-if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
	157	+if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') {
	158	+ print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
	159	+}
140	160	print '<div id="speed"><span>'._("Speed").'</span>';
141	161	if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') \|\| (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) {
142	162	print round($spotter_item['ground_speed']*1.15078).' mph';
		@@ -150,8 +170,11 @@ discard block
		block discarded – undo
150	170	print '<div id="heading"><span>'._("Heading").'</span>'.$spotter_item['heading'].'°</div>';
151	171	if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != '') {
152	172	print '<div id="pilot"><span>'._("Pilot").'</span>';
153		- if (isset($spotter_item['pilot_id'])) print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
154		- else print $spotter_item['pilot_name'];
	173	+ if (isset($spotter_item['pilot_id'])) {
	174	+ print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
	175	+ } else {
	176	+ print $spotter_item['pilot_name'];
	177	+ }
155	178	print '</div>';
156	179	}
157	180
		@@ -179,10 +202,18 @@ discard block
		block discarded – undo
179	202	print '</div>';
180	203	print '</div>';
181	204
182		-if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
183		-if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
184		-if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
185		-if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
	205	+if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') {
	206	+ print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
	207	+}
	208	+if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') {
	209	+ print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
	210	+}
	211	+if (isset($spotter_item['acars']['message'])) {
	212	+ print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
	213	+}
	214	+if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) {
	215	+ print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
	216	+}
186	217	print '</div>';
187	218	?>
188	219	</div>
189	220	\ No newline at end of file

		@@ -11,14 +11,14 @@ discard block
		block discarded – undo
11	11
12	12	$from_archive = false;
13	13	if (isset($_GET['ident'])) {
14		- $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
	14	+ $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
15	15	if (isset($_GET['currenttime'])) {
16		- $currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
	16	+ $currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
17	17	$currenttime = round($currenttime/1000);
18		- $spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident,$currenttime);
	18	+ $spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident, $currenttime);
19	19	if (empty($spotter_array)) {
20	20	$from_archive = true;
21		- $spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident,$currenttime);
	21	+ $spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident, $currenttime);
22	22	}
23	23	} else {
24	24	$spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident);
		@@ -29,15 +29,15 @@ discard block
		block discarded – undo
29	29	}
30	30	}
31	31	if (isset($_GET['flightaware_id'])) {
32		- $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
	32	+ $flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
33	33	if (isset($_GET['currenttime'])) {
34		- $currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
	34	+ $currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
35	35	$currenttime = round($currenttime/1000);
36		- $spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id,$currenttime);
	36	+ $spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id, $currenttime);
37	37	if (empty($spotter_array)) {
38	38	$from_archive = true;
39	39	// $spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
40		- $spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id,$currenttime);
	40	+ $spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id, $currenttime);
41	41	}
42	42	} else {
43	43	$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "")
57	57	{
58	58	if ($spotter_item['image_source'] == 'flickr' \|\| $spotter_item['image_source'] == 'wikimedia' \|\| $spotter_item['image_source'] == 'devianart') {
59		- $image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
	59	+ $image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
60	60	} else $image = $spotter_item['image_thumbnail'];
61	61
62	62	}
		@@ -77,7 +77,7 @@ discard block
		block discarded – undo
77	77	print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country'];
78	78	if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
79	79	if ($spotter_item['departure_airport_time'] > 2460) {
80		- print '<br /><span class="time">'.date('H:m',$spotter_item['departure_airport_time']).'</span>';
	80	+ print '<br /><span class="time">'.date('H:m', $spotter_item['departure_airport_time']).'</span>';
81	81	} else {
82	82	print '<br /><span class="time">'.$spotter_item['departure_airport_time'].'</span>';
83	83	}
		@@ -86,7 +86,7 @@ discard block
		block discarded – undo
86	86	print '<span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport'].'</a></span>'.$spotter_item['arrival_airport_city'].' '.$spotter_item['arrival_airport_country'];
87	87	if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
88	88	if ($spotter_item['arrival_airport_time'] > 2460) {
89		- print '<br /><span class="time">'.date('H:m',$spotter_item['arrival_airport_time']).'</span>';
	89	+ print '<br /><span class="time">'.date('H:m', $spotter_item['arrival_airport_time']).'</span>';
90	90	} else {
91	91	print '<br /><span class="time">'.$spotter_item['arrival_airport_time'].'</span>';
92	92	}
		@@ -111,8 +111,8 @@ discard block
		block discarded – undo
111	111	print '<div id ="altitude"><span>'._("Altitude").'</span>';
112	112	if (isset($globalGroundAltitude) && $globalGroundAltitude) {
113	113	try {
114		- $groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']);
115		- } catch(Exception $e) {
	114	+ $groundAltitude = $Elevation->getElevation($spotter_item['latitude'], $spotter_item['longitude']);
	115	+ } catch (Exception $e) {
116	116	// If catched not exist
117	117	}
118	118	}
		@@ -182,7 +182,7 @@ discard block
		block discarded – undo
182	182
183	183	if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
184	184	if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
185		-if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
	185	+if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br/>', $spotter_item['acars']['message'])).'</div>';
186	186	if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
187	187	print '</div>';
188	188	?>

Ysurac / FlightAirMap

Push — master ( 79cbb4...2c41c0 )

Status

Category

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

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

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

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

Braces +42 added lines, -10 removed lines patch added patch discarded remove patch

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

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

Braces +42 added lines, -10 removed lines patch added patch discarded remove patch

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

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

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

Braces +15 added lines, -7 removed lines patch added patch discarded remove patch

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

Braces +110 added lines, -27 removed lines patch added patch discarded remove patch

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

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

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

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

Doc Comments +11 added lines, -1 removed lines patch added patch discarded remove patch

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

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

Braces +51 added lines, -20 removed lines patch added patch discarded remove patch

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

Doc Comments +4 added lines patch added patch discarded remove patch

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

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

		@@ -38,8 +38,11 @@ discard block
		block discarded – undo
38	38	global $globalGeoidSource;
39	39	//if ($name == '') $name = dirname(__FILE__).'/../install/tmp/egm2008-1.pgm';
40	40	if ($name == '') {
41		- if (isset($globalGeoidSource) && $globalGeoidSource != '') $name = dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm';
42		- else $name = dirname(__FILE__).'/../data/egm96-15.pgm';
	41	+ if (isset($globalGeoidSource) && $globalGeoidSource != '') {
	42	+ $name = dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm';
	43	+ } else {
	44	+ $name = dirname(__FILE__).'/../data/egm96-15.pgm';
	45	+ }
43	46	}
44	47
45	48	$f = @fopen($name,"r");
		@@ -156,7 +159,9 @@ discard block
		block discarded – undo
156	159	}
157	160	}
158	161	$this->t = $t;
159		- } else $t = $this->t;
	162	+ } else {
	163	+ $t = $this->t;
	164	+ }
160	165	if (!($cubic)) {
161	166	$a = (((1 - $fx) * $this->v00) + ($fx * $this->v01));
162	167	$b = (((1 - $fx) * $this->v10) + ($fx * $this->v11));