Ysurac / FlightAirMap

footer.php

Braces +8 added lines, -3 removed lines

@@ -1,8 +1,10 @@ 
 </section>
 <div class="pub onmap">
 <?php
-	if (isset($globalPub)) print $globalPub;
-?>
+	if (isset($globalPub)) {
+		print $globalPub;
+	}
+	?>
 </div>
 <footer class="container">
 	<?php
@@ -13,7 +15,10 @@ 
 	<?php
 	    }
 	?>
-	<span>Developed in Barrie by <a href="http://www.mariotrunz.me/" target="_blank">Mario Trunz</a> & at <a href="http://www.zugaina.com" target="_blank">Zugaina</a> by Ycarus</span> - <span><a href="<?php if (isset($globalURL)) print $globalURL; ?>/about#source">Source &amp; Credits</a></span> - <span><a href="https://www.flightairmap.com/" target="_blank">Get source code</a></span>
+	<span>Developed in Barrie by <a href="http://www.mariotrunz.me/" target="_blank">Mario Trunz</a> & at <a href="http://www.zugaina.com" target="_blank">Zugaina</a> by Ycarus</span> - <span><a href="<?php if (isset($globalURL)) {
+	print $globalURL;
+}
+?>/about#source">Source &amp; Credits</a></span> - <span><a href="https://www.flightairmap.com/" target="_blank">Get source code</a></span>
 </footer>
 
 <div class="notifications bottom-left"></div>

js/map-aircraft.3d.js.php

Braces +24 added lines, -4 removed lines

@@ -304,7 +304,12 @@ 
 			<?php
 			    } else {
 			?>
-			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
+			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*2000;
+} else {
+	print '60000';
+}
+?>)) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 				czmlds.entities.removeById(entityid);
 			}
