Ysurac / FlightAirMap

atc-geojson.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 	header('Content-disposition: attachment; filename="atc.geojson"');
 }
 header('Content-Type: text/javascript');
-$ATC=new ATC();
+$ATC = new ATC();
 if (isset($_GET['coord'])) 
 {
 	//$coords = explode(',',$_GET['coord']);
@@ -19,7 +19,7 @@ 
 $output = '{"type": "FeatureCollection","features": [';
 if (!empty($spotter_array))
 {	  
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		//waypoint plotting

Indentation +10 added lines, -10 removed lines

@@ -24,7 +24,7 @@ 
 		date_default_timezone_set('UTC');
 		//waypoint plotting
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"ref": "'.$spotter_item['atc_id'].'",';
 			$output .= '"ident": "'.$spotter_item['ident'].'",';
 			$output .= '"frequency": "'.$spotter_item['frequency'].'",';
@@ -50,18 +50,18 @@ 
 			} else {
 				$output .= '"icon": "images/atc.png"';
 			}
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
+				$output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 		$output .= '},';
 		$radius = $spotter_item['atc_range']*100;
 		if ($radius > 0) {
 			$output .= '{"type": "Feature",';
-			    $output .= '"properties": {';
+				$output .= '"properties": {';
 				$output .= '"ref": "'.$spotter_item['atc_id'].'",';
 				$output .= '"ident": "'.$spotter_item['ident'].'",';
 				$output .= '"frequency": "'.$spotter_item['frequency'].'",';
@@ -87,13 +87,13 @@ 
 				} else {
 					$output .= '"atccolor": "#888219"';
 				}
-			    $output .= '},';
-			    $output .= '"geometry": {';
+				$output .= '},';
+				$output .= '"geometry": {';
 				$output .= '"type": "Point",';
 				$output .= '"coordinates": [';
-				    $output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
+					$output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
 				$output .= ']';
-			    $output .= '}';
+				$output .= '}';
 			$output .= '},';
 		}
 	}

live-santa-czml.php

Braces +6 added lines, -2 removed lines

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

Spacing +290 added lines, -290 removed lines

@@ -27,7 +27,7 @@ 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "LOOP_STOP","step": "SYSTEM_CLOCK_MULTIPLIER"}';
 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
