Ysurac / FlightAirMap

registration.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 if ($_POST['registration'] != "")
 {
-	$registration = filter_input(INPUT_POST,'registration',FILTER_SANITIZE_STRING);
+	$registration = filter_input(INPUT_POST, 'registration', FILTER_SANITIZE_STRING);
 	header('Location: '.$globalURL.'/registration/'.$registration);
 } else {
 	header('Location: '.$globalURL);

js/map.js.php

Spacing +30 added lines, -30 removed lines

@@ -2,7 +2,7 @@ 
 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;
@@ -18,10 +18,10 @@ 
 	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
 	if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
 	else $enddate = time();
-	setcookie("archive_begin",$begindate);
-	setcookie("archive_end",$enddate);
-	setcookie("archive_update",$lastupd);
-	setcookie("archive_speed",$archivespeed);
+	setcookie("archive_begin", $begindate);
+	setcookie("archive_end", $enddate);
+	setcookie("archive_update", $lastupd);
+	setcookie("archive_speed", $archivespeed);
 ?>
 document.cookie =  'archive_begin=<?php print $begindate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
 document.cookie =  'archive_end=<?php print $enddate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
@@ -92,16 +92,16 @@ 
 <?php
 	}
 	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['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['latitude'])) {
-		$latitude = filter_input(INPUT_GET,'latitude',FILTER_SANITIZE_STRING);
+		$latitude = filter_input(INPUT_GET, 'latitude', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['longitude'])) {
-		$longitude = filter_input(INPUT_GET,'longitude',FILTER_SANITIZE_STRING);
+		$longitude = filter_input(INPUT_GET, 'longitude', FILTER_SANITIZE_STRING);
 	}
 ?>
 
@@ -136,7 +136,7 @@ 
 	     || navigator.userAgent.match(/BlackBerry/i)
 	     || navigator.userAgent.match(/Windows Phone/i))
 	{
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
+		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom - 1; else print '8'; ?>;
 	} else {
 		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
 	}
@@ -230,19 +230,19 @@ 
 	map.addLayer(yandexLayer);
 <?php
 	} elseif ($MapType == 'Bing-Aerial') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Hybrid') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Road') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
 	map.addLayer(bingLayer);
@@ -534,10 +534,10 @@ 
 	};
 	archive.update = function (props) {
 		if (typeof props != 'undefined') {
-			//this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' +  '<b>' + props.archive_date + ' UTC </b>' + '<br/><i class="fa fa-fast-backward" aria-hidden="true"></i> <i class="fa fa-backward" aria-hidden="true"></i>  <a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>  <i class="fa fa-forward" aria-hidden="true"></i> <i class="fa fa-fast-forward" aria-hidden="true"></i>';
-			this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' +  '<b>' + props.archive_date + ' UTC </b>' + '<br/><a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>';
+			//this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' +  '<b>' + props.archive_date + ' UTC </b>' + '<br/><i class="fa fa-fast-backward" aria-hidden="true"></i> <i class="fa fa-backward" aria-hidden="true"></i>  <a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>  <i class="fa fa-forward" aria-hidden="true"></i> <i class="fa fa-fast-forward" aria-hidden="true"></i>';
+			this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' +  '<b>' + props.archive_date + ' UTC </b>' + '<br/><a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>';
 		} else {
-			this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' +  '<b><i class="fa fa-spinner fa-pulse fa-2x fa-fw margin-bottom"></i></b>';
+			this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' +  '<b><i class="fa fa-spinner fa-pulse fa-2x fa-fw margin-bottom"></i></b>';
 		}
 
 	};
@@ -737,7 +737,7 @@ 
 <?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
 		}
@@ -753,7 +753,7 @@ 
 			    /*
 			    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; ?>]
 			    */
 			})
 		    })
@@ -786,7 +786,7 @@ 
 <?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
 		}
@@ -834,7 +834,7 @@ 
 <?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
 		}
@@ -1460,23 +1460,23 @@ 
 	    airs.push(air.value);
 	}
     }
-    document.cookie =  'filter_Airlines='+airs.join()+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_Airlines='+airs.join()+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
 }
 function airlinestype(selectObj) {
     var idx = selectObj.selectedIndex;
     var airtype = selectObj.options[idx].value;
-    document.cookie =  'filter_airlinestype='+airtype+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_airlinestype='+airtype+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
 }
 function alliance(selectObj) {
     var idx = selectObj.selectedIndex;
     var alliance = selectObj.options[idx].value;
-    document.cookie =  'filter_alliance='+alliance+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_alliance='+alliance+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
 }
 
 function identfilter() {
     var ident = $('#identfilter').val();
     console.log('Filter with '+ident);
-    document.cookie =  'filter_ident='+ident+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_ident='+ident+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function removefilters() {
     // Get an array of all cookie names (the regex matches what we don't want)
@@ -1498,7 +1498,7 @@ 
 	}
     }
     //document.cookie =  'Sources='+sources.join()+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'filter_Sources='+sources.join()+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_Sources='+sources.join()+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
 }
 
 function show3D() {
@@ -1521,23 +1521,23 @@ 
 
 function clickVATSIM(cb) {
     //document.cookie =  'ShowVATSIM='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'filter_ShowVATSIM='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_ShowVATSIM='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function clickIVAO(cb) {
     //document.cookie =  'ShowIVAO='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'filter_ShowIVAO='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_ShowIVAO='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function clickphpVMS(cb) {
     //document.cookie =  'ShowVMS='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'filter_ShowVMS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_ShowVMS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function clickSBS1(cb) {
     //document.cookie =  'ShowSBS1='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'filter_ShowSBS1='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_ShowSBS1='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function clickAPRS(cb) {
     //document.cookie =  'ShowAPRS='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'filter_ShowAPRS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_ShowAPRS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function clickFlightPopup(cb) {
     document.cookie =  'flightpopup='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'

Braces +128 added lines, -33 removed lines

@@ -5,8 +5,11 @@ 
 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;
+}
 if (isset($_GET['archive'])) {
 	//$archiveupdatetime = 50;
 	$archiveupdatetime = $globalMapRefresh;
@@ -16,8 +19,11 @@ 
 	//$lastupd = round(($_GET['enddate']-$_GET['begindate'])/(($_GET['during']*60)/10));
 	//$lastupd = 20;
 	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
-	if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
-	else $enddate = time();
+	if (isset($_GET['enddate']) && $_GET['enddate'] != '') {
+		$enddate = $_GET['enddate'];
+	} else {
+		$enddate = time();
+	}
 	setcookie("archive_begin",$begindate);
 	setcookie("archive_end",$enddate);
 	setcookie("archive_update",$lastupd);
@@ -123,7 +129,17 @@ 
 	}
 
 	//create the map
-	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) print $latitude; else print $globalCenterLatitude; ?>,<?php if (isset($longitude)) print $longitude; else print $globalCenterLongitude; ?>], zoom);
+	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) {
+	print $latitude;
+} else {
+	print $globalCenterLatitude;
+}
+?>,<?php if (isset($longitude)) {
+	print $longitude;
+} else {
+	print $globalCenterLongitude;
+}
+?>], zoom);
 <?php
 	} else {
 ?>
@@ -136,9 +152,19 @@ 
 	     || navigator.userAgent.match(/BlackBerry/i)
 	     || navigator.userAgent.match(/Windows Phone/i))
 	{
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
+		var zoom = <?php if (isset($globalLiveZoom)) {
+	print $globalLiveZoom-1;
+} else {
+	print '8';
+}
+?>;
 	} else {
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
+		var zoom = <?php if (isset($globalLiveZoom)) {
+	print $globalLiveZoom;
+} else {
+	print '9';
+}
+?>;
 	}
 
 	//create the map
@@ -163,16 +189,27 @@ 
 	bounds = L.latLngBounds(southWest,northEast);
 	//a few title layers
 <?php
-	if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType'];
-	else $MapType = $globalMapProvider;
+	if (isset($_COOKIE['MapType'])) {
+		$MapType = $_COOKIE['MapType'];
+	} else {
+		$MapType = $globalMapProvider;
+	}
 
 	if ($MapType == 'Mapbox') {
-		if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId;
-		else $MapBoxId = $_COOKIE['MapTypeId'];
-?>
+		if ($_COOKIE['MapTypeId'] == 'default') {
+			$MapBoxId = $globalMapboxId;
+		} else {
+			$MapBoxId = $_COOKIE['MapTypeId'];
+		}
+		?>
 	L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
 	    maxZoom: 18,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
 	      '<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' +
 	      'Imagery © <a href="http://mapbox.com">Mapbox</a>',
@@ -184,7 +221,12 @@ 
 ?>
 	L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
 	    maxZoom: 18,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
 	      '<a href="www.openstreetmap.org/copyright">Open Database Licence</a>'
 	}).addTo(map);
@@ -230,20 +272,26 @@ 
 	map.addLayer(yandexLayer);
 <?php
 	} elseif ($MapType == 'Bing-Aerial') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Hybrid') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Road') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
 	map.addLayer(bingLayer);
 <?php
@@ -291,7 +339,12 @@ 
 		}
 	} elseif ($globalBounding == 'circle') {
 ?>
-	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) print $globalBoundingCircleSize; else print '70000'; ?>,{
+	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) {
+	print $globalBoundingCircleSize;
+} else {
+	print '70000';
+}
+?>,{
 	    color: '#92C7D1',
 	    fillColor: '#92C7D1',
 	    fillOpacity: 0.3,
@@ -350,8 +403,11 @@ 
 
 	function update_airportsLayer() {
 	    <?php
-		if (isset($_COOKIE['AirportZoom'])) $getZoom = $_COOKIE['AirportZoom'];
-		else $getZoom = '7';
+		if (isset($_COOKIE['AirportZoom'])) {
+			$getZoom = $_COOKIE['AirportZoom'];
+		} else {
+			$getZoom = '7';
+		}
 	    ?>
 	    //if (map.getZoom() <= <?php print $getZoom; ?>) {
 		if (typeof airportsLayer != 'undefined') {
@@ -687,9 +743,13 @@ 
 		    if (callsign != ""){ markerLabel += callsign; }
 		    if (departure_airport_code != "" && arrival_airport_code != "" && departure_airport_code != "NA" && arrival_airport_code != "NA"){ markerLabel += ' ( '+departure_airport_code+' - '+arrival_airport_code+' )'; }
 <?php
-	if (isset($_COOKIE['IconColor'])) $IconColor = $_COOKIE['IconColor'];
-	elseif (isset($globalAircraftIconColor)) $IconColor = $globalAircraftIconColor;
-	else $IconColor = '1a3151';
+	if (isset($_COOKIE['IconColor'])) {
+		$IconColor = $_COOKIE['IconColor'];
+	} elseif (isset($globalAircraftIconColor)) {
+		$IconColor = $globalAircraftIconColor;
+	} else {
+		$IconColor = '1a3151';
+	}
 	if (!isset($ident) && !isset($flightaware_id)) {
 ?>
 		    info_update(feature.properties.fc);
@@ -737,7 +797,12 @@ 
 <?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
 		}
@@ -786,7 +851,12 @@ 
 <?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
 		}
@@ -834,7 +904,12 @@ 
 <?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
 		}
@@ -1177,14 +1252,24 @@ 
 	if (isset($_GET['archive'])) {
 ?>
 //then load it again every 30 seconds
-//  var reload = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>);
+//  var reload = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) {
+	print ($globalMapRefresh*1000)/2;
+} else {
+	print '15000';
+}
+?>);
 reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php print $archiveupdatetime*1000; ?>);
 <?php
 	} else {
 ?>
 //then load it again every 30 seconds
 reloadPage = setInterval(
-    function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+    function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 var currentdate = new Date();
 var currentyear = new Date().getFullYear();
 var begindate = new Date(Date.UTC(currentyear,11,24,2,0,0,0));
@@ -1196,7 +1281,12 @@ 
 		if (!((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) && (isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
 ?>
 update_polarLayer();
-setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
 		}
 ?>
@@ -1212,7 +1302,12 @@ 
 	if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
 ?>
 update_atcLayer();
-setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
 	}
 ?>

Indentation +32 added lines, -32 removed lines

@@ -352,7 +352,7 @@ 
 	    <?php
 		if (isset($_COOKIE['AirportZoom'])) $getZoom = $_COOKIE['AirportZoom'];
 		else $getZoom = '7';
-	    ?>
+		?>
 	    //if (map.getZoom() <= <?php print $getZoom; ?>) {
 		if (typeof airportsLayer != 'undefined') {
 			if (map.hasLayer(airportsLayer) == true) {
@@ -512,7 +512,7 @@ 
 	update_locationsLayer();
 	
 <?php
-	    if (!isset($ident) && !isset($flightaware_id)) {
+		if (!isset($ident) && !isset($flightaware_id)) {
 ?>
 	
 	function info_update (props) {
@@ -520,11 +520,11 @@ 
 	}
 
 	<?php
-	    }
+		}
 	?>
 
 	<?php
-	    if (isset($_GET['archive'])) {
+		if (isset($_GET['archive'])) {
 	?>
 	var archive = L.control();
 	archive.onAdd = function (map) {
@@ -543,12 +543,12 @@ 
 	};
 	archive.addTo(map);
 	<?php
-	    }
+		}
 	?>
 
 
 	<?php
-	    //if ((isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'false') || (isset($globalMapPopup) && !$globalMapPopup)) {
+		//if ((isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'false') || (isset($globalMapPopup) && !$globalMapPopup)) {
 	?>
 
 	$(".showdetails").on("click",".close",function(){
@@ -1041,15 +1041,15 @@ 
 			if (map.getZoom() > 7) {
                 	    var style = {
 				<?php
-				    if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
+					if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
 				?>
 				"color": "#1a3151",
 				<?php
-				    } else {
+					} else {
 				?>
 				"color": getAltitudeColor(altitude),
 				<?php
-				    }
+					}
 				?>
 				"weight": 3,
 				"opacity": 1
@@ -1059,15 +1059,15 @@ 
 			} else {
 			    var style = {
 				<?php
-				    if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
+					if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
 				?>
 				"color": "#1a3151",
 				<?php
-				    } else {
+					} else {
 				?>
 				"color": getAltitudeColor(altitude),
 				<?php
-				    }
+					}
 				?>
 				"weight": 2,
 				"opacity": 1
@@ -1079,15 +1079,15 @@ 
 			if (map.getZoom() > 7) {
                 	    var style = {
 				<?php
-				    if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
+					if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
 				?>
                     		"color": "#1a3151",
 				<?php
-				    } else {
+					} else {
 				?>
 				"color": getAltitudeColor(altitude),
 				<?php
-				    }
+					}
 				?>
 				"weight": 3,
 				"opacity": 0.6
@@ -1097,15 +1097,15 @@ 
 			} else {
                 	    var style = {
 				<?php
-				    if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
+					if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
 				?>
                     		"color": "#1a3151",
 				<?php
-				    } else {
+					} else {
 				?>
                     		"color": getAltitudeColor(altitude),
 				<?php
-				    }
+					}
 				?>
 				"weight": 2,
 				"opacity": 0.6
@@ -1115,21 +1115,21 @@ 
 			}
                     }
 		    <?php
-            		} else {
-            	    ?>
+					} else {
+					?>
 		    if (map.getZoom() > 7) {
                 	var style = {
 			    <?php
 				if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
-			    ?>
+				?>
                     	    "color": "#1a3151",
 			    <?php
 				} else {
-			    ?>
+				?>
                     	    "color": getAltitudeColor(altitude),
 			    <?php
 				}
-			    ?>
+				?>
                     	    "weight": 3,
                     	    "opacity": 0.6
                 	};
@@ -1139,15 +1139,15 @@ 
                 	var style = {
 			    <?php
 				if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
-			    ?>
+				?>
 			    "color": "#1a3151",
 			    <?php
 				} else {
-			    ?>
+				?>
 			    "color": getAltitudeColor(altitude),
 			    <?php
 				}
-			    ?>
+				?>
                     	    "weight": 2,
                     	    "opacity": 0.6
                 	};
@@ -1155,7 +1155,7 @@ 
                 	layer_data.addLayer(layer);
 		    }
 <?php
-            		}
+					}
 ?>
 				}
 			    }
@@ -1220,10 +1220,10 @@ 
 
 
 <?php