@@ -588,7 +593,12 @@ 
 		if (!((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) && (isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
 ?>
 update_polarLayer();
-setInterval(function(){update_polarLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){update_polarLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
 		}
 ?>
@@ -700,7 +710,12 @@ 
 			console.log('Reload...');
 			updateData();
 		}
-	,<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+	,<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 } else {
 	var clockViewModel = new Cesium.ClockViewModel(viewer.clock);
 	var animationViewModel = new Cesium.AnimationViewModel(clockViewModel);
@@ -729,7 +744,12 @@ 
     if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
 ?>
 update_atcLayer();
-setInterval(function(){update_atcLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){update_atcLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
     }
 ?>

live-santa-czml.php

Braces +6 added lines, -2 removed lines

@@ -28,7 +28,9 @@ 
 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
 $output .= ',"clock": {"currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"';
-if (!isset($_GET['now'])) $output .= ',"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z"';
+if (!isset($_GET['now'])) {
+	$output .= ',"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z"';
+}
 $output .= '}';
 //$output .= ',"clock": {"currentTime" : "'.date("c",time()).'","multiplier" : 300,"range" : "UNBOUNDED","step": "TICK_DEPENDENT"}';
 //$output .= ',"clock": {"currentTime" : "%minitime%","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
@@ -37,7 +39,9 @@ 
 $output .= '},';
 $output .= '{';
 $output .= '"id": "santaclaus",';
-if (!isset($_GET['now'])) $output .= '"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z",';
+if (!isset($_GET['now'])) {
+	$output .= '"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z",';
+}
 $output .= '"properties": {';
 $output .= '"type": "santa"';
 $output .= '},';

space-data.php

Braces +8 added lines, -3 removed lines

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

table-output.php

Braces +78 added lines, -29 removed lines

@@ -7,8 +7,10 @@ 
 $showRouteStop = $Common->multiKeyExists($spotter_array,'route_stop');
 if (isset($globalVM) && $globalVM && isset($type) && $type == 'marine') {
 	$showDuration = $Common->multiKeyExists($spotter_array,'race_time');
-	if ($showDuration === false) $showDuration = $Common->multiKeyExists($spotter_array,'duration');
-} else {
+	if ($showDuration === false) {
+		$showDuration = $Common->multiKeyExists($spotter_array,'duration');
+	}
+	} else {
 	$showDuration = $Common->multiKeyExists($spotter_array,'duration');
 }
 if (isset($globalVM) && $globalVM && isset($type) && $type == 'marine') {
@@ -16,7 +18,9 @@ 
 }
 
 
-if (!isset($type)) $type = 'aircraft';
+if (!isset($type)) {
+	$type = 'aircraft';
+}
 
 if (!isset($_GET['sort'])) 
 {
@@ -593,7 +597,9 @@ 
 	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";
@@ -608,7 +614,9 @@ 
 			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') {
@@ -616,8 +624,9 @@ 
 			{
 				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;
@@ -630,7 +639,9 @@ 
 				} 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 {
@@ -656,7 +667,9 @@ 
 				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['mmsi']) && $spotter_item['mmsi'] != '') {
 					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 {
@@ -678,7 +691,9 @@ 
 				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 {
@@ -731,8 +746,9 @@ 
 				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;
@@ -749,7 +765,9 @@ 
 				} 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'])) {
@@ -789,13 +807,19 @@ 
 				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['mmsi']) && $spotter_item['mmsi'] != '') {
 					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";
-					if ($spotter_item['image_copyright'] != '') print '<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+					if ($spotter_item['image_copyright'] != '') {
+						print '<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+					}
 				} else {
 					print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['ident'].'" alt="'.$spotter_item['ident'].'" data-content="'._("Ident:").' '.$spotter_item['ident'].'" data-html="true" width="100px" />'."\n";
-					if ($spotter_item['image_copyright'] != '') print '<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+					if ($spotter_item['image_copyright'] != '') {
+						print '<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
+					}
 				}
 				print '</td>'."\n";
 			} else {
@@ -813,7 +837,9 @@ 
 				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 {
@@ -931,8 +957,11 @@ 
 				print '<span class="nomobile"><a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a></span>'."\n";
 			} else {
 				$aircraft_names = explode('/',$spotter_item['aircraft_name']);
-				if (count($aircraft_names) == 1) print '<span class="nomobile"><a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].'</a></span>'."\n";
-				else print '<span class="nomobile"><a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].'</a></span>'."\n";
+				if (count($aircraft_names) == 1) {
+					print '<span class="nomobile"><a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].'</a></span>'."\n";
+				} else {
+					print '<span class="nomobile"><a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].'</a></span>'."\n";
+				}
 			}
 			print '<span class="mobile"><a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a></span>'."\n";
 		} elseif ($type == 'marine') {
@@ -975,15 +1004,21 @@ 
 			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) {
@@ -1005,7 +1040,9 @@ 
 						$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>';
@@ -1032,7 +1069,9 @@ 
 			} 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";
@@ -1048,20 +1087,28 @@ 
 			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') {
@@ -1074,7 +1121,9 @@ 
 						$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>';

require/class.Source.php

Braces +15 added lines, -5 removed lines

@@ -18,7 +18,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-		if ($this->db === null) die('Error: No DB connection. (Source)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (Source)');
+		}
 	}
 
 	public function getAllLocationInfo() {
@@ -83,7 +85,9 @@ 
 			$query .= " AND source_location.latitude BETWEEN ".$minlat." AND ".$maxlat." AND source_location.longitude BETWEEN ".$minlong." AND ".$maxlong." AND source_location.latitude <> 0 AND source_location.longitude <> 0";
 		}
 		$query .= " ORDER BY last_seen DESC";