-$output .= ',"clock": {"currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"';
+$output .= ',"clock": {"currentTime" : "'.date("c", time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"';
 if (!isset($_GET['now'])) $output .= ',"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z"';
 $output .= '}';
 //$output .= ',"clock": {"currentTime" : "'.date("c",time()).'","multiplier" : 300,"range" : "UNBOUNDED","step": "TICK_DEPENDENT"}';
@@ -59,7 +59,7 @@ 
 if (!isset($_GET['now'])) {
 	$output .= '"epoch" : "'.date("Y").'-12-24T02:00:00Z",';
 } else {
-	$output .= '"epoch" : "'.date("c",time() - $globalLiveInterval).'",';
+	$output .= '"epoch" : "'.date("c", time() - $globalLiveInterval).'",';
 }
 //$output .= '"type": "Point",';
 //$output .= '"interpolationAlgorithm" : "LAGRANGE",';
@@ -69,581 +69,581 @@ 
 $output .= '"cartographicDegrees": [';
 $i = 0;
 $output .= $i.',-114.4,82.7,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-173.300003,64.379997,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',177.479995,64.75,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',158.65,53.016667,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',165.545318,11.626074,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',171.1300517813333,7.07999665990053,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',179.380004,-16.469999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',178.429992,-18.129999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',174.759994,-36.849998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',176.839996,-39.639999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',174.779998,-41.279998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',172.639999,-43.529998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',167.838199,-46.986747,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',168.320999,-17.740391,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',167.149993,-15.51,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',159.910003,-9.43,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',156.850006,-8.1,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',158.160003,6.92,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',150.017702,45.873311,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',154.796487,49.429802,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',142.7262,46.948978,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',150.800003,59.569999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',135.119995,48.419998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',131.899993,43.130001,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',142.212096,27.070652,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',141.312779,24.78389,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',144.79373,13.444305,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',151.783334,8.45,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',151.749999,7.416667,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',152.160003,-4.199999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',146.990005,-6.719999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',143.211639,-9.085352,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',146.779998,-19.26,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',149.179992,-21.139999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',153.020004,-27.459999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',151.210006,-33.869998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',147.291199,-42.85088,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',138.600006,-34.93,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',133.869995,-23.7,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',130.850006,-12.43,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',143.62,-3.56,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',134.5552,7.3608,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',135.169998,34.68,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',138.690002,35.169998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',139.770004,35.669998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',140.740005,40.830001,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',128.600006,35.869998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',125.925925,38.950981,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',129.771118,62.093056,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',104.239997,52.330001,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',114.5056,48.060478,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',106.580001,29.569999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',121.470001,31.229999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',113.25,23.12,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',114.177465,22.307184,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',121.639999,18.36,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',122.080001,6.92,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',114.639999,4.809999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',119.412399,-5.152193,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',122.230003,-17.959999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',115.839996,-31.959999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',105.680687,-10.428593,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',104.75,-2.99,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',113.029998,3.17,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',100.720001,4.86,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',104.18,10.609999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',103.864403,13.36866,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',99.330001,9.14,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',105.073303,18.30217,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',91.132088,29.6507,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',116.477651,40.332809,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',93.059997,56.02,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',86.18,69.410003,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',88.202881,69.315422,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',73.400001,55,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',76.949996,52.299999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',78.379997,42.490001,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',69.779998,37.919998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',86.933333,27.983333,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',84.870002,27.02,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',88.36,22.569999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',90.389999,23.7,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',97.04,20.78,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',92.762917,11.66857,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',50.23720550537109,-46.10261535644531,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',72.422489,-7.336367,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',73.510915,4.174199,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',81.050003,6.989999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',72.819999,18.959999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',78.042222,27.174167,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',71.449996,30.2,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',67.109993,36.703819,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',54.36,39.509998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',63.726529,40.214486,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',58.853439,48.251126,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',56.23246,58.00024,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',49.659999,58.599998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',50.150001,53.2,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',44.11,41.979999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',49.893226,40.38344,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',44.75,40.5,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',50.95,34.650001,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',56.27433,27.18717,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',54.989491,25.005817,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',59.549999,22.569999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',47.58318996007591,-9.722414273737707,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',57.471008,-20.26026,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',37.946460723877,-46.6428451538086,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',53,-67.5,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',46.99004,-25.03233,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',46.310001,-15.72,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',44.41203117370608,-12.22338294982911,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',39.3822,-6.097406,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',39.659999,-4.039999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',40.033333,7.916667,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',42.549999,16.899999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',43.970001,26.37,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',41.12,30.455,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',38.278671,34.547951,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',37.619998,55.75,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',30.453329,59.951889,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',23.12,63.84,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',26.709999,58.380001,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',25.42,57.549999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',23.319999,55.93,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',26.1,52.119998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',32.259998,48.5,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',28.829999,47.029998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',25.61,45.659999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',27.469999,42.509998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',23.729999,37.979999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',27.149999,38.43,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',31.132659,29.977088,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',32.659999,13.17,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',33.599998,1.71,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',25.92,-2.95,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',28.45,-14.439999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',30.819999,-20.059999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',21.639999,-21.7,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',25.59,-33.959999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',18.129999,-26.579999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',13.767777,-10.722417,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',10.13,-0.15,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',20.67,5.76,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',9.71,4.059999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',7.44,10.52,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',18.69,12.189999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',7.98,17,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',14.42,27.069999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',3.678539,32.489059,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-7.619999,33.599998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',13.611066,38.129963,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',12.482323,41.895466,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',17.189752,44.763891,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',16.45,43.509998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',14.51,46.060001,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',21.629999,47.54,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',16.37,48.220001,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',10.736111,47.554444,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',14.43,50.080001,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',17.129999,48.159999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',22.569999,51.240001,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',13.411895,52.523781,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',10.039999,56.470001,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',13.02,55.61,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',17.329999,62.400001,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',14.229999,78.059997,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',10.399999,63.439998,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',2.350966,48.856558,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',7.42,43.75,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',1.57,42.54,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-0.991293,37.605651,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-7.429999,39.29,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-11.4053,16.5889,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-3.009999,16.78,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-5.36008,5.83885,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-12.3,11.319999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-16.239999,12.829999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-16.2507,28.457661,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-0.126197,51.500197,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-2.968111,56.461428,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-7.308429,54.998539,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-8.92,52.7,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-19.000959,63.427502,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-28.364049911499,38.47212219238281,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-23.76,15.279999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-36.511219,-54.274151,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-58.979999,-51.830001,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-64.190002,-31.399999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-54.18,-32.36,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-43.2,-22.909999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-37.333333,65.666667,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-69.345131,77.48262,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-55.65049,48.929001,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-63.530471,44.681263,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-66.647818,45.957319,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-59.630001,13.18,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-61.744888,12.06526,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-61.171322,10.30501,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-67.470001,7.9,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-58.159999,6.789999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-60.02,-3.119999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-56.45,-14.409999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-65.260002,-19.059999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-56.636503,-24.158676,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-56.509998,-33.409999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-68.523514,-50.021889,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-72.505127,-51.732529,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-71.639999,-33.04,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-72.515821,-13.162849,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-76.970001,-6.03,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-78.620002,-1.24,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-76.739997,8.1,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-79.879913,9.368985,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-76.949996,18,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-72.699996,19.11,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-75.220001,20.149999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-73.682953,20.95027,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-80.605,28.405556,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-84.388056,33.748889,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-79.931111,32.776389,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-83.920833,35.960556,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-84.500278,38.049167,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-77.460833,38.303056,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-82.515556,40.758333,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-83.045833,42.331389,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-74.006389,40.714167,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-71.802778,42.2625,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-72.973056,43.610556,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-68.0125,46.860556,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-72.581779,46.357398,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-78.53632621543271,52.72737572958358,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-66.921779,52.940118,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-75.652573,62.201069,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-64.865257,67.935417,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-94.969443,74.716943,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-82.793909,76.395731,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-97.49276733398439,69.18675994873048,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-90.5537452697754,63.36753463745121,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-89.270113,48.412197,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-79.604159,43.68731,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-89.401111,43.073056,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-94.633611,42.395278,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-89.588889,40.693611,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-90.197778,38.627222,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-90.704167,35.842222,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-91.061667,33.41,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-92.445,31.311111,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-98.493333,29.423889,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-103.349998,20.67,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-86.830001,21.17,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-89.529998,14.979999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-87.449996,13.42,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-83.709999,9.369999,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-91.5149765,-0.3781085,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-109.425598,-27.1546,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-109.9142,22.88093,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-110.910003,27.92,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-110.925833,32.221667,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-104.526667,33.395,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-113.061111,37.6775,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-104.820833,38.833889,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-108.73,42.833056,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-113.895,45.175833,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-113.993056,46.872222,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-114.080796,51.039877,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-102.3889594419702,57.15883691318781,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-118.0333,66.0833,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-140.55,64.45,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-122.690386,58.80667,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-121.92985,50.686341,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-122.330833,47.606389,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-122.274167,47.564167,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-122.968503,45.309901,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-122.874444,42.326667,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-122.390556,40.586667,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-117.068611,39.493333,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-122.418333,37.775,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-117.108333,34.207778,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-116.544444,33.830278,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-117.156389,32.715278,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-149.891667,61.218333,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-155.566389,62.948889,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-165.406389,64.501111,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-155.09,19.729722,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-156.337974,20.804858,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-157.043209,21.141189,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-158.009167,21.386667,150000,';
-$i = $i+300;
+$i = $i + 300;
 $output .= $i.',-159.371111,21.981111,150000';
 
 $output .= ']}}';

route-detailed.php

Spacing +8 added lines, -8 removed lines

@@ -3,17 +3,17 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 
-if (!isset($_GET['departure_airport']) || !isset($_GET['arrival_airport'])){
+if (!isset($_GET['departure_airport']) || !isset($_GET['arrival_airport'])) {
 	header('Location: '.$globalURL.'');
 } else {
 	$Spotter = new Spotter();
 	//calculuation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -27,10 +27,10 @@ 
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$departure_airport = filter_input(INPUT_GET,'departure_airport',FILTER_SANITIZE_STRING);
-	$arrival_airport = filter_input(INPUT_GET,'arrival_airport',FILTER_SANITIZE_STRING);
+	$departure_airport = filter_input(INPUT_GET, 'departure_airport', FILTER_SANITIZE_STRING);
+	$arrival_airport = filter_input(INPUT_GET, 'arrival_airport', FILTER_SANITIZE_STRING);
 	$page_url = $globalURL.'/route/'.$departure_airport.'/'.$arrival_airport;
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	if ($sort != '') {
 		$spotter_array = $Spotter->getSpotterDataByRoute($departure_airport, $arrival_airport, $limit_start.",".$absolute_difference, $sort);
 	} else {
@@ -39,7 +39,7 @@ 
  
 	if (!empty($spotter_array))
 	{
-		$title = sprintf(_("Detailed View for flights between %s (%s), %s - %s (%s), %s"),$spotter_array[0]['departure_airport_name'],$spotter_array[0]['departure_airport_icao'],$spotter_array[0]['departure_airport_country'],$spotter_array[0]['arrival_airport_name'],$spotter_array[0]['arrival_airport_icao'],$spotter_array[0]['arrival_airport_country']);
+		$title = sprintf(_("Detailed View for flights between %s (%s), %s - %s (%s), %s"), $spotter_array[0]['departure_airport_name'], $spotter_array[0]['departure_airport_icao'], $spotter_array[0]['departure_airport_country'], $spotter_array[0]['arrival_airport_name'], $spotter_array[0]['arrival_airport_icao'], $spotter_array[0]['arrival_airport_country']);
 		require_once('header.php');
 		print '<div class="info column">';
 		print '<h1>'._("Flights between").' '.$spotter_array[0]['departure_airport_name'].' ('.$spotter_array[0]['departure_airport_icao'].'), '.$spotter_array[0]['departure_airport_country'].' - '.$spotter_array[0]['arrival_airport_name'].' ('.$spotter_array[0]['arrival_airport_icao'].'), '.$spotter_array[0]['arrival_airport_country'].'</h1>';
@@ -49,7 +49,7 @@ 
 
 		include('route-sub-menu.php');
 		print '<div class="table column">';
-		print '<p>'.sprintf(_("The table below shows the detailed information of all flights that used the route <strong>%s - %s</strong>."),$spotter_array[0]['departure_airport_icao'],$spotter_array[0]['arrival_airport_icao']).'</p>';
+		print '<p>'.sprintf(_("The table below shows the detailed information of all flights that used the route <strong>%s - %s</strong>."), $spotter_array[0]['departure_airport_icao'], $spotter_array[0]['arrival_airport_icao']).'</p>';
     
 		include('table-output.php'); 
 		print '<div class="pagination">';

Braces +1 added lines, -1 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];

upcoming.php

Spacing +3 added lines, -3 removed lines

@@ -7,12 +7,12 @@ 
 require_once('header.php');
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	$limit_start = 0;
 	$limit_end = 25;
 	$absolute_difference = 25;
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = $limit_explode[0];
 	$limit_end = $limit_explode[1];
@@ -35,7 +35,7 @@ 
 print '<div class="table column">';	
 print '<p>'._("This page shows all upcoming flights within the next 3 hours calculated using historical data, based on the number of same flights on the current day of the week &amp; current time. This does not take into account real-time delays and other factors.").'</p>';
 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 if ($sort != '') {
 	$spotter_array = $Spotter->getUpcomingFlights($limit_start.",".$absolute_difference, $sort);
 } else {

Braces +1 added lines, -1 removed lines

@@ -12,7 +12,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];

date-statistics-airline.php

Braces +5 added lines, -2 removed lines

@@ -6,8 +6,11 @@
 $Spotter = new Spotter();
 $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
 $date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
-if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort);
-else $spotter_array = '';
+if (isset($_GET['date'])) {
+	$spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort);
+} else {
+	$spotter_array = '';
+}
 
 if (!empty($spotter_array))
 {

Spacing +7 added lines, -7 removed lines

@@ -4,14 +4,14 @@ 
 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);
-if (isset($_GET['date'])) $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);
+if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($date, "0,1", $sort);
 else $spotter_array = '';
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Airlines on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+	$title = sprintf(_("Most Common Airlines on %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -29,13 +29,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 Airlines").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common airlines 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 airlines of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
 
 	$airline_array = $Spotter->countAllAirlinesByDate($date);
 	if (!empty($airline_array))
@@ -52,7 +52,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airline_array as $airline_item)
+		foreach ($airline_array as $airline_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

date-statistics-airline-country.php

Braces +5 added lines, -2 removed lines

@@ -8,8 +8,11 @@
 $date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
 
 $Spotter = new Spotter();
-if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort);
-else $spotter_array = array();
+if (isset($_GET['date'])) {
+	$spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort);
+} else {
+	$spotter_array = array();
+}
 
 if (!empty($spotter_array))
 {

Spacing +8 added lines, -8 removed lines

@@ -3,16 +3,16 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING);
 
 $Spotter = new Spotter();