-    // Add support for custom json via $globalMapJson
-    if (isset($globalMapJson) && is_array($globalMapJson)) {
+	// Add support for custom json via $globalMapJson
+	if (isset($globalMapJson) && is_array($globalMapJson)) {
 	foreach ($globalMapJson as $json) {
-	    if (isset($json['url'])) {
+		if (isset($json['url'])) {
 ?>
 update_genLayer('<?php print $json['url']; ?>');
 <?php
@@ -1232,9 +1232,9 @@ 
 setInterval(function(){update_genLayer('<?php print $json['url']; ?>')}, <?php print $json['refresh']; ?>);
 <?php
 		}
-	    }
+		}
+	}
 	}
-    }
 
 ?>
 

index.php

Spacing +14 added lines, -14 removed lines

@@ -4,7 +4,7 @@ 
 require_once('require/class.Language.php');
 require_once('require/class.Satellite.php');
 
-$trackident = filter_input(INPUT_GET,'trackid',FILTER_SANITIZE_STRING);
+$trackident = filter_input(INPUT_GET, 'trackid', FILTER_SANITIZE_STRING);
 if ($trackident != '') {
 	require_once('require/class.SpotterLive.php');
 	$SpotterLive = new SpotterLive();
@@ -14,7 +14,7 @@ 
 		$spotterid = $Spotter->getSpotterIDBasedOnFlightAwareID($trackident);
 		header('Location: '.$globalURL.'/flightid/'.$spotterid);
 	} else {
-		setcookie('MapTrack',$resulttrackident[0]['flightaware_id']);
+		setcookie('MapTrack', $resulttrackident[0]['flightaware_id']);
 	}
 } else {
 	unset($_COOKIE['MapTrack']);
@@ -167,7 +167,7 @@ 
 		        <div class="form-group">
 			    <label>From (UTC):</label>
 		            <div class='input-group date' id='datetimepicker1'>
-            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a",$_COOKIE['archive_begin']); ?>" required />
+            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a", $_COOKIE['archive_begin']); ?>" required />
 		                <span class="input-group-addon">
             			    <span class="glyphicon glyphicon-calendar"></span>
 		                </span>
@@ -176,7 +176,7 @@ 
 		        <div class="form-group">
 			    <label>To (UTC):</label>
 		            <div class='input-group date' id='datetimepicker2'>
-		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a",$_COOKIE['archive_end']); ?>" />
+		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a", $_COOKIE['archive_end']); ?>" />
             			<span class="input-group-addon">
 		                    <span class="glyphicon glyphicon-calendar"></span>
             			</span>
@@ -301,8 +301,8 @@ 
 		    <li><?php echo _("Type of Terrain:"); ?>
 			<select  class="selectpicker" onchange="terrainType(this);">
 			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option>
-			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option>
-			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option>
+			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected'; ?>>ellipsoid</option>
+			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected'; ?>>vr terrain</option>
 			</select>
 		    </li>
 <?php
@@ -326,7 +326,7 @@ 
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li>
 <?php
     }
-    if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
+    if (time() > mktime(0, 0, 0, 12, 1, date("Y")) && time() < mktime(0, 0, 0, 12, 31, date("Y"))) {
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li>
 <?php
@@ -439,10 +439,10 @@ 
 					$Spotter = new Spotter();
 					$allairlinenames = $Spotter->getAllAirlineNames();
 				}
-				foreach($allairlinenames as $airline) {
+				foreach ($allairlinenames as $airline) {
 					$airline_name = $airline['airline_name'];
-					if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...';
-					if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) {
+					if (strlen($airline_name) > 30) $airline_name = substr($airline_name, 0, 30).'...';
+					if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'], explode(',', $_COOKIE['filter_Airlines']))) {
 						echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>';
 					} else {
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
@@ -461,7 +461,7 @@ 
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
 			    <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
 			    <?php
-				foreach($allalliancenames as $alliance) {
+				foreach ($allalliancenames as $alliance) {
 					$alliance_name = $alliance['alliance'];
 					if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] == $alliance_name) {
 						echo '<option value="'.$alliance_name.'" selected>'.$alliance_name.'</option>';
@@ -482,8 +482,8 @@ 
 			<select class="selectpicker" multiple onchange="sources(this);">
 			    <?php
 				$Spotter = new Spotter();
-				foreach($Spotter->getAllSourceName('aprs') as $source) {
-					if (isset($_COOKIE['filter_Sources']) && in_array($source['source_name'],explode(',',$_COOKIE['filter_Sources']))) {
+				foreach ($Spotter->getAllSourceName('aprs') as $source) {
+					if (isset($_COOKIE['filter_Sources']) && in_array($source['source_name'], explode(',', $_COOKIE['filter_Sources']))) {
 						echo '<option value="'.$source['source_name'].'" selected>'.$source['source_name'].'</option>';
 					} else {
 						echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>';
@@ -555,7 +555,7 @@ 
 					else if ($type_name == 'radar') $type_name = 'Radar Calibration';
 					else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches';
 					
-					if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) {
+					if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'], explode(',', $_COOKIE['sattypes']))) {
 						print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>';
 					} else {
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';

Indentation +78 added lines, -78 removed lines

@@ -36,7 +36,7 @@ 
 <div id="showdetails" class="showdetails"></div>
 <div id="infobox" class="infobox"><h4><?php echo _("Aircrafts detected"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div>
 <?php
-    if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
+	if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
 
 ?>
 <script src="<?php echo $globalURL; ?>/js/map.3d.js.php"></script>
@@ -56,7 +56,7 @@ 
 <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script>
 <?php
 	}
-    }
+	}
 ?>
 <div id="dialog" title="<?php echo _("Session has timed-out"); ?>">
   <p><?php echo _("In order to save data consumption web page times out after 30 minutes. Close this dialog to continue."); ?></p>
@@ -70,34 +70,34 @@ 
 	<li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li>
 	<li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li>
 <?php
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 	if (isset($globalArchive) && $globalArchive == TRUE) {
 ?>
 	<li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li>
 <?php
 	}
-    }
+	}
 ?>
 	<li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li>
 	<li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li>
 	<li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li>
 <?php
-    if (isset($globalMap3D) && $globalMap3D) {
+	if (isset($globalMap3D) && $globalMap3D) {
 	if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 	<li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li>
 <?php
-        } else {
-    	    if (isset($globalMapSatellites) && $globalMapSatellites) {
+		} else {
+			if (isset($globalMapSatellites) && $globalMapSatellites) {
 ?>
 	<li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li>
 <?php
-	    }
+		}
 ?>
 	<li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li>
 <?php
 	}
-    }
+	}
 ?>
     </ul>
 
@@ -171,7 +171,7 @@ 
 ?>
         </div>
 <?php
-    if (isset($globalArchive) && $globalArchive == TRUE) {
+	if (isset($globalArchive) && $globalArchive == TRUE) {
 ?>
         <div class="sidebar-pane" id="archive">
 	    <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -231,7 +231,7 @@ 
 	    </form>
 	</div>
 <?php
-    }
+	}
 ?>
         <div class="sidebar-pane" id="settings">
 	    <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -242,56 +242,56 @@ 
 			    <?php
 				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
 				else $MapType = $_COOKIE['MapType'];
-			    ?>
+				?>
 			    <?php
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
-			    ?>
+				?>
 			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
 			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
 			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
 			    <?php
 				}
-			    ?>
+				?>
 			    <?php
-			        if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
-			    ?>
+					if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
+				?>
 			    <?php
-				    if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
-			    ?>
+					if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
+				?>
 			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
 			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
 			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <?php
-				    if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
-			    ?>
+					if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
+				?>
 			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
 			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
 			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
 			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <?php
-				    if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
-			    ?>
+					if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
+				?>
 			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
 			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
 			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
 			    <?php
 				}
-			    ?>
+				?>
 			    <?php
-				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
+					if (isset($globalMapboxToken) && $globalMapboxToken != '') {
 					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
 					else $MapBoxId = $_COOKIE['MapTypeId'];
-			    ?>
+				?>
 			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
 			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
 			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
@@ -305,13 +305,13 @@ 
 			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
 			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
 			</select>
 		    </li>
 <?php
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
 		    <li><?php echo _("Type of Terrain:"); ?>
 			<select  class="selectpicker" onchange="terrainType(this);">
@@ -321,10 +321,10 @@ 
 			</select>
 		    </li>
 <?php
-    }
+	}
 ?>
 <?php
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
 ?>
 		    
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
@@ -332,59 +332,59 @@ 
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || !isset($_COOKIE['MapRoute'])) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li>
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
 <?php
-    }
+	}
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true') print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li>
 <?php
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li>
 <?php
-    }
-    if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
+	}
+	if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li>
 <?php
-    }
+	}
 ?>
 
 		    <?php
 			if (function_exists('array_column')) {
-			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
-		    ?>
+				if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
+			?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
-			    }
+				}
 			} elseif (isset($globalSources)) {
-			    $dispolar = false;
-			    foreach ($globalSources as $testsource) {
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
-			    }
-			    if ($dispolar) {
-		    ?>
+				$dispolar = false;
+				foreach ($globalSources as $testsource) {
+					if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
+				}
+				if ($dispolar) {
+			?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
-			    }
-		        }
-		    ?>
+				}
+				}
+			?>
 <?php
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
 ?>
 
 		    <?php
-		        if (extension_loaded('gd') && function_exists('gd_info')) {
-		    ?>
+				if (extension_loaded('gd') && function_exists('gd_info')) {
+			?>
 		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
 		    <?php 
 			if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
-		    ?>
+			?>
 		    <li><?php echo _("Aircraft icon color:"); ?>
 			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>">
 		    </li>
 		    <?php
-			    }
-		        }
-		    ?>
+				}
+				}
+			?>
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
 			<div class="range">
 			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>">
@@ -392,14 +392,14 @@ 
 			</div>
 		    </li>
 <?php
-    } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
+	} elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
 ?>
 		    <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Aircraft color"); ?></li>
 		    <li><?php echo _("Aircraft icon color:"); ?>
 			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print 'ff0000'; ?>">
 		    </li>
 <?php
-    }
+	}
 ?>
 		    <li><?php echo _("Distance unit:"); ?>
 			<select class="selectpicker" onchange="unitdistance(this);">
@@ -432,16 +432,16 @@ 
 		    <ul>
 		    <?php
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
-		    ?>
+			?>
 			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
 			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
 			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
-		    ?>
+			?>
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
 			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
 			<?php } ?>
@@ -450,7 +450,7 @@ 
 			<?php } ?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <li><?php echo _("Display airlines:"); ?>
 		    <br/>
 			<select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines">
@@ -470,14 +470,14 @@ 
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		    <?php
 			$Spotter = new Spotter();
 			$allalliancenames = $Spotter->getAllAllianceNames();
 			if (!empty($allalliancenames)) {
-		    ?>
+			?>
 		    <li><?php echo _("Display alliance:"); ?>
 		    <br/>
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
@@ -491,15 +491,15 @@ 
 						echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (isset($globalAPRS) && $globalAPRS) {
-		    ?>
+			?>
 		    <li><?php echo _("Display APRS sources name:"); ?>
 			<select class="selectpicker" multiple onchange="sources(this);">
 			    <?php
@@ -511,15 +511,15 @@ 
 						echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
-		    ?>
+			?>
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
 			<select class="selectpicker" onchange="airlinestype(this);">
 			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
@@ -530,7 +530,7 @@ 
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <li>
 			<?php echo _("Display flight with ident:"); ?>
 			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
@@ -543,7 +543,7 @@ 
 	    </form>
     	</div>
 <?php
-    if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
+	if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
         <div class="sidebar-pane" id="satellites">
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -583,14 +583,14 @@ 
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		</ul>
 	    </form>
 	</div>
 <?php
-    }
+	}
 ?>
     </div>
 </div>

Braces +373 added lines, -98 removed lines

@@ -150,11 +150,26 @@ 
 				<li><div class="checkbox"><label><input type="checkbox" name="notamcb" value="1" onclick="showNotam();" /><?php echo _("Display NOTAM"); ?></label></div></li>
 				<li><?php echo _("NOTAM scope:"); ?>
 					<select class="selectpicker" onchange="notamscope(this);">
-						<option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') print ' selected'; ?>>All</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') print ' selected'; ?>>Airport/Enroute warning</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') print ' selected'; ?>>Airport warning</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') print ' selected'; ?>>Navigation warning</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') print ' selected'; ?>>Enroute warning</option>
+						<option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') {
+	print ' selected';
+}
+?>>All</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') {
+	print ' selected';
+}
+?>>Airport/Enroute warning</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') {
+	print ' selected';
+}
+?>>Airport warning</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') {
+	print ' selected';
+}
+?>>Navigation warning</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') {
+	print ' selected';
+}
+?>>Enroute warning</option>
 					</select
 				</li>
 			</ul>
@@ -182,7 +197,12 @@ 
 		        <div class="form-group">
 			    <label>From (UTC):</label>
 		            <div class='input-group date' id='datetimepicker1'>
-            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a",$_COOKIE['archive_begin']); ?>" required />
+            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) {
+	print $_POST['start_date'];
+} elseif (isset($_COOKIE['archive_begin'])) {
+	print date("m/d/Y h:i a",$_COOKIE['archive_begin']);
+}
+?>" required />
 		                <span class="input-group-addon">
             			    <span class="glyphicon glyphicon-calendar"></span>
 		                </span>
@@ -191,7 +211,12 @@ 
 		        <div class="form-group">
 			    <label>To (UTC):</label>
 		            <div class='input-group date' id='datetimepicker2'>
-		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a",$_COOKIE['archive_end']); ?>" />
+		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) {
+	print $_POST['end_date'];
+} elseif (isset($_COOKIE['archive_end'])) {
+	print date("m/d/Y h:i a",$_COOKIE['archive_end']);
+}
+?>" />
             			<span class="input-group-addon">
 		                    <span class="glyphicon glyphicon-calendar"></span>
             			</span>
@@ -217,8 +242,20 @@ 
 
 		    <li><?php echo _("Playback speed:"); ?>
 			<div class="range">
-			    <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php  if (isset($_POST['archivespeed'])) print $_POST['archivespeed']; elseif (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?>">
-			    <output id="archivespeedrange"><?php  if (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?></output>
+			    <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php  if (isset($_POST['archivespeed'])) {
+	print $_POST['archivespeed'];
+} elseif (isset($_COOKIE['archive_speed'])) {
+	print $_COOKIE['archive_speed'];
+} else {
+	print '1';
+}
+?>">
+			    <output id="archivespeedrange"><?php  if (isset($_COOKIE['archive_speed'])) {
+	print $_COOKIE['archive_speed'];
+} else {
+	print '1';
+}
+?></output>
 			</div>
 		    </li>
 		    <li><input type="submit" name="archive" value="Show archive" class="btn btn-primary" /></li>
@@ -240,15 +277,27 @@ 
 		    <li><?php echo _("Type of Map:"); ?>
 			<select  class="selectpicker" onchange="mapType(this);">
 			    <?php
-				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
-				else $MapType = $_COOKIE['MapType'];
+				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') {
+					$MapType = $globalMapProvider;
+				} else {
+					$MapType = $_COOKIE['MapType'];
+				}
 			    ?>
 			    <?php
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
 			    ?>
-			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
-			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
-			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
+			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') {
+	print ' selected';
+}
+?>>Bing-Aerial</option>
+			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') {
+	print ' selected';
+}
+?>>Bing-Hybrid</option>
+			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') {
+	print ' selected';
+}
+?>>Bing-Road</option>
 			    <?php
 				}
 			    ?>
@@ -258,56 +307,131 @@ 
 			    <?php
 				    if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
 			    ?>
-			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
-			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
-			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
+			    <option value="Here-Aerial"<?php if ($MapType == 'Here') {
+	print ' selected';
+}
+?>>Here-Aerial</option>
+			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') {
+	print ' selected';
+}
+?>>Here-Hybrid</option>
+			    <option value="Here-Road"<?php if ($MapType == 'Here') {
+	print ' selected';
+}
+?>>Here-Road</option>
 			    <?php
 				    }
 			    ?>
 			    <?php
 				    if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
 			    ?>