-		if ($limit) $query .= " LIMIT 1000";
+		if ($limit) {
+			$query .= " LIMIT 1000";
+		}
 		$query_values = array(':type' => $type);
 		try {
 			$sth = $this->db->prepare($query);
@@ -122,7 +126,9 @@ 
 	}
 
 	public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '', $description = '') {
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
+		if ($last_seen == '') {
+			$last_seen = date('Y-m-d H:i:s');
+		}
 		$query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source,type,source_id,last_seen,location_id,description) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source,:type,:source_id,:last_seen,:location_id,:description)";
 		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
 		try {
@@ -134,7 +140,9 @@ 
 	}
 
 	public function updateLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '',$description = '') {
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
+		if ($last_seen == '') {
+			$last_seen = date('Y-m-d H:i:s');
+		}
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, source_id = :source_id, last_seen = :last_seen,location_id = :location_id, description = :description WHERE name = :name AND source = :source";
 		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
 		try {
@@ -157,7 +165,9 @@ 
 	}
 
 	public function updateLocationByLocationID($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0, $location_id,$last_seen = '',$description = '') {
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
+		if ($last_seen == '') {
+			$last_seen = date('Y-m-d H:i:s');
+		}
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, last_seen = :last_seen, description = :description WHERE location_id = :location_id AND source = :source AND source_id = :source_id";
 		$query_values = array(':source_id' => $source_id,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
 		try {

js/map.3d.js.php

Braces +53 added lines, -16 removed lines

@@ -57,21 +57,30 @@ 
 
 document.cookie =  'MapFormat=3d; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
 <?php
-	if (isset($_COOKIE['MapType3D'])) $MapType = $_COOKIE['MapType3D'];
-	else $MapType = $globalMapProvider;
-//	unset($_COOKIE['MapType']);
+	if (isset($_COOKIE['MapType3D'])) {
+		$MapType = $_COOKIE['MapType3D'];
+	} else {
+		$MapType = $globalMapProvider;
+	}
+	//	unset($_COOKIE['MapType']);
 
 	if ($MapType != 'Mapbox' && $MapType != 'OpenStreetMap' && $MapType != 'Bing-Aerial' && $MapType != 'Bing-Hybrid' && $MapType != 'Bing-Road' && $MapType != 'offline' && $MapType != 'ArcGIS-Streetmap' && $MapType != 'ArcGIS-Satellite' && $MapType != 'NatGeo-Street') {
-		if (isset($globalBingMapKey) && $globalBingMapKey != '') $MapType = 'Bing-Aerial';
-		else $MapType = 'OpenStreetMap';
+		if (isset($globalBingMapKey) && $globalBingMapKey != '') {
+			$MapType = 'Bing-Aerial';
+		} else {
+			$MapType = 'OpenStreetMap';
+		}
 	}
 	if (($MapType == 'Bing-Aerial' || $MapType == 'Bing-Hybrid' || $MapType == 'Bing-Road') && (!isset($globalBingMapKey) || $globalBingMapKey == '')) {
 		$MapType = 'OpenStreetMap';
 	}
 	if ($MapType == 'Mapbox') {
-		if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId;
-		else $MapBoxId = $_COOKIE['MapType3DId'];
-?>
+		if ($_COOKIE['MapTypeId'] == 'default') {
+			$MapBoxId = $globalMapboxId;
+		} else {
+			$MapBoxId = $_COOKIE['MapType3DId'];
+		}
+		?>
 	var imProv = Cesium.MapboxImageryProvider({
 		credit: 'Map data © OpenStreetMap contributors, ' +
 	      'CC-BY-SA, ' +
@@ -153,13 +162,23 @@ 
 		credit : 'Imagery courtesy Natural Earth'
 	});
 <?php
-	}  elseif (isset($globalMapCustomLayer[$MapType])) {
+	} elseif (isset($globalMapCustomLayer[$MapType])) {
 		$customid = $MapType;
 ?>
 	var imProv = Cesium.createOpenStreetMapImageryProvider({
 		url : '<?php print $globalMapCustomLayer[$customid]['url']; ?>',
-		maximumLevel: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '99'; ?>,
-		minimumLevel: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>,
+		maximumLevel: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) {
+	print $globalMapCustomLayer[$customid]['maxZoom'];
+} else {
+	print '99';
+}
+?>,
+		minimumLevel: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) {
+	print $globalMapCustomLayer[$customid]['minZoom'];
+} else {
+	print '0';
+}
+?>,
 		credit: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
 	});
 <?php
@@ -449,7 +468,12 @@ 
 	imageryProvider : imProv,
 	timeline : archive,
 	animation : false,
-	shadows : <?php if ((isset($globalMap3DShadows) && $globalMap3DShadows === FALSE) || (isset($_COOKIE['map3dnoshadows']) && $_COOKIE['map3dnoshadows'] == 'true')) print 'false'; else print 'true'; ?>,
+	shadows : <?php if ((isset($globalMap3DShadows) && $globalMap3DShadows === FALSE) || (isset($_COOKIE['map3dnoshadows']) && $_COOKIE['map3dnoshadows'] == 'true')) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	infoBox : false,
 	navigationHelpButton : false,
 	geocoder : false,
@@ -464,8 +488,11 @@ 
 	if (isset($_COOKIE['lastcentercoord']) || (isset($globalCenterLatitude) && isset($globalCenterLongitude) && $globalCenterLatitude != '' && $globalCenterLongitude != '')) {
 		if (isset($_COOKIE['lastcentercoord'])) {
 			$lastcentercoord = explode(',',$_COOKIE['lastcentercoord']);
-			if (!isset($lastcentercoord[3])) $zoom = $lastcentercoord[2]*1000000.0;
-			else $zoom = $lastcentercoord[3];
+			if (!isset($lastcentercoord[3])) {
+				$zoom = $lastcentercoord[2]*1000000.0;
+			} else {
+				$zoom = $lastcentercoord[3];
+			}
 			$viewcenterlatitude = $lastcentercoord[0];
 			$viewcenterlongitude = $lastcentercoord[1];
 		} else {
@@ -597,7 +624,12 @@ 
 ?>
 
 update_locationsLayer();
-setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 
 var currentposition;
 viewer.camera.moveEnd.addEventListener(function() { 
@@ -755,5 +787,10 @@ 
 			}
 		}
 	}
-	,<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+	,<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 }

search-georss.php

Braces +18 added lines, -7 removed lines

@@ -15,8 +15,12 @@ 
 	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
 		$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
 		$sql_date = $end_date;
-	} else $sql_date = '';
-} else $sql_date = '';
+	} else {
+		$sql_date = '';
+	}
+	} else {
+	$sql_date = '';
+}
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
@@ -30,8 +34,12 @@ 
 	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
 		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