-if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort);
+if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($date, "0,1", $sort);
 else $spotter_array = array();
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Airlines by Country on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+	$title = sprintf(_("Most Common Airlines by Country on %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/date" method="post" class="form-inline">';
@@ -29,13 +29,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 Airlines by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin 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 airlines by Country of origin of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
 
 	$airline_array = $Spotter->countAllAirlineCountriesByDate($date);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
@@ -44,7 +44,7 @@ 
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airline_array as $airline_item)
+	foreach ($airline_array as $airline_item)
 	{
 		$country_data .= '[ "'.$airline_item['airline_country_iso3'].'",'.$airport_item['airline_country_count'].'],';
 	}
@@ -91,7 +91,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airline_array as $airline_item)
+		foreach ($airline_array as $airline_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

incident-latest.php

Braces +6 added lines, -2 removed lines

@@ -38,8 +38,12 @@
 if (!empty($spotter_array) && $spotter_array[0]['query_number_rows'] != 0) {
 	include('table-output.php');
 	print '<div class="pagination">';
-	if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
-	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
+	if ($limit_previous_1 >= 0) {
+		print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
+	}
+	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) {
+		print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
+	}
 	print '</div>';
 }
 print '</div>';

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 
 $page_url = $globalURL.'/accident-latest';
 
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	$limit_start = 0;
 	$limit_end = 25;