-			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
-			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
-			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
-			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
+			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') {
+	print ' selected';
+}
+?>>Google Roadmap</option>
+			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') {
+	print ' selected';
+}
+?>>Google Satellite</option>
+			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') {
+	print ' selected';
+}
+?>>Google Hybrid</option>
+			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') {
+	print ' selected';
+}
+?>>Google Terrain</option>
 			    <?php
 				    }
 			    ?>
 			    <?php
 				    if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
 			    ?>
-			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
-			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
-			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
+			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') {
+	print ' selected';
+}
+?>>MapQuest-OSM</option>
+			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') {
+	print ' selected';
+}
+?>>MapQuest-Aerial</option>
+			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') {
+	print ' selected';
+}
+?>>MapQuest-Hybrid</option>
 			    <?php
 				    }
 			    ?>
-			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
+			    <option value="Yandex"<?php if ($MapType == 'Yandex') {
+	print ' selected';
+}
+?>>Yandex</option>
 			    <?php
 				}
 			    ?>
 			    <?php
 				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
-					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
-					else $MapBoxId = $_COOKIE['MapTypeId'];
+					if (!isset($_COOKIE['MapTypeId'])) {
+						$MapBoxId = 'default';
+					} else {
+						$MapBoxId = $_COOKIE['MapTypeId'];
+					}
 			    ?>
-			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
-			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
-			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
-			    <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') print ' selected'; ?>>Mapbox dark</option>
-			    <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') print ' selected'; ?>>Mapbox satellite</option>
-			    <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') print ' selected'; ?>>Mapbox streets-satellite</option>
-			    <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') print ' selected'; ?>>Mapbox streets-basic</option>
-			    <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') print ' selected'; ?>>Mapbox comic</option>
-			    <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') print ' selected'; ?>>Mapbox outdoors</option>
-			    <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') print ' selected'; ?>>Mapbox pencil</option>
-			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
-			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
+			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') {
+	print ' selected';
+}
+?>>Mapbox default</option>
+			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') {
+	print ' selected';
+}
+?>>Mapbox streets</option>
+			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') {
+	print ' selected';
+}
+?>>Mapbox light</option>
+			    <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') {
+	print ' selected';
+}
+?>>Mapbox dark</option>
+			    <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') {
+	print ' selected';
+}
+?>>Mapbox satellite</option>
+			    <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') {
+	print ' selected';
+}
+?>>Mapbox streets-satellite</option>
+			    <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') {
+	print ' selected';
+}
+?>>Mapbox streets-basic</option>
+			    <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') {
+	print ' selected';
+}
+?>>Mapbox comic</option>
+			    <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') {
+	print ' selected';
+}
+?>>Mapbox outdoors</option>
+			    <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') {
+	print ' selected';
+}
+?>>Mapbox pencil</option>
+			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') {
+	print ' selected';
+}
+?>>Mapbox pirates</option>
+			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') {
+	print ' selected';
+}
+?>>Mapbox emerald</option>
 			    <?php
 				    }
 			    ?>
-			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
+			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') {
+	print ' selected';
+}
+?>>OpenStreetMap</option>
 			</select>
 		    </li>
 <?php
@@ -315,9 +439,18 @@ 
 ?>
 		    <li><?php echo _("Type of Terrain:"); ?>
 			<select  class="selectpicker" onchange="terrainType(this);">
-			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option>
-			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option>
-			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option>
+			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') {
+	print ' selected';
+}
+?>>stk terrain</option>
+			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') {
+	print ' selected';
+}
+?>>ellipsoid</option>
+			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') {
+	print ' selected';
+}
+?>>vr terrain</option>
 			</select>
 		    </li>
 <?php
@@ -327,18 +460,36 @@ 
     if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
 ?>
 		    
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || !isset($_COOKIE['flightpath'])) print 'checked'; ?> ><?php echo _("Display flight path"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || !isset($_COOKIE['MapRoute'])) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || !isset($_COOKIE['flightpath'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display flight path"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || !isset($_COOKIE['MapRoute'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display flight route on click"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) {
+	print 'checked';
+}
+?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
 <?php
     }
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true') print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Display airports on map"); ?></label></div></li>
 <?php
     if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Show mini-map"); ?></label></div></li>
 <?php
     }
     if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
@@ -352,17 +503,25 @@ 
 			if (function_exists('array_column')) {
 			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
 		    ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
 			    }
 			} elseif (isset($globalSources)) {
 			    $dispolar = false;
 			    foreach ($globalSources as $testsource) {
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
+			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) {
+			        	$dispolar = true;
+			        }
 			    }
 			    if ($dispolar) {
 		    ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
 			    }
 		        }
@@ -374,12 +533,22 @@ 
 		    <?php
 		        if (extension_loaded('gd') && function_exists('gd_info')) {
 		    ?>
-		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
+		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
 		    <?php 
 			if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
 		    ?>
 		    <li><?php echo _("Aircraft icon color:"); ?>
-			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>">
+			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) {
+	print $_COOKIE['IconColor'];
+} elseif (isset($globalAircraftIconColor)) {
+	print $globalAircraftIconColor;
+} else {
+	print '1a3151';
+}
+?>">
 		    </li>
 		    <?php
 			    }
@@ -387,38 +556,86 @@ 
 		    ?>
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
 			<div class="range">
-			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>">
-			    <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?></output>
+			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) {
+	print $_COOKIE['AirportZoom'];
+} elseif (isset($globalAirportZoom)) {
+	print $globalAirportZoom;
+} else {
+	print '7';
+}
+?>">
+			    <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) {
+	print $_COOKIE['AirportZoom'];
+} elseif (isset($globalAirportZoom)) {
+	print $globalAirportZoom;
+} else {
+	print '7';
+}
+?></output>
 			</div>
 		    </li>
 <?php
     } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
 ?>
-		    <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Aircraft color"); ?></li>
+		    <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Force Aircraft color"); ?></li>
 		    <li><?php echo _("Aircraft icon color:"); ?>
-			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print 'ff0000'; ?>">
+			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) {
+	print $_COOKIE['IconColor'];
+} elseif (isset($globalAircraftIconColor)) {
+	print $globalAircraftIconColor;
+} else {
+	print 'ff0000';
+}
+?>">
 		    </li>
 <?php
     }
 ?>
 		    <li><?php echo _("Distance unit:"); ?>
 			<select class="selectpicker" onchange="unitdistance(this);">
-			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option>
-			    <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) echo ' selected'; ?>>nm</option>
-			    <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) echo ' selected'; ?>>mi</option>
+			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
+	echo ' selected';
+}
+?>>km</option>
+			    <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
+	echo ' selected';
+}
+?>>nm</option>
+			    <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
+	echo ' selected';
+}
+?>>mi</option>
 		        </select>
 		    </li>
 		    <li><?php echo _("Altitude unit:"); ?>
 			<select class="selectpicker" onchange="unitaltitude(this);">
-			    <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) echo ' selected'; ?>>m</option>
-			    <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) echo ' selected'; ?>>feet</option>
+			    <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) {
+	echo ' selected';
+}
+?>>m</option>
+			    <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
+	echo ' selected';
+}
+?>>feet</option>
 		        </select>
 		    </li>
 		    <li><?php echo _("Speed unit:"); ?>
 			<select class="selectpicker" onchange="unitspeed(this);">
-			    <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) echo ' selected'; ?>>km/h</option>
-			    <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) echo ' selected'; ?>>mph</option>
-			    <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) echo ' selected'; ?>>knots</option>
+			    <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) {
+	echo ' selected';
+}
+?>>km/h</option>
+			    <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) {
+	echo ' selected';
+}
+?>>mph</option>
+			    <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) {
+	echo ' selected';
+}
+?>>knots</option>
 		        </select>
 		    </li>
 
@@ -433,9 +650,18 @@ 
 		    <?php
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
 		    ?>
-			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
-			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
-			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
+			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
+			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
+			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
 		    <?php
 			}
 		    ?>
@@ -443,10 +669,16 @@ 
 			if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
 		    ?>
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
-			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
+			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
 			<?php } ?>
 			<?php if (isset($globalAPRS) && $globalAPRS) { ?>
-			    <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) print 'checked'; ?> ><?php echo _("Display APRS data"); ?></label></div></li>
+			    <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display APRS data"); ?></label></div></li>
 			<?php } ?>
 		    <?php
 			}
@@ -463,7 +695,9 @@ 
 				}
 				foreach($allairlinenames as $airline) {
 					$airline_name = $airline['airline_name'];
-					if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...';
+					if (strlen($airline_name) > 30) {
+						$airline_name = substr($airline_name,0,30).'...';
+					}
 					if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) {
 						echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>';
 					} else {
@@ -481,7 +715,10 @@ 
 		    <li><?php echo _("Display alliance:"); ?>
 		    <br/>
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
-			    <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
+			    <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') {
+	echo ' selected';
+}
+?>><?php echo _("All"); ?></option>
 			    <?php
 				foreach($allalliancenames as $alliance) {
 					$alliance_name = $alliance['alliance'];
@@ -522,10 +759,22 @@ 
 		    ?>
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
 			<select class="selectpicker" onchange="airlinestype(this);">
-			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
-			    <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') echo ' selected'; ?>><?php echo _("Passenger"); ?></option>
-			    <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') echo ' selected'; ?>><?php echo _("Cargo"); ?></option>
-			    <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') echo ' selected'; ?>><?php echo _("Military"); ?></option>
+			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') {
+	echo ' selected';
+}
+?>><?php echo _("All"); ?></option>
+			    <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') {
+	echo ' selected';
+}
+?>><?php echo _("Passenger"); ?></option>
+			    <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') {
+	echo ' selected';
+}
+?>><?php echo _("Cargo"); ?></option>
+			    <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') {
+	echo ' selected';
+}
+?>><?php echo _("Military"); ?></option>
 			</select>
 		    </li>
 		    <?php
@@ -533,7 +782,10 @@ 
 		    ?>
 		    <li>
 			<?php echo _("Display flight with ident:"); ?>
-			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
+			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) {
+	print $_COOKIE['filter_ident'];
+}
+?>" />
 		    </li>
 		</ul>
 	    </form>