-	} else $sql_altitude = '';
-} else $sql_altitude = '';
+	} else {
+		$sql_altitude = '';
+	}
+	} else {
+	$sql_altitude = '';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
@@ -49,7 +57,7 @@ 
 		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 	}
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
 	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
@@ -70,8 +78,11 @@ 
 
 $date = date("c", time());
 
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
-else $sort = '';
+if (isset($_GET['sort'])) {
+	$sort = $_GET['sort'];
+} else {
+	$sort = '';
+}
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
 $id = filter_input(INPUT_GET,'id',FILTER_SANITIZE_STRING);
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);

search-php.php

Braces +18 added lines, -7 removed lines

@@ -15,8 +15,12 @@ 
 	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
 		$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
 		$sql_date = $end_date;
-	} else $sql_date = '';
-} else $sql_date = '';
+	} else {
+		$sql_date = '';
+	}
+	} else {
+	$sql_date = '';
+}
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
@@ -30,8 +34,12 @@ 
 	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
 		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
-	} else $sql_altitude = '';
-} else $sql_altitude = '';
+	} else {
+		$sql_altitude = '';
+	}
+	} else {
+	$sql_altitude = '';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
@@ -48,7 +56,7 @@ 
 		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 	}
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
 	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
@@ -66,8 +74,11 @@ 
 
 header("Content-type: text/plain");
 
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
-else $sort = '';
+if (isset($_GET['sort'])) {
+	$sort = $_GET['sort'];
+} else {
+	$sort = '';
+}
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
 $id = filter_input(INPUT_GET,'id',FILTER_SANITIZE_NUMBER_INT);
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);