@@ -34,7 +34,7 @@ 
 
 print '<div class="table column">';
 print '<p>'._("The table below shows the latest Incidents.").'</p>';
-$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference,'incident');
+$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference, 'incident');
 //print_r($spotter_array);
 if (!empty($spotter_array) && $spotter_array[0]['query_number_rows'] != 0) {
 	include('table-output.php');

incident-detailed.php

Spacing +5 added lines, -5 removed lines

@@ -10,10 +10,10 @@ 
 {
 	$date = date('Y-m-d');
 } else {
-	$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
+	$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING);
 }
 
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	$limit_start = 0;
 	$limit_end = 25;
@@ -48,12 +48,12 @@ 
 print '<br />';
 
 print '<div class="info column">';
-print '<h1>'.sprintf(_("Incidents from %s"),date("l F j, Y",strtotime($date))).'</h1>';
+print '<h1>'.sprintf(_("Incidents from %s"), date("l F j, Y", strtotime($date))).'</h1>';
 print '</div>';
 
 print '<div class="table column">';
-print '<p>'.sprintf(_("The table below shows the Incidents on <strong>%s</strong>."),date("l M j, Y",strtotime($date))).'</p>';
-$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference,'incident',$date);
+print '<p>'.sprintf(_("The table below shows the Incidents on <strong>%s</strong>."), date("l M j, Y", strtotime($date))).'</p>';
+$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference, 'incident', $date);
 //print_r($spotter_array);
 if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
 	include('table-output.php');

Braces +6 added lines, -2 removed lines

@@ -58,8 +58,12 @@
 if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
 	include('table-output.php');
 	print '<div class="pagination">';
-	if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
-	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
+	if ($limit_previous_1 >= 0) {
+		print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
+	}
+	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) {
+		print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
+	}
 	print '</div>';
 }
 print '</div>';

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
 		}
-	    }
+		}
+	}
 	}
-    }
 
 ?>