@@ -549,7 +801,10 @@ 
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
 	    <form>
 		<ul>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if (isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') print 'checked'; ?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if (isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li>
 		    <li><?php echo _("Type:"); ?>
 			<select class="selectpicker" multiple onchange="sattypes(this);">
 			    <?php
@@ -557,25 +812,45 @@ 
 				$types = $Satellite->get_tle_types();
 				foreach ($types as $type) {
 					$type_name = $type['tle_type'];
-					if ($type_name == 'musson') $type_name = 'Russian LEO Navigation';
-					else if ($type_name == 'nnss') $type_name = 'Navi Navigation Satellite System';
-					else if ($type_name == 'sbas') $type_name = 'Satellite-Based Augmentation System';
-					else if ($type_name == 'glo-ops') $type_name = 'Glonass Operational';
-					else if ($type_name == 'gps-ops') $type_name = 'GPS Operational';
-					else if ($type_name == 'argos') $type_name = 'ARGOS Data Collection System';
-					else if ($type_name == 'tdrss') $type_name = 'Tracking and Data Relay Satellite System';
-					else if ($type_name == 'sarsat') $type_name = 'Search & Rescue';
-					else if ($type_name == 'dmc') $type_name = 'Disaster Monitoring';
-					else if ($type_name == 'resource') $type_name = 'Earth Resources';
-					else if ($type_name == 'stations') $type_name = 'Space Stations';
-					else if ($type_name == 'geo') $type_name = 'Geostationary';
-					else if ($type_name == 'amateur') $type_name = 'Amateur Radio';
-					else if ($type_name == 'x-comm') $type_name = 'Experimental';
-					else if ($type_name == 'other-comm') $type_name = 'Other Comm';
-					else if ($type_name == 'science') $type_name = 'Space & Earth Science';
-					else if ($type_name == 'military') $type_name = 'Miscellaneous Military';
-					else if ($type_name == 'radar') $type_name = 'Radar Calibration';
-					else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches';
+					if ($type_name == 'musson') {
+						$type_name = 'Russian LEO Navigation';
+					} else if ($type_name == 'nnss') {
+						$type_name = 'Navi Navigation Satellite System';
+					} else if ($type_name == 'sbas') {
+						$type_name = 'Satellite-Based Augmentation System';
+					} else if ($type_name == 'glo-ops') {
+						$type_name = 'Glonass Operational';
+					} else if ($type_name == 'gps-ops') {
+						$type_name = 'GPS Operational';
+					} else if ($type_name == 'argos') {
+						$type_name = 'ARGOS Data Collection System';
+					} else if ($type_name == 'tdrss') {
+						$type_name = 'Tracking and Data Relay Satellite System';
+					} else if ($type_name == 'sarsat') {
+						$type_name = 'Search & Rescue';
+					} else if ($type_name == 'dmc') {
+						$type_name = 'Disaster Monitoring';
+					} else if ($type_name == 'resource') {
+						$type_name = 'Earth Resources';
+					} else if ($type_name == 'stations') {
+						$type_name = 'Space Stations';
+					} else if ($type_name == 'geo') {
+						$type_name = 'Geostationary';
+					} else if ($type_name == 'amateur') {
+						$type_name = 'Amateur Radio';
+					} else if ($type_name == 'x-comm') {
+						$type_name = 'Experimental';
+					} else if ($type_name == 'other-comm') {
+						$type_name = 'Other Comm';
+					} else if ($type_name == 'science') {
+						$type_name = 'Space & Earth Science';
+					} else if ($type_name == 'military') {
+						$type_name = 'Miscellaneous Military';
+					} else if ($type_name == 'radar') {
+						$type_name = 'Radar Calibration';
+					} else if ($type_name == 'tle-new') {
+						$type_name = 'Last 30 days launches';
+					}
 					
 					if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) {
 						print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>';

airline.php

Braces +24 added lines, -8 removed lines

@@ -24,13 +24,21 @@ 
 
 	print '<div class="select-item"><form action="'.$globalURL.'/airline" method="post"><select name="airline_type" class="selectpicker" data-live-search="true">';
 	print '<option value="all"';
-	if ($airline_type == 'all') print 'selected="selected" ';
+	if ($airline_type == 'all') {
+		print 'selected="selected" ';
+	}
 	print '>'._("All").'</option><option value="passenger"';
-	if ($airline_type == 'passenger') print 'selected="selected" ';
+	if ($airline_type == 'passenger') {
+		print 'selected="selected" ';
+	}
 	print '>'._("Passenger").'</option><option value="cargo"';
-	if ($airline_type == 'cargo') print 'selected="selected" ';
+	if ($airline_type == 'cargo') {
+		print 'selected="selected" ';
+	}
 	print '>'._("Cargo").'</option><option value="military"';
-	if ($airline_type == 'military') print 'selected="selected" ';
+	if ($airline_type == 'military') {
+		print 'selected="selected" ';
+	}
 	print '>'._("Military").'</option></select>';
 	print '<button type="submit"><i class="fa fa-angle-double-right"></i></button></form></div>';
 
@@ -57,7 +65,9 @@ 
 		$firstLetter = mb_strtoupper(mb_substr($value['airline_name'], 0, 1),'UTF-8');
 		if($previous !== $firstLetter)
 		{
-			if ($previous !== null) print ' | ';
+			if ($previous !== null) {
+				print ' | ';
+			}
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
 		}
 		$previous = $firstLetter;
@@ -70,7 +80,9 @@ 
 		{
 			if($previous !== $firstLetter)
 			{
-				if ($previous !== null) print '</div>';
+				if ($previous !== null) {
+					print '</div>';
+				}
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';
 			}
 			$previous = $firstLetter;
@@ -82,10 +94,14 @@ 
 			} elseif (@getimagesize('images/airlines/'.$value['airline_icao'].'.png') || @getimagesize($globalURL.'/images/airlines/'.$value['airline_icao'].'.png'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$value['airline_icao'].'.png" alt="'._("Click to see airline activity").'" title="'._("Click to see airline activity").'" /> ';
-				if (isset($value['ban_eu']) && $value['ban_eu'] == 1) print '<img src="'.$globalURL.'/images/baneu.png" alt="'._("Banned in Europe").'" title="'._("Banned in Europe").'" /> ';
+				if (isset($value['ban_eu']) && $value['ban_eu'] == 1) {
+					print '<img src="'.$globalURL.'/images/baneu.png" alt="'._("Banned in Europe").'" title="'._("Banned in Europe").'" /> ';
+				}
 			} else {
 				print $value['airline_name'];
-				if (isset($value['ban_eu']) && $value['ban_eu'] == 1) print '<img src="'.$globalURL.'/images/baneu.png" alt="'._("Banned in Europe").'" title="'._("Banned in Europe").'" /> ';
+				if (isset($value['ban_eu']) && $value['ban_eu'] == 1) {
+					print '<img src="'.$globalURL.'/images/baneu.png" alt="'._("Banned in Europe").'" title="'._("Banned in Europe").'" /> ';
+				}
 			}
 			print '</a>';
 			print '</div>';

Spacing +7 added lines, -7 removed lines

@@ -15,7 +15,7 @@ 
 	print '<div class="column">';
 	print '<h1>'._("Airlines").'</h1>';
 	if (isset($_POST['airline_type'])) {
-		$airline_type = filter_input(INPUT_POST,'airline_type',FILTER_SANITIZE_STRING);
+		$airline_type = filter_input(INPUT_POST, 'airline_type', FILTER_SANITIZE_STRING);
 		//$airline_names = $Spotter->getAllAirlineNames($airline_type);
 	} else {
 		//$airline_names = $Spotter->getAllAirlineNames();
@@ -37,7 +37,7 @@ 
 	$Stats = new Stats();
 	if (isset($_POST['airline_type'])) 
 	{
-		$airline_type = filter_input(INPUT_POST,'airline_type',FILTER_SANITIZE_STRING);
+		$airline_type = filter_input(INPUT_POST, 'airline_type', FILTER_SANITIZE_STRING);
 		//$airline_names = $Stats->getAllAirlineNames($airline_type);
 		$airline_names = $Spotter->getAllAirlineNames($airline_type);
 	} else {
@@ -50,12 +50,12 @@ 
 	}
 	$previous = null;
 	print '<div class="alphabet-legend">';
-	foreach($airline_names as $value) 
+	foreach ($airline_names as $value) 
 	{
 		//echo $value['airline_name']."\n";
 		//echo mb_substr($value['airline_name'],0,1).' - '.$value['airline_name']."\n";
-		$firstLetter = mb_strtoupper(mb_substr($value['airline_name'], 0, 1),'UTF-8');
-		if($previous !== $firstLetter)
+		$firstLetter = mb_strtoupper(mb_substr($value['airline_name'], 0, 1), 'UTF-8');
+		if ($previous !== $firstLetter)
 		{
 			if ($previous !== null) print ' | ';
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
@@ -64,11 +64,11 @@ 
 	}
 	print '</div>';
 	$previous = null;
-	foreach($airline_names as $value) {
+	foreach ($airline_names as $value) {
 		$firstLetter = strtoupper(substr($value['airline_name'], 0, 1));
 		if ($firstLetter != "")
 		{
-			if($previous !== $firstLetter)
+			if ($previous !== $firstLetter)
 			{
 				if ($previous !== null) print '</div>';
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';

airline-detailed.php

Braces +16 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -38,7 +38,9 @@ 
 	{
 		if (isset($spotter_array[0]['airline_name']) && isset($spotter_array[0]['airline_icao'])) {
 			$title = sprintf(_("Detailed View for %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
-		} else $title = '';
+		} else {
+			$title = '';
+		}
 		require_once('header.php');
 	  
 		print '<div class="select-item">';
@@ -47,7 +49,9 @@ 
 		print '<option></option>';
 		$Stats = new Stats();
 		$airline_names = $Stats->getAllAirlineNames();
-		if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
+		if (empty($airline_names)) {
+			$airline_names = $Spotter->getAllAirlineNames();
+		}
 		foreach($airline_names as $airline_name)
 		{
 			if($_GET['airline'] == $airline_name['airline_icao'])
@@ -76,10 +80,16 @@ 
 			print '<div><span class="label">'._("Name").'</span>'.$spotter_array[0]['airline_name'].'</div>';
 			print '<div><span class="label">'._("Country").'</span>'.$spotter_array[0]['airline_country'].'</div>';
 			print '<div><span class="label">'._("ICAO").'</span>'.$spotter_array[0]['airline_icao'].'</div>';
-			if (isset($spotter_array[0]['airline_iata'])) print '<div><span class="label">'._("IATA").'</span>'.$spotter_array[0]['airline_iata'].'</div>';
-			if (isset($spotter_array[0]['airline_callsign'])) print '<div><span class="label">'._("Callsign").'</span>'.$spotter_array[0]['airline_callsign'].'</div>'; 
+			if (isset($spotter_array[0]['airline_iata'])) {
+				print '<div><span class="label">'._("IATA").'</span>'.$spotter_array[0]['airline_iata'].'</div>';
+			}
+			if (isset($spotter_array[0]['airline_callsign'])) {
+				print '<div><span class="label">'._("Callsign").'</span>'.$spotter_array[0]['airline_callsign'].'</div>';
+			}
 			print '<div><span class="label">'._("Type").'</span>'.ucwords($spotter_array[0]['airline_type']).'</div>';
-			if (isset($spotter_array[0]['ban_eu']) && $spotter_array[0]['ban_eu'] == 1) print '<div><img src="'.$globalURL.'/images/baneu.png" alt="'._("This airline is banned in Europe").'" title="'._("This airline is banned in Europe").'" /></div>';
+			if (isset($spotter_array[0]['ban_eu']) && $spotter_array[0]['ban_eu'] == 1) {
+				print '<div><img src="'.$globalURL.'/images/baneu.png" alt="'._("This airline is banned in Europe").'" title="'._("This airline is banned in Europe").'" /></div>';
+			}
 			print '</div>';
 		} else {
 			print '<div class="alert alert-warning">'._("This special airline profile shows all flights that do <u>not</u> have a airline associated with them.").'</div>';

Spacing +11 added lines, -11 removed lines

@@ -4,17 +4,17 @@ 
 require_once('require/class.Stats.php');
 require_once('require/class.Language.php');
 
-if (!isset($_GET['airline'])){
+if (!isset($_GET['airline'])) {
 	header('Location: '.$globalURL.'/airline');
-} else{
+} else {
 	$Spotter = new Spotter();
 	//calculuation for the pagination
-	if(!isset($_GET['limit']) || $_GET['limit'] == "")
+	if (!isset($_GET['limit']) || $_GET['limit'] == "")
 	{
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -28,16 +28,16 @@ 
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+	$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 	$page_url = $globalURL.'/airline/'.$airline;
 	
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-	$spotter_array = $Spotter->getSpotterDataByAirline($_GET['airline'],$limit_start.",".$absolute_difference, $sort);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+	$spotter_array = $Spotter->getSpotterDataByAirline($_GET['airline'], $limit_start.",".$absolute_difference, $sort);
 	
 	if (!empty($spotter_array))
 	{
 		if (isset($spotter_array[0]['airline_name']) && isset($spotter_array[0]['airline_icao'])) {
-			$title = sprintf(_("Detailed View for %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+			$title = sprintf(_("Detailed View for %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 		} else $title = '';
 		require_once('header.php');
 	  
@@ -48,9 +48,9 @@ 
 		$Stats = new Stats();
 		$airline_names = $Stats->getAllAirlineNames();
 		if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-		foreach($airline_names as $airline_name)
+		foreach ($airline_names as $airline_name)
 		{
-			if($_GET['airline'] == $airline_name['airline_icao'])
+			if ($_GET['airline'] == $airline_name['airline_icao'])
 			{
 				print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 			} else {
@@ -88,7 +88,7 @@ 
 		include('airline-sub-menu.php');
 		print '<div class="table column">';
 		if (isset($spotter_array[0]['airline_name'])) {
-			print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+			print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 		}
 
 		include('table-output.php');  

require/libs/simple_html_dom.php

Doc Comments +40 added lines

@@ -125,6 +125,9 @@ 
 	public $tag_start = 0;
 	private $dom = null;
 
+	/**
+	 * @param simple_html_dom $dom
+	 */
 	function __construct($dom)
 	{
 		$this->dom = $dom;
@@ -1501,6 +1504,11 @@ 
 	}
 
 	// parse attributes
+
+	/**
+	 * @param simple_html_dom_node $node
+	 * @param string[] $space
+	 */
 	protected function parse_attr($node, $name, &$space)
 	{
 		// Per sourceforge: http://sourceforge.net/tracker/?func=detail&aid=3061408&group_id=218559&atid=1044037
@@ -1538,6 +1546,11 @@ 
 	}
 
 	// link node's parent
+
+	/**
+	 * @param simple_html_dom_node $node
+	 * @param boolean $is_child
+	 */
 	protected function link_nodes(&$node, $is_child)
 	{
 		$node->parent = $this->parent;
@@ -1549,6 +1562,10 @@ 
 	}
 
 	// as a text node
+
+	/**
+	 * @param string $tag
+	 */
 	protected function as_text_node($tag)
 	{
 		$node = new simple_html_dom_node($this);
@@ -1559,12 +1576,18 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $chars
+	 */
 	protected function skip($chars)
 	{
 		$this->pos += strspn($this->doc, $chars, $this->pos);
 		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 	}
 
+	/**
+	 * @param string $chars
+	 */
 	protected function copy_skip($chars)
 	{
 		$pos = $this->pos;
@@ -1575,6 +1598,9 @@ 
 		return substr($this->doc, $pos, $len);
 	}
 
+	/**
+	 * @param string $chars
+	 */
 	protected function copy_until($chars)
 	{
 		$pos = $this->pos;
@@ -1584,6 +1610,9 @@ 
 		return substr($this->doc, $pos, $len);
 	}
 
+	/**
+	 * @param string $char
+	 */
 	protected function copy_until_char($char)
 	{
 		if ($this->char===null) return '';
@@ -1602,6 +1631,9 @@ 
 		return substr($this->doc, $pos_old, $pos-$pos_old);
 	}
 
+	/**
+	 * @param string $char
+	 */
 	protected function copy_until_char_escape($char)
 	{
 		if ($this->char===null) return '';
@@ -1633,6 +1665,10 @@ 
 
 	// remove noise from html content
 	// save the noise in the $this->noise array.
+
+	/**
+	 * @param string $pattern
+	 */
 	protected function remove_noise($pattern, $remove_tag=false)
 	{
 		global $debug_object;
@@ -1658,6 +1694,10 @@ 
 	}
 
 	// restore noise to html content
+
+	/**
+	 * @param string|null $text
+	 */
 	function restore_noise($text)
 	{
 		global $debug_object;

Indentation +5 added lines, -5 removed lines

@@ -824,11 +824,11 @@
 	}
 
 	/**
-	* Returns true if $string is valid UTF-8 and false otherwise.
-	*
-	* @param mixed $str String to be tested
-	* @return boolean
-	*/
+	 * Returns true if $string is valid UTF-8 and false otherwise.
+	 *
+	 * @param mixed $str String to be tested
+	 * @return boolean
+	 */
 	static function is_utf8($str)
 	{
 		$c=0; $b=0;

Spacing +238 added lines, -238 removed lines

@@ -45,21 +45,21 @@ 
  */
 define('HDOM_TYPE_ELEMENT', 1);
 define('HDOM_TYPE_COMMENT', 2);
-define('HDOM_TYPE_TEXT',	3);
-define('HDOM_TYPE_ENDTAG',  4);
-define('HDOM_TYPE_ROOT',	5);
+define('HDOM_TYPE_TEXT', 3);
+define('HDOM_TYPE_ENDTAG', 4);
+define('HDOM_TYPE_ROOT', 5);
 define('HDOM_TYPE_UNKNOWN', 6);
 define('HDOM_QUOTE_DOUBLE', 0);
 define('HDOM_QUOTE_SINGLE', 1);
-define('HDOM_QUOTE_NO',	 3);
-define('HDOM_INFO_BEGIN',   0);
-define('HDOM_INFO_END',	 1);
-define('HDOM_INFO_QUOTE',   2);
-define('HDOM_INFO_SPACE',   3);
-define('HDOM_INFO_TEXT',	4);
-define('HDOM_INFO_INNER',   5);
-define('HDOM_INFO_OUTER',   6);
-define('HDOM_INFO_ENDSPACE',7);
+define('HDOM_QUOTE_NO', 3);
+define('HDOM_INFO_BEGIN', 0);
+define('HDOM_INFO_END', 1);
+define('HDOM_INFO_QUOTE', 2);
+define('HDOM_INFO_SPACE', 3);
+define('HDOM_INFO_TEXT', 4);
+define('HDOM_INFO_INNER', 5);
+define('HDOM_INFO_OUTER', 6);
+define('HDOM_INFO_ENDSPACE', 7);
 define('DEFAULT_TARGET_CHARSET', 'UTF-8');
 define('DEFAULT_BR_TEXT', "\r\n");
 define('DEFAULT_SPAN_TEXT', " ");
@@ -68,7 +68,7 @@ 
 // -----------------------------------------------------------------------------
 // get html dom from file
 // $maxlen is defined in the code as PHP_STREAM_COPY_ALL which is defined as -1.
-function file_get_html($url, $use_include_path = false, $context=null, $offset = -1, $maxLen=-1, $lowercase = true, $forceTagsClosed=true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+function file_get_html($url, $use_include_path = false, $context = null, $offset = -1, $maxLen = -1, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 {
 	// We DO force the tags to be terminated.
 	$dom = new simple_html_dom(null, $lowercase, $forceTagsClosed, $target_charset, $stripRN, $defaultBRText, $defaultSpanText);
@@ -86,7 +86,7 @@ 
 }
 
 // get html dom from string
-function str_get_html($str, $lowercase=true, $forceTagsClosed=true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+function str_get_html($str, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 {
 	$dom = new simple_html_dom(null, $lowercase, $forceTagsClosed, $target_charset, $stripRN, $defaultBRText, $defaultSpanText);
 	if (empty($str) || strlen($str) > MAX_FILE_SIZE)
@@ -99,7 +99,7 @@ 
 }
 
 // dump html dom tree
-function dump_html_tree($node, $show_attr=true, $deep=0)
+function dump_html_tree($node, $show_attr = true, $deep = 0)
 {
 	$node->dump($node);
 }
@@ -151,12 +151,12 @@ 
 	}
 
 	// dump node's tree
-	function dump($show_attr=true, $deep=0)
+	function dump($show_attr = true, $deep = 0)
 	{
 		$lead = str_repeat('	', $deep);
 
 		echo $lead.$this->tag;
-		if ($show_attr && count($this->attr)>0)
+		if ($show_attr && count($this->attr) > 0)
 		{
 			echo '(';
 			foreach ($this->attr as $k=>$v)
@@ -169,18 +169,18 @@ 
 		{
 			foreach ($this->nodes as $c)
 			{
-				$c->dump($show_attr, $deep+1);
+				$c->dump($show_attr, $deep + 1);
 			}
 		}
 	}
 
 
 	// Debugging function to dump a single dom node with a bunch of information about it.
-	function dump_node($echo=true)
+	function dump_node($echo = true)
 	{
 
 		$string = $this->tag;
-		if (count($this->attr)>0)
+		if (count($this->attr) > 0)
 		{
 			$string .= '(';
 			foreach ($this->attr as $k=>$v)
@@ -189,7 +189,7 @@ 
 			}
 			$string .= ')';
 		}
-		if (count($this->_)>0)
+		if (count($this->_) > 0)
 		{
 			$string .= ' $_ (';
 			foreach ($this->_ as $k=>$v)
@@ -211,22 +211,22 @@ 
 
 		if (isset($this->text))
 		{
-			$string .= " text: (" . $this->text . ")";
+			$string .= " text: (".$this->text.")";
 		}
 
 		$string .= " HDOM_INNER_INFO: '";
 		if (isset($node->_[HDOM_INFO_INNER]))
 		{
-			$string .= $node->_[HDOM_INFO_INNER] . "'";
+			$string .= $node->_[HDOM_INFO_INNER]."'";
 		}
 		else
 		{
 			$string .= ' NULL ';
 		}
 
-		$string .= " children: " . count($this->children);
-		$string .= " nodes: " . count($this->nodes);
-		$string .= " tag_start: " . $this->tag_start;
+		$string .= " children: ".count($this->children);
+		$string .= " nodes: ".count($this->nodes);
+		$string .= " tag_start: ".$this->tag_start;
 		$string .= "\n";
 
 		if ($echo)
@@ -242,7 +242,7 @@ 
 
 	// returns the parent of node
 	// If a node is passed in, it will reset the parent of the current node to that one.
-	function parent($parent=null)
+	function parent($parent = null)
 	{
 		// I am SURE that this doesn't work properly.
 		// It fails to unset the current node from it's current parents nodes or children list first.
@@ -263,9 +263,9 @@ 
 	}
 
 	// returns children of node
-	function children($idx=-1)
+	function children($idx = -1)
 	{
-		if ($idx===-1)
+		if ($idx === -1)
 		{
 			return $this->children;
 		}
@@ -279,7 +279,7 @@ 
 	// returns the first child of node
 	function first_child()
 	{
-		if (count($this->children)>0)
+		if (count($this->children) > 0)
 		{
 			return $this->children[0];
 		}
@@ -289,9 +289,9 @@ 
 	// returns the last child of node
 	function last_child()
 	{
-		if (($count=count($this->children))>0)
+		if (($count = count($this->children)) > 0)
 		{
-			return $this->children[$count-1];
+			return $this->children[$count - 1];
 		}
 		return null;
 	}
@@ -299,18 +299,18 @@ 
 	// returns the next sibling of node
 	function next_sibling()
 	{
-		if ($this->parent===null)
+		if ($this->parent === null)
 		{
 			return null;
 		}
 
 		$idx = 0;
 		$count = count($this->parent->children);
-		while ($idx<$count && $this!==$this->parent->children[$idx])
+		while ($idx < $count && $this !== $this->parent->children[$idx])
 		{
 			++$idx;
 		}
-		if (++$idx>=$count)
+		if (++$idx >= $count)
 		{
 			return null;
 		}
@@ -320,12 +320,12 @@ 
 	// returns the previous sibling of node
 	function prev_sibling()
 	{
-		if ($this->parent===null) return null;
+		if ($this->parent === null) return null;
 		$idx = 0;
 		$count = count($this->parent->children);
-		while ($idx<$count && $this!==$this->parent->children[$idx])
+		while ($idx < $count && $this !== $this->parent->children[$idx])
 			++$idx;
-		if (--$idx<0) return null;
+		if (--$idx < 0) return null;
 		return $this->parent->children[$idx];
 	}
 
@@ -340,7 +340,7 @@ 
 
 		while (!is_null($returnDom))
 		{
-			if (is_object($debug_object)) { $debug_object->debug_log(2, "Current tag is: " . $returnDom->tag); }
+			if (is_object($debug_object)) { $debug_object->debug_log(2, "Current tag is: ".$returnDom->tag); }
 
 			if ($returnDom->tag == $tag)
 			{
@@ -374,16 +374,16 @@ 
 			{
 				if (!empty($this->text))
 				{
-					$text = " with text: " . $this->text;
+					$text = " with text: ".$this->text;
 				}
 			}
-			$debug_object->debug_log(1, 'Innertext of tag: ' . $this->tag . $text);
+			$debug_object->debug_log(1, 'Innertext of tag: '.$this->tag.$text);
 		}
 
-		if ($this->tag==='root') return $this->innertext();
+		if ($this->tag === 'root') return $this->innertext();
 
 		// trigger callback
-		if ($this->dom && $this->dom->callback!==null)
+		if ($this->dom && $this->dom->callback !== null)
 		{
 			call_user_func_array($this->dom->callback, array($this));
 		}
@@ -418,7 +418,7 @@ 
 		}
 
 		// render end tag
-		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0)
+		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END] != 0)
 			$ret .= '</'.$this->tag.'>';
 		return $ret;
 	}
@@ -433,8 +433,8 @@ 
 			case HDOM_TYPE_COMMENT: return '';
 			case HDOM_TYPE_UNKNOWN: return '';
 		}
-		if (strcasecmp($this->tag, 'script')===0) return '';
-		if (strcasecmp($this->tag, 'style')===0) return '';
+		if (strcasecmp($this->tag, 'script') === 0) return '';
+		if (strcasecmp($this->tag, 'style') === 0) return '';
 
 		$ret = '';
 		// In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL.
@@ -480,12 +480,12 @@ 
 			++$i;
 
 			// skip removed attribute
-			if ($val===null || $val===false)
+			if ($val === null || $val === false)
 				continue;
 
 			$ret .= $this->_[HDOM_INFO_SPACE][$i][0];
 			//no value attr: nowrap, checked selected...
-			if ($val===true)
+			if ($val === true)
 				$ret .= $key;
 			else {
 				switch ($this->_[HDOM_INFO_QUOTE][$i])
@@ -498,34 +498,34 @@ 
 			}
 		}
 		$ret = $this->dom->restore_noise($ret);
-		return $ret . $this->_[HDOM_INFO_ENDSPACE] . '>';
+		return $ret.$this->_[HDOM_INFO_ENDSPACE].'>';
 	}
 
 	// find elements by css selector
 	//PaperG - added ability for find to lowercase the value of the selector.
-	function find($selector, $idx=null, $lowercase=false)
+	function find($selector, $idx = null, $lowercase = false)
 	{
 		$selectors = $this->parse_selector($selector);
-		if (($count=count($selectors))===0) return array();
+		if (($count = count($selectors)) === 0) return array();
 		$found_keys = array();
 
 		// find each selector
-		for ($c=0; $c<$count; ++$c)
+		for ($c = 0; $c < $count; ++$c)
 		{
 			// The change on the below line was documented on the sourceforge code tracker id 2788009
 			// used to be: if (($levle=count($selectors[0]))===0) return array();
-			if (($levle=count($selectors[$c]))===0) return array();
+			if (($levle = count($selectors[$c])) === 0) return array();
 			if (!isset($this->_[HDOM_INFO_BEGIN])) return array();
 
 			$head = array($this->_[HDOM_INFO_BEGIN]=>1);
 
 			// handle descendant selectors, no recursive!
-			for ($l=0; $l<$levle; ++$l)
+			for ($l = 0; $l < $levle; ++$l)
 			{
 				$ret = array();
 				foreach ($head as $k=>$v)
 				{
-					$n = ($k===-1) ? $this->dom->root : $this->dom->nodes[$k];
+					$n = ($k === -1) ? $this->dom->root : $this->dom->nodes[$k];
 					//PaperG - Pass this optional parameter on to the seek function.
 					$n->seek($selectors[$c][$l], $ret, $lowercase);
 				}
@@ -550,13 +550,13 @@ 
 
 		// return nth-element or array
 		if (is_null($idx)) return $found;
-		else if ($idx<0) $idx = count($found) + $idx;
+		else if ($idx < 0) $idx = count($found) + $idx;
 		return (isset($found[$idx])) ? $found[$idx] : null;
 	}
 
 	// seek for given conditions
 	// PaperG - added parameter to allow for case insensitive testing of the value of a selector.
-	protected function seek($selector, &$ret, $lowercase=false)
+	protected function seek($selector, &$ret, $lowercase = false)
 	{
 		global $debug_object;
 		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
@@ -569,8 +569,8 @@ 
 			$count = 0;
 			foreach ($this->children as $c)
 			{
-				if ($tag==='*' || $tag===$c->tag) {
-					if (++$count==$key) {
+				if ($tag === '*' || $tag === $c->tag) {
+					if (++$count == $key) {
 						$ret[$c->_[HDOM_INFO_BEGIN]] = 1;
 						return;
 					}
@@ -580,38 +580,38 @@ 
 		}
 
 		$end = (!empty($this->_[HDOM_INFO_END])) ? $this->_[HDOM_INFO_END] : 0;
-		if ($end==0) {
+		if ($end == 0) {
 			$parent = $this->parent;
-			while (!isset($parent->_[HDOM_INFO_END]) && $parent!==null) {
+			while (!isset($parent->_[HDOM_INFO_END]) && $parent !== null) {
 				$end -= 1;
 				$parent = $parent->parent;
 			}
 			$end += $parent->_[HDOM_INFO_END];
 		}
 
-		for ($i=$this->_[HDOM_INFO_BEGIN]+1; $i<$end; ++$i) {
+		for ($i = $this->_[HDOM_INFO_BEGIN] + 1; $i < $end; ++$i) {
 			$node = $this->dom->nodes[$i];
 
 			$pass = true;
 
-			if ($tag==='*' && !$key) {
+			if ($tag === '*' && !$key) {
 				if (in_array($node, $this->children, true))
 					$ret[$i] = 1;
 				continue;
 			}
 
 			// compare tag
-			if ($tag && $tag!=$node->tag && $tag!=='*') {$pass=false;}
+			if ($tag && $tag != $node->tag && $tag !== '*') {$pass = false; }
 			// compare key
 			if ($pass && $key) {
 				if ($no_key) {
-					if (isset($node->attr[$key])) $pass=false;
+					if (isset($node->attr[$key])) $pass = false;
 				} else {
-					if (($key != "plaintext") && !isset($node->attr[$key])) $pass=false;
+					if (($key != "plaintext") && !isset($node->attr[$key])) $pass = false;
 				}
 			}
 			// compare value
-			if ($pass && $key && $val  && $val!=='*') {
+			if ($pass && $key && $val && $val !== '*') {
 				// If they have told us that this is a "plaintext" search then we want the plaintext of the node - right?
 				if ($key == "plaintext") {
 					// $node->plaintext actually returns $node->text();
@@ -620,7 +620,7 @@ 
 					// this is a normal search, we want the value of that attribute of the tag.
 					$nodeKeyValue = $node->attr[$key];
 				}
-				if (is_object($debug_object)) {$debug_object->debug_log(2, "testing node: " . $node->tag . " for attribute: " . $key . $exp . $val . " where nodes value is: " . $nodeKeyValue);}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, "testing node: ".$node->tag." for attribute: ".$key.$exp.$val." where nodes value is: ".$nodeKeyValue); }
 
 				//PaperG - If lowercase is set, do a case insensitive test of the value of the selector.
 				if ($lowercase) {
@@ -628,11 +628,11 @@ 
 				} else {
 					$check = $this->match($exp, $val, $nodeKeyValue);
 				}
-				if (is_object($debug_object)) {$debug_object->debug_log(2, "after match: " . ($check ? "true" : "false"));}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, "after match: ".($check ? "true" : "false")); }
 
 				// handle multiple class
-				if (!$check && strcasecmp($key, 'class')===0) {
-					foreach (explode(' ',$node->attr[$key]) as $k) {
+				if (!$check && strcasecmp($key, 'class') === 0) {
+					foreach (explode(' ', $node->attr[$key]) as $k) {
 						// Without this, there were cases where leading, trailing, or double spaces lead to our comparing blanks - bad form.
 						if (!empty($k)) {
 							if ($lowercase) {
@@ -650,24 +650,24 @@ 
 			unset($node);
 		}
 		// It's passed by reference so this is actually what this function returns.
-		if (is_object($debug_object)) {$debug_object->debug_log(1, "EXIT - ret: ", $ret);}
+		if (is_object($debug_object)) {$debug_object->debug_log(1, "EXIT - ret: ", $ret); }
 	}
 
 	protected function match($exp, $pattern, $value) {
 		global $debug_object;
-		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1); }
 
 		switch ($exp) {
 			case '=':
-				return ($value===$pattern);
+				return ($value === $pattern);
 			case '!=':
-				return ($value!==$pattern);
+				return ($value !== $pattern);
 			case '^=':
-				return preg_match("/^".preg_quote($pattern,'/')."/", $value);
+				return preg_match("/^".preg_quote($pattern, '/')."/", $value);
 			case '$=':
-				return preg_match("/".preg_quote($pattern,'/')."$/", $value);
+				return preg_match("/".preg_quote($pattern, '/')."$/", $value);
 			case '*=':
-				if ($pattern[0]=='/') {
+				if ($pattern[0] == '/') {
 					return preg_match($pattern, $value);
 				}
 				return preg_match("/".$pattern."/i", $value);
@@ -677,7 +677,7 @@ 
 
 	protected function parse_selector($selector_string) {
 		global $debug_object;
-		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1); }
 
 		// pattern of CSS selectors, modified from mootools
 		// Paperg: Add the colon to the attrbute, so that it properly finds <tag attr:ibute="something" > like google does.
@@ -688,7 +688,7 @@ 
 //		$pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
 		$pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-:]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
 		preg_match_all($pattern, trim($selector_string).' ', $matches, PREG_SET_ORDER);
-		if (is_object($debug_object)) {$debug_object->debug_log(2, "Matches Array: ", $matches);}
+		if (is_object($debug_object)) {$debug_object->debug_log(2, "Matches Array: ", $matches); }
 
 		$selectors = array();
 		$result = array();
@@ -696,29 +696,29 @@ 
 
 		foreach ($matches as $m) {
 			$m[0] = trim($m[0]);
-			if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') continue;
+			if ($m[0] === '' || $m[0] === '/' || $m[0] === '//') continue;
 			// for browser generated xpath
-			if ($m[1]==='tbody') continue;
+			if ($m[1] === 'tbody') continue;
 
 			list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false);
-			if (!empty($m[2])) {$key='id'; $val=$m[2];}
-			if (!empty($m[3])) {$key='class'; $val=$m[3];}
-			if (!empty($m[4])) {$key=$m[4];}
-			if (!empty($m[5])) {$exp=$m[5];}
-			if (!empty($m[6])) {$val=$m[6];}
+			if (!empty($m[2])) {$key = 'id'; $val = $m[2]; }
+			if (!empty($m[3])) {$key = 'class'; $val = $m[3]; }
+			if (!empty($m[4])) {$key = $m[4]; }
+			if (!empty($m[5])) {$exp = $m[5]; }
+			if (!empty($m[6])) {$val = $m[6]; }
 
 			// convert to lowercase
-			if ($this->dom->lowercase) {$tag=strtolower($tag); $key=strtolower($key);}
+			if ($this->dom->lowercase) {$tag = strtolower($tag); $key = strtolower($key); }
 			//elements that do NOT have the specified attribute
-			if (isset($key[0]) && $key[0]==='!') {$key=substr($key, 1); $no_key=true;}
+			if (isset($key[0]) && $key[0] === '!') {$key = substr($key, 1); $no_key = true; }
 
 			$result[] = array($tag, $key, $val, $exp, $no_key);
-			if (trim($m[7])===',') {
+			if (trim($m[7]) === ',') {
 				$selectors[] = $result;
 				$result = array();
 			}
 		}
-		if (count($result)>0)
+		if (count($result) > 0)
 			$selectors[] = $result;
 		return $selectors;
 	}
@@ -742,7 +742,7 @@ 
 	function __set($name, $value)
 	{
 		global $debug_object;
-		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1); }
 
 		switch ($name)
 		{
@@ -780,7 +780,7 @@ 
 	function convert_text($text)
 	{
 		global $debug_object;
-		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1); }
 
 		$converted_text = $text;
 
@@ -792,7 +792,7 @@ 
 			$sourceCharset = strtoupper($this->dom->_charset);
 			$targetCharset = strtoupper($this->dom->_target_charset);
 		}
-		if (is_object($debug_object)) {$debug_object->debug_log(3, "source charset: " . $sourceCharset . " target charaset: " . $targetCharset);}
+		if (is_object($debug_object)) {$debug_object->debug_log(3, "source charset: ".$sourceCharset." target charaset: ".$targetCharset); }
 
 		if (!empty($sourceCharset) && !empty($targetCharset) && (strcasecmp($sourceCharset, $targetCharset) != 0))
 		{
@@ -831,27 +831,27 @@ 
 	*/
 	static function is_utf8($str)
 	{
-		$c=0; $b=0;
-		$bits=0;
-		$len=strlen($str);
-		for($i=0; $i<$len; $i++)
+		$c = 0; $b = 0;
+		$bits = 0;
+		$len = strlen($str);
+		for ($i = 0; $i < $len; $i++)
 		{
-			$c=ord($str[$i]);
-			if($c > 128)
+			$c = ord($str[$i]);
+			if ($c > 128)
 			{
-				if(($c >= 254)) return false;
-				elseif($c >= 252) $bits=6;
-				elseif($c >= 248) $bits=5;
-				elseif($c >= 240) $bits=4;
-				elseif($c >= 224) $bits=3;
-				elseif($c >= 192) $bits=2;
+				if (($c >= 254)) return false;
+				elseif ($c >= 252) $bits = 6;
+				elseif ($c >= 248) $bits = 5;
+				elseif ($c >= 240) $bits = 4;
+				elseif ($c >= 224) $bits = 3;
+				elseif ($c >= 192) $bits = 2;
 				else return false;
-				if(($i+$bits) > $len) return false;
-				while($bits > 1)
+				if (($i + $bits) > $len) return false;
+				while ($bits > 1)
 				{
 					$i++;
-					$b=ord($str[$i]);
-					if($b < 128 || $b > 191) return false;
+					$b = ord($str[$i]);
+					if ($b < 128 || $b > 191) return false;
 					$bits--;
 				}
 			}
@@ -955,24 +955,24 @@ 
 	}
 
 	// camel naming conventions
-	function getAllAttributes() {return $this->attr;}
-	function getAttribute($name) {return $this->__get($name);}
-	function setAttribute($name, $value) {$this->__set($name, $value);}
-	function hasAttribute($name) {return $this->__isset($name);}
-	function removeAttribute($name) {$this->__set($name, null);}
-	function getElementById($id) {return $this->find("#$id", 0);}
-	function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);}
-	function getElementByTagName($name) {return $this->find($name, 0);}
-	function getElementsByTagName($name, $idx=null) {return $this->find($name, $idx);}
-	function parentNode() {return $this->parent();}
-	function childNodes($idx=-1) {return $this->children($idx);}
-	function firstChild() {return $this->first_child();}
-	function lastChild() {return $this->last_child();}
-	function nextSibling() {return $this->next_sibling();}
-	function previousSibling() {return $this->prev_sibling();}
-	function hasChildNodes() {return $this->has_child();}
-	function nodeName() {return $this->tag;}
-	function appendChild($node) {$node->parent($this); return $node;}
+	function getAllAttributes() {return $this->attr; }
+	function getAttribute($name) {return $this->__get($name); }
+	function setAttribute($name, $value) {$this->__set($name, $value); }
+	function hasAttribute($name) {return $this->__isset($name); }
+	function removeAttribute($name) {$this->__set($name, null); }
+	function getElementById($id) {return $this->find("#$id", 0); }
+	function getElementsById($id, $idx = null) {return $this->find("#$id", $idx); }
+	function getElementByTagName($name) {return $this->find($name, 0); }
+	function getElementsByTagName($name, $idx = null) {return $this->find($name, $idx); }
+	function parentNode() {return $this->parent(); }
+	function childNodes($idx = -1) {return $this->children($idx); }
+	function firstChild() {return $this->first_child(); }
+	function lastChild() {return $this->last_child(); }
+	function nextSibling() {return $this->next_sibling(); }
+	function previousSibling() {return $this->prev_sibling(); }
+	function hasChildNodes() {return $this->has_child(); }
+	function nodeName() {return $this->tag; }
+	function appendChild($node) {$node->parent($this); return $node; }
 
 }
 
@@ -1028,11 +1028,11 @@ 
 		'option'=>array('option'=>1),
 	);
 
-	function __construct($str=null, $lowercase=true, $forceTagsClosed=true, $target_charset=DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+	function __construct($str = null, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 	{
 		if ($str)
 		{
-			if (preg_match("/^http:\/\//i",$str) || is_file($str))
+			if (preg_match("/^http:\/\//i", $str) || is_file($str))
 			{
 				$this->load_file($str);
 			}
@@ -1043,7 +1043,7 @@ 
 		}
 		// Forcing tags to be closed implies that we don't trust the html, but it can lead to parsing errors if we SHOULD trust the html.
 		if (!$forceTagsClosed) {
-			$this->optional_closing_array=array();
+			$this->optional_closing_array = array();
 		}
 		$this->_target_charset = $target_charset;
 	}
@@ -1054,7 +1054,7 @@ 
 	}
 
 	// load html from string
-	function load($str, $lowercase=true, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+	function load($str, $lowercase = true, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 	{
 		global $debug_object;
 
@@ -1096,7 +1096,7 @@ 
 		$args = func_get_args();
 		$this->load(call_user_func_array('file_get_contents', $args), true);
 		// Throw an error if we can't properly load the dom.
-		if (($error=error_get_last())!==null) {
+		if (($error = error_get_last()) !== null) {
 			$this->clear();
 			return false;
 		}
@@ -1115,16 +1115,16 @@ 
 	}
 
 	// save dom as string
-	function save($filepath='')
+	function save($filepath = '')
 	{
 		$ret = $this->root->innertext();
-		if ($filepath!=='') file_put_contents($filepath, $ret, LOCK_EX);
+		if ($filepath !== '') file_put_contents($filepath, $ret, LOCK_EX);
 		return $ret;
 	}
 
 	// find dom node by css selector
 	// Paperg - allow us to specify that we want case insensitive testing of the value of the selector.
-	function find($selector, $idx=null, $lowercase=false)
+	function find($selector, $idx = null, $lowercase = false)
 	{
 		return $this->root->find($selector, $idx, $lowercase);
 	}
@@ -1132,22 +1132,22 @@ 
 	// clean up memory due to php5 circular references memory leak...
 	function clear()
 	{
-		foreach ($this->nodes as $n) {$n->clear(); $n = null;}
+		foreach ($this->nodes as $n) {$n->clear(); $n = null; }
 		// This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear.
-		if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null;}
-		if (isset($this->parent)) {$this->parent->clear(); unset($this->parent);}
-		if (isset($this->root)) {$this->root->clear(); unset($this->root);}
+		if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null; }
+		if (isset($this->parent)) {$this->parent->clear(); unset($this->parent); }
+		if (isset($this->root)) {$this->root->clear(); unset($this->root); }
 		unset($this->doc);
 		unset($this->noise);
 	}
 
-	function dump($show_attr=true)
+	function dump($show_attr = true)
 	{
 		$this->root->dump($show_attr);
 	}
 
 	// prepare HTML data and init everything
-	protected function prepare($str, $lowercase=true, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+	protected function prepare($str, $lowercase = true, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 	{
 		$this->clear();
 
@@ -1178,13 +1178,13 @@ 
 		$this->root->_[HDOM_INFO_BEGIN] = -1;
 		$this->root->nodetype = HDOM_TYPE_ROOT;
 		$this->parent = $this->root;
-		if ($this->size>0) $this->char = $this->doc[0];
+		if ($this->size > 0) $this->char = $this->doc[0];
 	}
 
 	// parse html content
 	protected function parse()
 	{
-		if (($s = $this->copy_until_char('<'))==='')
+		if (($s = $this->copy_until_char('<')) === '')
 		{
 			return $this->read_tag();
 		}
@@ -1213,18 +1213,18 @@ 
 			if ($success)
 			{
 				$charset = $matches[1];
-				if (is_object($debug_object)) {$debug_object->debug_log(2, 'header content-type found charset of: ' . $charset);}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, 'header content-type found charset of: '.$charset); }
 			}
 
 		}
 
 		if (empty($charset))
 		{
-			$el = $this->root->find('meta[http-equiv=Content-Type]',0, true);
+			$el = $this->root->find('meta[http-equiv=Content-Type]', 0, true);
 			if (!empty($el))
 			{
 				$fullvalue = $el->content;
-				if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag found' . $fullvalue);}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag found'.$fullvalue); }
 
 				if (!empty($fullvalue))
 				{
@@ -1236,7 +1236,7 @@ 
 					else
 					{
 						// If there is a meta tag, and they don't specify the character set, research says that it's typically ISO-8859-1
-						if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.');}
+						if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.'); }
 						$charset = 'ISO-8859-1';
 					}
 				}
@@ -1251,14 +1251,14 @@ 
 			if (function_exists('mb_detect_encoding'))
 			{
 				// Have php try to detect the encoding from the text given to us.
-				$charset = mb_detect_encoding($this->root->plaintext . "ascii", $encoding_list = array( "UTF-8", "CP1252" ) );
-				if (is_object($debug_object)) {$debug_object->debug_log(2, 'mb_detect found: ' . $charset);}
+				$charset = mb_detect_encoding($this->root->plaintext."ascii", $encoding_list = array("UTF-8", "CP1252"));
+				if (is_object($debug_object)) {$debug_object->debug_log(2, 'mb_detect found: '.$charset); }
 			}
 
 			// and if this doesn't work...  then we need to just wrongheadedly assume it's UTF-8 so that we can move on - cause this will usually give us most of what we need...
 			if ($charset === false)
 			{
-				if (is_object($debug_object)) {$debug_object->debug_log(2, 'since mb_detect failed - using default of utf-8');}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, 'since mb_detect failed - using default of utf-8'); }
 				$charset = 'UTF-8';
 			}
 		}
@@ -1266,11 +1266,11 @@ 
 		// Since CP1252 is a superset, if we get one of it's subsets, we want it instead.
 		if ((strtolower($charset) == strtolower('ISO-8859-1')) || (strtolower($charset) == strtolower('Latin1')) || (strtolower($charset) == strtolower('Latin-1')))
 		{
-			if (is_object($debug_object)) {$debug_object->debug_log(2, 'replacing ' . $charset . ' with CP1252 as its a superset');}
+			if (is_object($debug_object)) {$debug_object->debug_log(2, 'replacing '.$charset.' with CP1252 as its a superset'); }
 			$charset = 'CP1252';
 		}
 
-		if (is_object($debug_object)) {$debug_object->debug_log(1, 'EXIT - ' . $charset);}
+		if (is_object($debug_object)) {$debug_object->debug_log(1, 'EXIT - '.$charset); }
 
 		return $this->_charset = $charset;
 	}
@@ -1278,41 +1278,41 @@ 
 	// read tag info
 	protected function read_tag()
 	{
-		if ($this->char!=='<')
+		if ($this->char !== '<')
 		{
 			$this->root->_[HDOM_INFO_END] = $this->cursor;
 			return false;
 		}
 		$begin_tag_pos = $this->pos;
-		$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 
 		// end tag
-		if ($this->char==='/')
+		if ($this->char === '/')
 		{
-			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 			// This represents the change in the simple_html_dom trunk from revision 180 to 181.
 			// $this->skip($this->token_blank_t);
 			$this->skip($this->token_blank);
 			$tag = $this->copy_until_char('>');
 
 			// skip attributes in end tag
-			if (($pos = strpos($tag, ' '))!==false)
+			if (($pos = strpos($tag, ' ')) !== false)
 				$tag = substr($tag, 0, $pos);
 
 			$parent_lower = strtolower($this->parent->tag);
 			$tag_lower = strtolower($tag);
 
-			if ($parent_lower!==$tag_lower)
+			if ($parent_lower !== $tag_lower)
 			{
 				if (isset($this->optional_closing_tags[$parent_lower]) && isset($this->block_tags[$tag_lower]))
 				{
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$org_parent = $this->parent;
 
-					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
+					while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower)
 						$this->parent = $this->parent->parent;
 
-					if (strtolower($this->parent->tag)!==$tag_lower) {
+					if (strtolower($this->parent->tag) !== $tag_lower) {
 						$this->parent = $org_parent; // restore origonal parent
 						if ($this->parent->parent) $this->parent = $this->parent->parent;
 						$this->parent->_[HDOM_INFO_END] = $this->cursor;
@@ -1324,17 +1324,17 @@ 
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$org_parent = $this->parent;
 
-					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
+					while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower)
 						$this->parent = $this->parent->parent;
 
-					if (strtolower($this->parent->tag)!==$tag_lower)
+					if (strtolower($this->parent->tag) !== $tag_lower)
 					{
 						$this->parent = $org_parent; // restore origonal parent
 						$this->parent->_[HDOM_INFO_END] = $this->cursor;
 						return $this->as_text_node($tag);
 					}
 				}
-				else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower)
+				else if (($this->parent->parent) && strtolower($this->parent->parent->tag) === $tag_lower)
 				{
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$this->parent = $this->parent->parent;
@@ -1346,7 +1346,7 @@ 
 			$this->parent->_[HDOM_INFO_END] = $this->cursor;
 			if ($this->parent->parent) $this->parent = $this->parent->parent;
 
-			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
 		}
 
@@ -1357,25 +1357,25 @@ 
 		$node->tag_start = $begin_tag_pos;
 
 		// doctype, cdata & comments...
-		if (isset($tag[0]) && $tag[0]==='!') {
-			$node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until_char('>');
+		if (isset($tag[0]) && $tag[0] === '!') {
+			$node->_[HDOM_INFO_TEXT] = '<'.$tag.$this->copy_until_char('>');
 
-			if (isset($tag[2]) && $tag[1]==='-' && $tag[2]==='-') {
+			if (isset($tag[2]) && $tag[1] === '-' && $tag[2] === '-') {
 				$node->nodetype = HDOM_TYPE_COMMENT;
 				$node->tag = 'comment';
 			} else {
 				$node->nodetype = HDOM_TYPE_UNKNOWN;
 				$node->tag = 'unknown';
 			}
-			if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+			if ($this->char === '>') $node->_[HDOM_INFO_TEXT] .= '>';
 			$this->link_nodes($node, true);
-			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
 		}
 
 		// text
-		if ($pos=strpos($tag, '<')!==false) {
-			$tag = '<' . substr($tag, 0, -1);
+		if ($pos = strpos($tag, '<') !== false) {
+			$tag = '<'.substr($tag, 0, -1);
 			$node->_[HDOM_INFO_TEXT] = $tag;
 			$this->link_nodes($node, false);
 			$this->char = $this->doc[--$this->pos]; // prev
@@ -1383,15 +1383,15 @@ 
 		}
 
 		if (!preg_match("/^[\w-:]+$/", $tag)) {
-			$node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until('<>');
-			if ($this->char==='<') {
+			$node->_[HDOM_INFO_TEXT] = '<'.$tag.$this->copy_until('<>');
+			if ($this->char === '<') {
 				$this->link_nodes($node, false);
 				return true;
 			}
 
-			if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+			if ($this->char === '>') $node->_[HDOM_INFO_TEXT] .= '>';
 			$this->link_nodes($node, false);
-			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
 		}
 
@@ -1401,7 +1401,7 @@ 
 		$node->tag = ($this->lowercase) ? $tag_lower : $tag;
 
 		// handle optional closing tags
-		if (isset($this->optional_closing_tags[$tag_lower]) )
+		if (isset($this->optional_closing_tags[$tag_lower]))
 		{
 			while (isset($this->optional_closing_tags[$tag_lower][strtolower($this->parent->tag)]))
 			{
@@ -1417,67 +1417,67 @@ 
 		// attributes
 		do
 		{
-			if ($this->char!==null && $space[0]==='')
+			if ($this->char !== null && $space[0] === '')
 			{
 				break;
 			}
 			$name = $this->copy_until($this->token_equal);
-			if ($guard===$this->pos)
+			if ($guard === $this->pos)
 			{
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				continue;
 			}
 			$guard = $this->pos;
 
 			// handle endless '<'
-			if ($this->pos>=$this->size-1 && $this->char!=='>') {
+			if ($this->pos >= $this->size - 1 && $this->char !== '>') {
 				$node->nodetype = HDOM_TYPE_TEXT;
 				$node->_[HDOM_INFO_END] = 0;
-				$node->_[HDOM_INFO_TEXT] = '<'.$tag . $space[0] . $name;
+				$node->_[HDOM_INFO_TEXT] = '<'.$tag.$space[0].$name;
 				$node->tag = 'text';
 				$this->link_nodes($node, false);
 				return true;
 			}
 
 			// handle mismatch '<'
-			if ($this->doc[$this->pos-1]=='<') {
+			if ($this->doc[$this->pos - 1] == '<') {
 				$node->nodetype = HDOM_TYPE_TEXT;
 				$node->tag = 'text';
 				$node->attr = array();
 				$node->_[HDOM_INFO_END] = 0;
-				$node->_[HDOM_INFO_TEXT] = substr($this->doc, $begin_tag_pos, $this->pos-$begin_tag_pos-1);
+				$node->_[HDOM_INFO_TEXT] = substr($this->doc, $begin_tag_pos, $this->pos - $begin_tag_pos - 1);
 				$this->pos -= 2;
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				$this->link_nodes($node, false);
 				return true;
 			}
 
-			if ($name!=='/' && $name!=='') {
+			if ($name !== '/' && $name !== '') {
 				$space[1] = $this->copy_skip($this->token_blank);
 				$name = $this->restore_noise($name);
 				if ($this->lowercase) $name = strtolower($name);
-				if ($this->char==='=') {
-					$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				if ($this->char === '=') {
+					$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 					$this->parse_attr($node, $name, $space);
 				}
 				else {
 					//no value attr: nowrap, checked selected...
 					$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
 					$node->attr[$name] = true;
-					if ($this->char!='>') $this->char = $this->doc[--$this->pos]; // prev
+					if ($this->char != '>') $this->char = $this->doc[--$this->pos]; // prev
 				}
 				$node->_[HDOM_INFO_SPACE][] = $space;
 				$space = array($this->copy_skip($this->token_blank), '', '');
 			}
 			else
 				break;
-		} while ($this->char!=='>' && $this->char!=='/');
+		} while ($this->char !== '>' && $this->char !== '/');
 
 		$this->link_nodes($node, true);
 		$node->_[HDOM_INFO_ENDSPACE] = $space[0];
 
 		// check self closing
-		if ($this->copy_until_char_escape('>')==='/')
+		if ($this->copy_until_char_escape('>') === '/')
 		{
 			$node->_[HDOM_INFO_ENDSPACE] .= '/';
 			$node->_[HDOM_INFO_END] = 0;
@@ -1487,7 +1487,7 @@ 
 			// reset parent
 			if (!isset($this->self_closing_tags[strtolower($node->tag)])) $this->parent = $node;
 		}
-		$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 
 		// If it's a BR tag, we need to set it's text to the default text.
 		// This way when we see it in plaintext, we can generate formatting that the user wants.
@@ -1514,15 +1514,15 @@ 
 		switch ($this->char) {
 			case '"':
 				$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_DOUBLE;
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				$node->attr[$name] = $this->restore_noise($this->copy_until_char_escape('"'));
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				break;
 			case '\'':
 				$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_SINGLE;
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				$node->attr[$name] = $this->restore_noise($this->copy_until_char_escape('\''));
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				break;
 			default:
 				$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
@@ -1553,16 +1553,16 @@ 
 	{
 		$node = new simple_html_dom_node($this);
 		++$this->cursor;
-		$node->_[HDOM_INFO_TEXT] = '</' . $tag . '>';
+		$node->_[HDOM_INFO_TEXT] = '</'.$tag.'>';
 		$this->link_nodes($node, false);
-		$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 		return true;
 	}
 
 	protected function skip($chars)
 	{
 		$this->pos += strspn($this->doc, $chars, $this->pos);
-		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		$this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 	}
 
 	protected function copy_skip($chars)
@@ -1570,8 +1570,8 @@ 
 		$pos = $this->pos;
 		$len = strspn($this->doc, $chars, $pos);
 		$this->pos += $len;
-		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-		if ($len===0) return '';
+		$this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+		if ($len === 0) return '';
 		return substr($this->doc, $pos, $len);
 	}
 
@@ -1580,70 +1580,70 @@ 
 		$pos = $this->pos;
 		$len = strcspn($this->doc, $chars, $pos);
 		$this->pos += $len;
-		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		$this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 		return substr($this->doc, $pos, $len);
 	}
 
 	protected function copy_until_char($char)
 	{
-		if ($this->char===null) return '';
+		if ($this->char === null) return '';
 
-		if (($pos = strpos($this->doc, $char, $this->pos))===false) {
-			$ret = substr($this->doc, $this->pos, $this->size-$this->pos);
+		if (($pos = strpos($this->doc, $char, $this->pos)) === false) {
+			$ret = substr($this->doc, $this->pos, $this->size - $this->pos);
 			$this->char = null;
 			$this->pos = $this->size;
 			return $ret;
 		}
 
-		if ($pos===$this->pos) return '';
+		if ($pos === $this->pos) return '';
 		$pos_old = $this->pos;
 		$this->char = $this->doc[$pos];
 		$this->pos = $pos;
-		return substr($this->doc, $pos_old, $pos-$pos_old);
+		return substr($this->doc, $pos_old, $pos - $pos_old);
 	}
 
 	protected function copy_until_char_escape($char)
 	{
-		if ($this->char===null) return '';
+		if ($this->char === null) return '';
 
 		$start = $this->pos;
 		while (1)
 		{
-			if (($pos = strpos($this->doc, $char, $start))===false)
+			if (($pos = strpos($this->doc, $char, $start)) === false)
 			{
-				$ret = substr($this->doc, $this->pos, $this->size-$this->pos);
+				$ret = substr($this->doc, $this->pos, $this->size - $this->pos);
 				$this->char = null;
 				$this->pos = $this->size;
 				return $ret;
 			}
 
-			if ($pos===$this->pos) return '';
+			if ($pos === $this->pos) return '';
 
-			if ($this->doc[$pos-1]==='\\') {
-				$start = $pos+1;
+			if ($this->doc[$pos - 1] === '\\') {
+				$start = $pos + 1;
 				continue;
 			}
 
 			$pos_old = $this->pos;
 			$this->char = $this->doc[$pos];
 			$this->pos = $pos;
-			return substr($this->doc, $pos_old, $pos-$pos_old);
+			return substr($this->doc, $pos_old, $pos - $pos_old);
 		}
 	}
 
 	// remove noise from html content
 	// save the noise in the $this->noise array.
-	protected function remove_noise($pattern, $remove_tag=false)
+	protected function remove_noise($pattern, $remove_tag = false)
 	{
 		global $debug_object;
 		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
 
 		$count = preg_match_all($pattern, $this->doc, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
 
-		for ($i=$count-1; $i>-1; --$i)
+		for ($i = $count - 1; $i > -1; --$i)
 		{
-			$key = '___noise___'.sprintf('% 5d', count($this->noise)+1000);
-			if (is_object($debug_object)) { $debug_object->debug_log(2, 'key is: ' . $key); }
+			$key = '___noise___'.sprintf('% 5d', count($this->noise) + 1000);
+			if (is_object($debug_object)) { $debug_object->debug_log(2, 'key is: '.$key); }
 			$idx = ($remove_tag) ? 0 : 1;
 			$this->noise[$key] = $matches[$i][$idx][0];
 			$this->doc = substr_replace($this->doc, $key, $matches[$i][$idx][1], strlen($matches[$i][$idx][0]));
@@ -1651,7 +1651,7 @@ 
 
 		// reset the length of content
 		$this->size = strlen($this->doc);
-		if ($this->size>0)
+		if ($this->size > 0)
 		{
 			$this->char = $this->doc[0];
 		}
@@ -1663,28 +1663,28 @@ 
 		global $debug_object;
 		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
 
-		while (($pos=strpos($text, '___noise___'))!==false)
+		while (($pos = strpos($text, '___noise___')) !== false)
 		{
 			// Sometimes there is a broken piece of markup, and we don't GET the pos+11 etc... token which indicates a problem outside of us...
-			if (strlen($text) > $pos+15)
+			if (strlen($text) > $pos + 15)
 			{
-				$key = '___noise___'.$text[$pos+11].$text[$pos+12].$text[$pos+13].$text[$pos+14].$text[$pos+15];
-				if (is_object($debug_object)) { $debug_object->debug_log(2, 'located key of: ' . $key); }
+				$key = '___noise___'.$text[$pos + 11].$text[$pos + 12].$text[$pos + 13].$text[$pos + 14].$text[$pos + 15];
+				if (is_object($debug_object)) { $debug_object->debug_log(2, 'located key of: '.$key); }
 
 				if (isset($this->noise[$key]))
 				{
-					$text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos+16);
+					$text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos + 16);
 				}
 				else
 				{
 					// do this to prevent an infinite loop.
-					$text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key . substr($text, $pos+16);
+					$text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key.substr($text, $pos + 16);
 				}
 			}
 			else
 			{
 				// There is no valid key being given back to us... We must get rid of the ___noise___ or we will have a problem.
-				$text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY' . substr($text, $pos+11);
+				$text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY'.substr($text, $pos + 11);
 			}
 		}
 		return $text;
@@ -1696,9 +1696,9 @@ 
 		global $debug_object;
 		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
 
-		foreach($this->noise as $noiseElement)
+		foreach ($this->noise as $noiseElement)
 		{
-			if (strpos($noiseElement, $text)!==false)
+			if (strpos($noiseElement, $text) !== false)
 			{
 				return $noiseElement;
 			}
@@ -1727,16 +1727,16 @@ 
 	}
 
 	// camel naming conventions
-	function childNodes($idx=-1) {return $this->root->childNodes($idx);}
-	function firstChild() {return $this->root->first_child();}
-	function lastChild() {return $this->root->last_child();}
-	function createElement($name, $value=null) {return @str_get_html("<$name>$value</$name>")->first_child();}
-	function createTextNode($value) {return @end(str_get_html($value)->nodes);}
-	function getElementById($id) {return $this->find("#$id", 0);}
-	function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);}
-	function getElementByTagName($name) {return $this->find($name, 0);}
-	function getElementsByTagName($name, $idx=-1) {return $this->find($name, $idx);}
-	function loadFile() {$args = func_get_args();$this->load_file($args);}
+	function childNodes($idx = -1) {return $this->root->childNodes($idx); }
+	function firstChild() {return $this->root->first_child(); }
+	function lastChild() {return $this->root->last_child(); }
+	function createElement($name, $value = null) {return @str_get_html("<$name>$value</$name>")->first_child(); }
+	function createTextNode($value) {return @end(str_get_html($value)->nodes); }
+	function getElementById($id) {return $this->find("#$id", 0); }
+	function getElementsById($id, $idx = null) {return $this->find("#$id", $idx); }
+	function getElementByTagName($name) {return $this->find($name, 0); }
+	function getElementsByTagName($name, $idx = -1) {return $this->find($name, $idx); }
+	function loadFile() {$args = func_get_args(); $this->load_file($args); }
 }
 
 ?>
\ No newline at end of file

Braces +193 added lines, -101 removed lines

@@ -159,8 +159,9 @@ 
 		if ($show_attr && count($this->attr)>0)
 		{
 			echo '(';
-			foreach ($this->attr as $k=>$v)
-				echo "[$k]=>\"".$this->$k.'", ';
+			foreach ($this->attr as $k=>$v) {
+							echo "[$k]=>\"".$this->$k.'", ';
+			}
 			echo ')';
 		}
 		echo "\n";
@@ -218,8 +219,7 @@ 
 		if (isset($node->_[HDOM_INFO_INNER]))
 		{
 			$string .= $node->_[HDOM_INFO_INNER] . "'";
-		}
-		else
+		} else
 		{
 			$string .= ' NULL ';
 		}
@@ -233,8 +233,7 @@ 
 		{
 			echo $string;
 			return;
-		}
-		else
+		} else
 		{
 			return $string;
 		}
@@ -320,12 +319,17 @@ 
 	// returns the previous sibling of node
 	function prev_sibling()
 	{
-		if ($this->parent===null) return null;
+		if ($this->parent===null) {
+			return null;
+		}
 		$idx = 0;
 		$count = count($this->parent->children);
-		while ($idx<$count && $this!==$this->parent->children[$idx])
-			++$idx;
-		if (--$idx<0) return null;
+		while ($idx<$count && $this!==$this->parent->children[$idx]) {
+					++$idx;
+		}
+		if (--$idx<0) {
+			return null;
+		}
 		return $this->parent->children[$idx];
 	}
 
@@ -354,12 +358,17 @@ 
 	// get dom node's inner html
 	function innertext()
 	{
-		if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER];
-		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		if (isset($this->_[HDOM_INFO_INNER])) {
+			return $this->_[HDOM_INFO_INNER];
+		}
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+			return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		}
 
 		$ret = '';
-		foreach ($this->nodes as $n)
-			$ret .= $n->outertext();
+		foreach ($this->nodes as $n) {
+					$ret .= $n->outertext();
+		}
 		return $ret;
 	}
 
@@ -380,7 +389,9 @@ 
 			$debug_object->debug_log(1, 'Innertext of tag: ' . $this->tag . $text);
 		}
 
-		if ($this->tag==='root') return $this->innertext();
+		if ($this->tag==='root') {
+			return $this->innertext();
+		}
 
 		// trigger callback
 		if ($this->dom && $this->dom->callback!==null)
@@ -388,8 +399,12 @@ 
 			call_user_func_array($this->dom->callback, array($this));
 		}
 
-		if (isset($this->_[HDOM_INFO_OUTER])) return $this->_[HDOM_INFO_OUTER];
-		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		if (isset($this->_[HDOM_INFO_OUTER])) {
+			return $this->_[HDOM_INFO_OUTER];
+		}
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+			return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		}
 
 		// render begin tag
 		if ($this->dom && $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]])
@@ -418,23 +433,30 @@ 
 		}
 
 		// render end tag
-		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0)
-			$ret .= '</'.$this->tag.'>';
+		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0) {
+					$ret .= '</'.$this->tag.'>';
+		}
 		return $ret;
 	}
 
 	// get dom node's plain text
 	function text()
 	{
-		if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER];
+		if (isset($this->_[HDOM_INFO_INNER])) {
+			return $this->_[HDOM_INFO_INNER];
+		}
 		switch ($this->nodetype)
 		{
 			case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
 			case HDOM_TYPE_COMMENT: return '';
 			case HDOM_TYPE_UNKNOWN: return '';
 		}
-		if (strcasecmp($this->tag, 'script')===0) return '';
-		if (strcasecmp($this->tag, 'style')===0) return '';
+		if (strcasecmp($this->tag, 'script')===0) {
+			return '';
+		}
+		if (strcasecmp($this->tag, 'style')===0) {
+			return '';
+		}
 
 		$ret = '';
 		// In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL.
@@ -470,7 +492,9 @@ 
 	function makeup()
 	{
 		// text, comment, unknown
-		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+			return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		}
 
 		$ret = '<'.$this->tag;
 		$i = -1;
@@ -480,14 +504,15 @@ 
 			++$i;
 
 			// skip removed attribute
-			if ($val===null || $val===false)
-				continue;
+			if ($val===null || $val===false) {
+							continue;
+			}
 
 			$ret .= $this->_[HDOM_INFO_SPACE][$i][0];
 			//no value attr: nowrap, checked selected...
-			if ($val===true)
-				$ret .= $key;
-			else {
+			if ($val===true) {
+							$ret .= $key;
+			} else {
 				switch ($this->_[HDOM_INFO_QUOTE][$i])
 				{
 					case HDOM_QUOTE_DOUBLE: $quote = '"'; break;
@@ -506,7 +531,9 @@ 
 	function find($selector, $idx=null, $lowercase=false)
 	{
 		$selectors = $this->parse_selector($selector);
-		if (($count=count($selectors))===0) return array();
+		if (($count=count($selectors))===0) {
+			return array();
+		}
 		$found_keys = array();
 
 		// find each selector
@@ -514,8 +541,12 @@ 
 		{
 			// The change on the below line was documented on the sourceforge code tracker id 2788009
 			// used to be: if (($levle=count($selectors[0]))===0) return array();
-			if (($levle=count($selectors[$c]))===0) return array();
-			if (!isset($this->_[HDOM_INFO_BEGIN])) return array();
+			if (($levle=count($selectors[$c]))===0) {
+				return array();
+			}
+			if (!isset($this->_[HDOM_INFO_BEGIN])) {
+				return array();
+			}
 
 			$head = array($this->_[HDOM_INFO_BEGIN]=>1);
 
@@ -545,12 +576,16 @@ 
 		ksort($found_keys);
 
 		$found = array();
-		foreach ($found_keys as $k=>$v)
-			$found[] = $this->dom->nodes[$k];
+		foreach ($found_keys as $k=>$v) {
+					$found[] = $this->dom->nodes[$k];
+		}
 
 		// return nth-element or array
-		if (is_null($idx)) return $found;
-		else if ($idx<0) $idx = count($found) + $idx;
+		if (is_null($idx)) {
+			return $found;
+		} else if ($idx<0) {
+			$idx = count($found) + $idx;
+		}
 		return (isset($found[$idx])) ? $found[$idx] : null;
 	}
 
@@ -595,8 +630,9 @@ 
 			$pass = true;
 
 			if ($tag==='*' && !$key) {
-				if (in_array($node, $this->children, true))
-					$ret[$i] = 1;
+				if (in_array($node, $this->children, true)) {
+									$ret[$i] = 1;
+				}
 				continue;
 			}
 
@@ -605,9 +641,13 @@ 
 			// compare key
 			if ($pass && $key) {
 				if ($no_key) {
-					if (isset($node->attr[$key])) $pass=false;
+					if (isset($node->attr[$key])) {
+						$pass=false;
+					}
 				} else {
-					if (($key != "plaintext") && !isset($node->attr[$key])) $pass=false;
+					if (($key != "plaintext") && !isset($node->attr[$key])) {
+						$pass=false;
+					}
 				}
 			}
 			// compare value
@@ -640,13 +680,19 @@ 
 							} else {
 								$check = $this->match($exp, $val, $k);
 							}
-							if ($check) break;
+							if ($check) {
+								break;
+							}
 						}
 					}
 				}
-				if (!$check) $pass = false;
+				if (!$check) {
+					$pass = false;
+				}
+			}
+			if ($pass) {
+				$ret[$i] = 1;
 			}
-			if ($pass) $ret[$i] = 1;
 			unset($node);
 		}
 		// It's passed by reference so this is actually what this function returns.
@@ -696,9 +742,13 @@ 
 
 		foreach ($matches as $m) {
 			$m[0] = trim($m[0]);
-			if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') continue;
+			if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') {
+				continue;
+			}
 			// for browser generated xpath
-			if ($m[1]==='tbody') continue;
+			if ($m[1]==='tbody') {
+				continue;
+			}
 
 			list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false);
 			if (!empty($m[2])) {$key='id'; $val=$m[2];}
@@ -718,8 +768,9 @@ 
 				$result = array();
 			}
 		}
-		if (count($result)>0)
-			$selectors[] = $result;
+		if (count($result)>0) {
+					$selectors[] = $result;
+		}
 		return $selectors;
 	}
 
@@ -748,7 +799,9 @@ 
 		{
 			case 'outertext': return $this->_[HDOM_INFO_OUTER] = $value;
 			case 'innertext':
-				if (isset($this->_[HDOM_INFO_TEXT])) return $this->_[HDOM_INFO_TEXT] = $value;
+				if (isset($this->_[HDOM_INFO_TEXT])) {
+					return $this->_[HDOM_INFO_TEXT] = $value;
+				}
 				return $this->_[HDOM_INFO_INNER] = $value;
 		}
 		if (!isset($this->attr[$name]))
@@ -772,8 +825,9 @@ 
 	}
 
 	function __unset($name) {
-		if (isset($this->attr[$name]))
-			unset($this->attr[$name]);
+		if (isset($this->attr[$name])) {
+					unset($this->attr[$name]);
+		}
 	}
 
 	// PaperG - Function to convert the text from one character set to another if the two sets are not the same.
@@ -800,8 +854,7 @@ 
 			if ((strcasecmp($targetCharset, 'UTF-8') == 0) && ($this->is_utf8($text)))
 			{
 				$converted_text = $text;
-			}
-			else
+			} else
 			{
 				$converted_text = iconv($sourceCharset, $targetCharset, $text);
 			}
@@ -839,19 +892,31 @@ 
 			$c=ord($str[$i]);
 			if($c > 128)
 			{
-				if(($c >= 254)) return false;
-				elseif($c >= 252) $bits=6;
-				elseif($c >= 248) $bits=5;
-				elseif($c >= 240) $bits=4;
-				elseif($c >= 224) $bits=3;
-				elseif($c >= 192) $bits=2;
-				else return false;
-				if(($i+$bits) > $len) return false;
+				if(($c >= 254)) {
+					return false;
+				} elseif($c >= 252) {
+					$bits=6;
+				} elseif($c >= 248) {
+					$bits=5;
+				} elseif($c >= 240) {
+					$bits=4;
+				} elseif($c >= 224) {
+					$bits=3;
+				} elseif($c >= 192) {
+					$bits=2;
+				} else {
+					return false;
+				}
+				if(($i+$bits) > $len) {
+					return false;
+				}
 				while($bits > 1)
 				{
 					$i++;
 					$b=ord($str[$i]);
-					if($b < 128 || $b > 191) return false;
+					if($b < 128 || $b > 191) {
+						return false;
+					}
 					$bits--;
 				}
 			}
@@ -1035,8 +1100,7 @@ 
 			if (preg_match("/^http:\/\//i",$str) || is_file($str))
 			{
 				$this->load_file($str);
-			}
-			else
+			} else
 			{
 				$this->load($str, $lowercase, $stripRN, $defaultBRText, $defaultSpanText);
 			}
@@ -1118,7 +1182,9 @@ 
 	function save($filepath='')
 	{
 		$ret = $this->root->innertext();
-		if ($filepath!=='') file_put_contents($filepath, $ret, LOCK_EX);
+		if ($filepath!=='') {
+			file_put_contents($filepath, $ret, LOCK_EX);
+		}
 		return $ret;
 	}
 
@@ -1134,7 +1200,10 @@ 
 	{
 		foreach ($this->nodes as $n) {$n->clear(); $n = null;}
 		// This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear.
-		if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null;}
+		if (isset($this->children)) {
+			foreach ($this->children as $n) {$n->clear();
+		}
+		$n = null;}
 		if (isset($this->parent)) {$this->parent->clear(); unset($this->parent);}
 		if (isset($this->root)) {$this->root->clear(); unset($this->root);}
 		unset($this->doc);
@@ -1178,7 +1247,9 @@ 
 		$this->root->_[HDOM_INFO_BEGIN] = -1;
 		$this->root->nodetype = HDOM_TYPE_ROOT;
 		$this->parent = $this->root;
-		if ($this->size>0) $this->char = $this->doc[0];
+		if ($this->size>0) {
+			$this->char = $this->doc[0];
+		}
 	}
 
 	// parse html content
@@ -1232,8 +1303,7 @@ 
 					if ($success)
 					{
 						$charset = $matches[1];
-					}
-					else
+					} else
 					{
 						// If there is a meta tag, and they don't specify the character set, research says that it's typically ISO-8859-1
 						if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.');}
@@ -1296,8 +1366,9 @@ 
 			$tag = $this->copy_until_char('>');
 
 			// skip attributes in end tag
-			if (($pos = strpos($tag, ' '))!==false)
-				$tag = substr($tag, 0, $pos);
+			if (($pos = strpos($tag, ' '))!==false) {
+							$tag = substr($tag, 0, $pos);
+			}
 
 			$parent_lower = strtolower($this->parent->tag);
 			$tag_lower = strtolower($tag);
@@ -1309,23 +1380,26 @@ 
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$org_parent = $this->parent;
 
-					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
-						$this->parent = $this->parent->parent;
+					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) {
+											$this->parent = $this->parent->parent;
+					}
 
 					if (strtolower($this->parent->tag)!==$tag_lower) {
 						$this->parent = $org_parent; // restore origonal parent
-						if ($this->parent->parent) $this->parent = $this->parent->parent;
+						if ($this->parent->parent) {
+							$this->parent = $this->parent->parent;
+						}
 						$this->parent->_[HDOM_INFO_END] = $this->cursor;
 						return $this->as_text_node($tag);
 					}
-				}
-				else if (($this->parent->parent) && isset($this->block_tags[$tag_lower]))
+				} else if (($this->parent->parent) && isset($this->block_tags[$tag_lower]))
 				{
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$org_parent = $this->parent;
 
-					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
-						$this->parent = $this->parent->parent;
+					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) {
+											$this->parent = $this->parent->parent;
+					}
 
 					if (strtolower($this->parent->tag)!==$tag_lower)
 					{
@@ -1333,18 +1407,19 @@ 
 						$this->parent->_[HDOM_INFO_END] = $this->cursor;
 						return $this->as_text_node($tag);
 					}
-				}
-				else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower)
+				} else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower)
 				{
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$this->parent = $this->parent->parent;
+				} else {
+									return $this->as_text_node($tag);
 				}
-				else
-					return $this->as_text_node($tag);
 			}
 
 			$this->parent->_[HDOM_INFO_END] = $this->cursor;
-			if ($this->parent->parent) $this->parent = $this->parent->parent;
+			if ($this->parent->parent) {
+				$this->parent = $this->parent->parent;
+			}
 
 			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
@@ -1367,7 +1442,9 @@ 
 				$node->nodetype = HDOM_TYPE_UNKNOWN;
 				$node->tag = 'unknown';
 			}
-			if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+			if ($this->char==='>') {
+				$node->_[HDOM_INFO_TEXT].='>';
+			}
 			$this->link_nodes($node, true);
 			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
@@ -1389,7 +1466,9 @@ 
 				return true;
 			}
 
-			if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+			if ($this->char==='>') {
+				$node->_[HDOM_INFO_TEXT].='>';
+			}
 			$this->link_nodes($node, false);
 			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
@@ -1455,22 +1534,26 @@ 
 			if ($name!=='/' && $name!=='') {
 				$space[1] = $this->copy_skip($this->token_blank);
 				$name = $this->restore_noise($name);
-				if ($this->lowercase) $name = strtolower($name);
+				if ($this->lowercase) {
+					$name = strtolower($name);
+				}
 				if ($this->char==='=') {
 					$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 					$this->parse_attr($node, $name, $space);
-				}
-				else {
+				} else {
 					//no value attr: nowrap, checked selected...
 					$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
 					$node->attr[$name] = true;
-					if ($this->char!='>') $this->char = $this->doc[--$this->pos]; // prev
+					if ($this->char!='>') {
+						$this->char = $this->doc[--$this->pos];
+					}
+					// prev
 				}
 				$node->_[HDOM_INFO_SPACE][] = $space;
 				$space = array($this->copy_skip($this->token_blank), '', '');
+			} else {
+							break;
 			}
-			else
-				break;
 		} while ($this->char!=='>' && $this->char!=='/');
 
 		$this->link_nodes($node, true);
@@ -1481,11 +1564,12 @@ 
 		{
 			$node->_[HDOM_INFO_ENDSPACE] .= '/';
 			$node->_[HDOM_INFO_END] = 0;
-		}
-		else
+		} else
 		{
 			// reset parent
-			if (!isset($this->self_closing_tags[strtolower($node->tag)])) $this->parent = $node;
+			if (!isset($this->self_closing_tags[strtolower($node->tag)])) {
+				$this->parent = $node;
+			}
 		}
 		$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 
@@ -1571,7 +1655,9 @@ 
 		$len = strspn($this->doc, $chars, $pos);
 		$this->pos += $len;
 		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-		if ($len===0) return '';
+		if ($len===0) {
+			return '';
+		}
 		return substr($this->doc, $pos, $len);
 	}
 
@@ -1586,7 +1672,9 @@ 
 
 	protected function copy_until_char($char)
 	{
-		if ($this->char===null) return '';
+		if ($this->char===null) {
+			return '';
+		}
 
 		if (($pos = strpos($this->doc, $char, $this->pos))===false) {
 			$ret = substr($this->doc, $this->pos, $this->size-$this->pos);
@@ -1595,7 +1683,9 @@ 
 			return $ret;
 		}
 
-		if ($pos===$this->pos) return '';
+		if ($pos===$this->pos) {
+			return '';
+		}
 		$pos_old = $this->pos;
 		$this->char = $this->doc[$pos];
 		$this->pos = $pos;
@@ -1604,7 +1694,9 @@ 
 
 	protected function copy_until_char_escape($char)
 	{
-		if ($this->char===null) return '';
+		if ($this->char===null) {
+			return '';
+		}
 
 		$start = $this->pos;
 		while (1)
@@ -1617,7 +1709,9 @@ 
 				return $ret;
 			}
 
-			if ($pos===$this->pos) return '';
+			if ($pos===$this->pos) {
+				return '';
+			}
 
 			if ($this->doc[$pos-1]==='\\') {
 				$start = $pos+1;
@@ -1674,14 +1768,12 @@ 
 				if (isset($this->noise[$key]))
 				{
 					$text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos+16);
-				}
-				else
+				} else
 				{
 					// do this to prevent an infinite loop.
 					$text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key . substr($text, $pos+16);
 				}
-			}
-			else
+			} else
 			{
 				// There is no valid key being given back to us... We must get rid of the ___noise___ or we will have a problem.
 				$text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY' . substr($text, $pos+11);

date-statistics-manufacturer.php

Spacing +7 added lines, -7 removed lines

@@ -3,13 +3,13 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByDate($date, "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft Manufacturer on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+	$title = sprintf(_("Most Common Aircraft Manufacturer on %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -27,13 +27,13 @@ 
 	print '<script type="text/javascript">$(function () { $("#datepicker").datetimepicker({ format: "YYYY-MM-DD", defaultDate: "'.$date.'" }); }); </script>';
 	print '<br />';
 	print '<div class="info column">';
-	print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
+	print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
 	print '</div>';
 
 	include('date-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft Manufacturer").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
 
 	$manufacturers_array = $Spotter->countAllAircraftManufacturerByDate($date);
 	if (!empty($manufacturers_array))
@@ -48,7 +48,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($manufacturers_array as $manufacturer_item)
+		foreach ($manufacturers_array as $manufacturer_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

date-statistics-registration.php

Spacing +7 added lines, -7 removed lines

@@ -3,9 +3,9 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByDate($date, "0,1", $sort);
 
 if (!empty($spotter_array))
 {
@@ -27,13 +27,13 @@ 
 	print '<script type="text/javascript">$(function () { $("#datepicker").datetimepicker({ format: "YYYY-MM-DD", defaultDate: "'.$date.'" }); }); </script>';
 	print '<br />';
 	print '<div class="info column">';
-	print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
+	print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
 	print '</div>';
 
 	include('date-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft by Registration").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
 
 	$aircraft_array = $Spotter->countAllAircraftRegistrationByDate($date);
 	if (!empty($aircraft_array))
@@ -50,7 +50,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($aircraft_array as $aircraft_item)
+		foreach ($aircraft_array as $aircraft_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';
@@ -60,7 +60,7 @@ 
 				if (isset($aircraft_item['aircraft_type'])) {
 					print '<a href="'.$globalURL.'/registration/'.$aircraft_item['registration'].'"><img src="'.$aircraft_item['image_thumbnail'].'" class="img-rounded" data-toggle="popover" title="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_icao'].' - '.$aircraft_item['airline_name'].'" alt="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_type'].' - '.$aircraft_item['airline_name'].'" data-content="'._("Registration:").' '.$aircraft_item['registration'].'<br />'._("Aircraft:").' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')<br />'._("Airline:").' '.$aircraft_item['airline_name'].'" data-html="true" width="100px" /></a>';
 				} else {
-					print '<a href="'.$globalURL.'/registration/'.$aircraft_item['registration'].'"><img src="'.$aircraft_item['image_thumbnail'].'" class="img-rounded" data-toggle="popover" title="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_icao'].' - '.$aircraft_item['airline_name'].'" alt="'.$aircraft_item['registration'].' - '.$aircraft_item['airline_name'].'" data-content="'._("Registration:").' '.$aircraft_item['registration'].'<br />'._("Aircraft:").' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')<br />'._("Airline:");' '.$aircraft_item['airline_name'].'" data-html="true" width="100px" /></a>';
+					print '<a href="'.$globalURL.'/registration/'.$aircraft_item['registration'].'"><img src="'.$aircraft_item['image_thumbnail'].'" class="img-rounded" data-toggle="popover" title="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_icao'].' - '.$aircraft_item['airline_name'].'" alt="'.$aircraft_item['registration'].' - '.$aircraft_item['airline_name'].'" data-content="'._("Registration:").' '.$aircraft_item['registration'].'<br />'._("Aircraft:").' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')<br />'._("Airline:"); ' '.$aircraft_item['airline_name'].'" data-html="true" width="100px" /></a>';
 				}
 				print '</td>';
 			} else {

airline-statistics-manufacturer.php

Indentation +2 added lines, -2 removed lines

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

Spacing +7 added lines, -7 removed lines

@@ -7,13 +7,13 @@ 
         header('Location: '.$globalURL.'/airline');
         die();
 }
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft Manufacturer from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+	$title = sprintf(_("Most Common Aircraft Manufacturer from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/airline" method="post">';
@@ -22,9 +22,9 @@ 
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($airline == $airline_name['airline_icao'])
+		if ($airline == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -62,7 +62,7 @@ 
 	include('airline-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft Manufacturer").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 
 	$manufacturers_array = $Spotter->countAllAircraftManufacturerByAirline($airline);
 	if (!empty($manufacturers_array))
@@ -77,7 +77,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($manufacturers_array as $manufacturer_item)
+		foreach ($manufacturers_array as $manufacturer_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Braces +4 added lines, -3 removed lines

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