Ysurac / FlightAirMap

space-data.php

Spacing +6 added lines, -6 removed lines

@@ -7,7 +7,7 @@ 
 <button type="button" class="close">&times;</button>
 <?php
 
-$sat = filter_input(INPUT_GET,'sat',FILTER_SANITIZE_STRING);
+$sat = filter_input(INPUT_GET, 'sat', FILTER_SANITIZE_STRING);
 $sat = urldecode($sat);
 
 if ($sat == 'ISS (ZARYA)') {
@@ -42,7 +42,7 @@ 
 	$aircraft_name = 'INTEGRAL';
 //	$ground_speed = 14970;
 	$launch_date = '17 October 2002';
-} elseif (strpos($sat,'IRIDIUM') !== false) {
+} elseif (strpos($sat, 'IRIDIUM') !== false) {
 	$image = 'https://upload.wikimedia.org/wikipedia/commons/b/b6/Iridium_Satellite.jpg';
 	$image_copyright = 'Cliff';
 	$ident = 'Iridium satellite constellation';
@@ -50,22 +50,22 @@ 
 	$aircraft_name = $sat;
 //	$ground_speed = 14970;
 //	$launch_date = '29 september 2011';
-} elseif (strpos($sat,'ORBCOMM') !== false) {
+} elseif (strpos($sat, 'ORBCOMM') !== false) {
 	$ident = 'Orbcomm';
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/Orbcomm_(satellite)';
 	$aircraft_name = $sat;
-} elseif (strpos($sat,'GLOBALSTAR') !== false) {
+} elseif (strpos($sat, 'GLOBALSTAR') !== false) {
 	$ident = 'Globalstar';
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/Globalstar';
 	$aircraft_name = $sat;
-} elseif (strpos($sat,'OSCAR 7') !== false) {
+} elseif (strpos($sat, 'OSCAR 7') !== false) {
 	$image = 'https://upload.wikimedia.org/wikipedia/en/a/ad/AMSAT-OSCAR_7.jpg';
 	$image_copyright = 'Amsat.org';
 	$ident = 'AMSAT-OSCAR 7';
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/AMSAT-OSCAR_7';
 	$aircraft_name = $sat;
 	$launch_date = '15 November 1974';
-} elseif (strpos($sat,'santaclaus') !== false) {
+} elseif (strpos($sat, 'santaclaus') !== false) {
 	$image = 'https://upload.wikimedia.org/wikipedia/commons/4/49/Jonathan_G_Meath_portrays_Santa_Claus.jpg';
 	$image_copyright = 'Jonathan G Meath';
 	$ident = 'Santa Claus';

live-santa-czml.php

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",';
@@ -113,581 +113,581 @@ 
 */
 $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 .= ']}}';

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 .= '},';

live-santa-geojson.php

Spacing +2 added lines, -2 removed lines

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

Braces +5 added lines, -2 removed lines

@@ -22,8 +22,11 @@
 $j = 0;
 $prev_satname = '';
 $timearray = array();
-if (isset($_GET['now'])) $begin = time();
-else $begin = strtotime(date("Y").'-12-24T02:00:00Z');
+if (isset($_GET['now'])) {
+	$begin = time();
+} else {
+	$begin = strtotime(date("Y").'-12-24T02:00:00Z');
+}
 for ($i =0; $i <= 288; $i++) {
 	$timearray[] = ($begin + $i*300)*1000;
 }

statistics.php

Indentation +179 added lines, -179 removed lines

@@ -39,11 +39,11 @@ 
 		if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
 		print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
 	}
-    ?>
+	?>
     </div>
     <?php    
 	// print_r($Stats->getAllAirlineNames()); 
-    ?>
+	?>
     <?php include('statistics-sub-menu.php'); ?>
     <p class="global-stats">
         <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao,$filter_name)); ?></span> <?php echo _("Flights"); ?></span>
@@ -51,23 +51,23 @@ 
         <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name)); ?></span> <?php echo _("Arrivals seen"); ?></span>
         <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 	<?php
-	    if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
+		if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 	?>
     	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name)); ?></span> <?php echo _("Pilots"); ?></span>
 	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
         <?php
-    	    } else {
-    	?>
+			} else {
+		?>
     	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name)); ?></span> <?php echo _("Owners"); ?></span>
 	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
     	<?php
-    	    }
-    	?>
+			}
+		?>
         <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name)); ?></span> <?php echo _("Aircrafts"); ?></span>
         <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
         <?php
-    		if ($airline_icao == '') {
-    	?>
+			if ($airline_icao == '') {
+		?>
         <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name)); ?></span> <?php echo _("Airlines"); ?></span>
 	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 	<?php
@@ -88,25 +88,25 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
                  <?php
-                  $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name);
-		    if (count($aircraft_array) == 0) print _("No data available");
-		    else {
+				  $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name);
+			if (count($aircraft_array) == 0) print _("No data available");
+			else {
 
-                    print '<div id="chart1" class="chart" width="100%"></div>
+					print '<div id="chart1" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart1);
                       function drawChart1() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Aircraft").'", "'._("# of times").'"], ';
-                            $aircraft_data = '';
-                          foreach($aircraft_array as $aircraft_item)
-                                    {
-                                            $aircraft_data .= '[ "'.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
-                                    }
-                                    $aircraft_data = substr($aircraft_data, 0, -1);
-                                    print $aircraft_data;
-                        print ']);
+							$aircraft_data = '';
+						  foreach($aircraft_array as $aircraft_item)
+									{
+											$aircraft_data .= '[ "'.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
+									}
+									$aircraft_data = substr($aircraft_data, 0, -1);
+									print $aircraft_data;
+						print ']);
 
                         var options = {
                             chartArea: {"width": "80%", "height": "60%"},
@@ -121,8 +121,8 @@ 
                               drawChart1();
                             });
                   </script>';
-                  }
-                  ?>
+				  }
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/aircraft" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -130,26 +130,26 @@ 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
 //    echo $airline_icao;
-    if ($airline_icao == '' || $airline_icao == 'all') {
+	if ($airline_icao == '' || $airline_icao == 'all') {
 	$airline_array = $Stats->countAllAirlines(true,$filter_name);
 	if (count($airline_array) > 0) {
-            print '<div class="col-md-6">';
-	    print '<h2>'._("Top 10 Most Common Airline").'</h2>';
-	    print '<div id="chart2" class="chart" width="100%"></div>
+			print '<div class="col-md-6">';
+		print '<h2>'._("Top 10 Most Common Airline").'</h2>';
+		print '<div id="chart2" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart2);
                       function drawChart2() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Airline").'", "'._("# of times").'"], ';
-	    $airline_data = '';
-	    foreach($airline_array as $airline_item)
-	    {
+		$airline_data = '';
+		foreach($airline_array as $airline_item)
+		{
 		$airline_data .= '[ "'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],';
-	    }
-	    $airline_data = substr($airline_data, 0, -1);
-	    print $airline_data;
-	    print ']);
+		}
+		$airline_data = substr($airline_data, 0, -1);
+		print $airline_data;
+		print ']);
 
                         var options = {
                             chartArea: {"width": "80%", "height": "60%"},
@@ -164,23 +164,23 @@ 
                               drawChart2();
                             });
                   </script>';
-	    print '<div class="more"><a href="'.$globalURL.'/statistics/airline" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
-    	    print '</div>';
+		print '<div class="more"><a href="'.$globalURL.'/statistics/airline" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
+			print '</div>';
 	}
 ?>
         </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
-    }
+	}
 ?>
         <div class="row column">
 <?php
-    $flightover_array = $Stats->countAllFlightOverCountries($airline_icao,$filter_name);
-    if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
+	$flightover_array = $Stats->countAllFlightOverCountries($airline_icao,$filter_name);
+	if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 	if (empty($flightover_array)) {
-	    print '<div class="col-md-12">';
+		print '<div class="col-md-12">';
 	} else {
-            print '<div class="col-md-6">';
+			print '<div class="col-md-6">';
 	}
 ?>
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
@@ -188,21 +188,21 @@ 
 	$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name);
 	if (count($pilot_array) == 0) print _("No data available");
 	else {
-	    print '<div id="chart7" class="chart" width="100%"></div>
+		print '<div id="chart7" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart7);
                       function drawChart7() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Pilots").'", "'._("# of times").'"], ';
-	    $pilot_data = '';
-	    foreach($pilot_array as $pilot_item)
-	    {
+		$pilot_data = '';
+		foreach($pilot_array as $pilot_item)
+		{
 		$pilot_data .= '[ "'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
-	    }
-	    $pilot_data = substr($pilot_data, 0, -1);
-	    print $pilot_data;
-	    print ']);
+		}
+		$pilot_data = substr($pilot_data, 0, -1);
+		print $pilot_data;
+		print ']);
 
                         var options = {
                             chartArea: {"width": "80%", "height": "60%"},
@@ -217,7 +217,7 @@ 
                               drawChart7();
                             });
                   </script>';
-        }
+		}
 ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/pilot" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
@@ -226,7 +226,7 @@ 
         
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
-    } else {
+	} else {
 ?>
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
@@ -234,21 +234,21 @@ 
 	$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name);
 	if (count($owner_array) == 0) print _("No data available");
 	else {
-	    print '<div id="chart7" class="chart" width="100%"></div>
+		print '<div id="chart7" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart7);
                       function drawChart7() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Owner").'", "'._("# of times").'"], ';
-                            $owner_data = '';
-	    foreach($owner_array as $owner_item)
-	    {
+							$owner_data = '';
+		foreach($owner_array as $owner_item)
+		{
 		$owner_data .= '[ "'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
-	    }
-	    $owner_data = substr($owner_data, 0, -1);
-	    print $owner_data;
-	    print ']);
+		}
+		$owner_data = substr($owner_data, 0, -1);
+		print $owner_data;
+		print ']);
 
                         var options = {
                             chartArea: {"width": "80%", "height": "60%"},
@@ -272,8 +272,8 @@ 
         
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
-    }
-    if (!empty($flightover_array)) {
+	}
+	if (!empty($flightover_array)) {
 ?>
             <div class="col-md-6">
                 <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2>
@@ -281,21 +281,21 @@ 
 	 //$flightover_array = $Stats->countAllFlightOverCountries();
 	if (count($flightover_array) == 0) print _("No data available");
 	else {
-	    print '<div id="chart10" class="chart" width="100%"></div>
+		print '<div id="chart10" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart10);
                       function drawChart10() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Country").'", "'._("# of times").'"], ';
-                            $flightover_data = '';
-	    foreach($flightover_array as $flightover_item)
-	    {
+							$flightover_data = '';
+		foreach($flightover_array as $flightover_item)
+		{
 		$flightover_data .= '[ "'.$flightover_item['flight_country'].' ('.$flightover_item['flight_country_iso2'].')",'.$flightover_item['flight_count'].'],';
-	    }
-	    $flightover_data = substr($flightover_data, 0, -1);
-	    print $flightover_data;
-	    print ']);
+		}
+		$flightover_data = substr($flightover_data, 0, -1);
+		print $flightover_data;
+		print ']);
 
                         var options = {
                             chartArea: {"width": "80%", "height": "60%"},
@@ -319,7 +319,7 @@ 
                 </div>
             </div>
 <?php
-    }
+	}
 ?>
         </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -329,8 +329,8 @@ 
         <div class="row column">
             <div class="col-md-6">
 <?php
-    $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name);
-    if (count($airport_airport_array) > 0) {
+	$airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name);
+	if (count($airport_airport_array) > 0) {
 	print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>';
 	print '<div id="chart3" class="chart" width="100%"></div>
                 <script>
@@ -343,13 +343,13 @@ 
 
                 var data = google.visualization.arrayToDataTable([ 
                     ["'._("Airport").'", "'._("# of times").'"],';
-                    $airport_data = '';
+					$airport_data = '';
 	foreach($airport_airport_array as $airport_item)
 	{
-	    $name = $airport_item['airport_departure_city'].', '.$airport_item['airport_departure_country'].' ('.$airport_item['airport_departure_icao'].')';
-	    $name = str_replace("'", "", $name);
-	    $name = str_replace('"', "", $name);
-	    $airport_data .= '[ "'.$name.'",'.$airport_item['airport_departure_icao_count'].'],';
+		$name = $airport_item['airport_departure_city'].', '.$airport_item['airport_departure_country'].' ('.$airport_item['airport_departure_icao'].')';
+		$name = str_replace("'", "", $name);
+		$name = str_replace('"', "", $name);
+		$airport_data .= '[ "'.$name.'",'.$airport_item['airport_departure_icao_count'].'],';
 	}
 	$airport_data = substr($airport_data, 0, -1);
 	print $airport_data;
@@ -368,15 +368,15 @@ 
               }
                 </script>';
 	print '<div class="more"><a href="'.$globalURL.'/statistics/airport-departure" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
-    }
+	}
 ?>
             </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 
             <div class="col-md-6">
 <?php
-    $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name);
-    if (count($airport_airport_array2) > 0) {
+	$airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name);
+	if (count($airport_airport_array2) > 0) {
 	print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>';
 	print '<div id="chart4" class="chart" width="100%"></div>
                 <script>
@@ -392,9 +392,9 @@ 
 	$airport_data2 = '';
 	foreach($airport_airport_array2 as $airport_item2)
 	{
-	    $name2 = $airport_item2['airport_arrival_city'].', '.$airport_item2['airport_arrival_country'].' ('.$airport_item2['airport_arrival_icao'].')';
-	    $name2 = str_replace(array("'",'"'), '', $name2);
-	    $airport_data2 .= '[ "'.$name2.'",'.$airport_item2['airport_arrival_icao_count'].'],';
+		$name2 = $airport_item2['airport_arrival_city'].', '.$airport_item2['airport_arrival_country'].' ('.$airport_item2['airport_arrival_icao'].')';
+		$name2 = str_replace(array("'",'"'), '', $name2);
+		$airport_data2 .= '[ "'.$name2.'",'.$airport_item2['airport_arrival_icao_count'].'],';
 	}
 	$airport_data2 = substr($airport_data2, 0, -1);
 	print $airport_data2;
@@ -413,7 +413,7 @@ 
               }
                 </script>';
 	print '<div class="more"><a href="'.$globalURL.'/statistics/airport-arrival" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
-    }
+	}
 ?>
             </div>
         </div>
@@ -423,24 +423,24 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
                 <?php
-                  $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
-		    if (count($year_array) == 0) print _("No data available");
-		    else {
-                  print '<div id="chart8" class="chart" width="100%"></div>
+				  $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
+			if (count($year_array) == 0) print _("No data available");
+			else {
+				  print '<div id="chart8" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart8);
                       function drawChart8() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Month").'", "'._("# of Flights").'"], ';
-                            $year_data = '';
-                          foreach($year_array as $year_item)
-                                    {
-                                        $year_data .= '[ "'.date('F, Y',strtotime($year_item['year_name'].'-'.$year_item['month_name'].'-01')).'",'.$year_item['date_count'].'],';
-                                    }
-                                    $year_data = substr($year_data, 0, -1);
-                                    print $year_data;
-                        print ']);
+							$year_data = '';
+						  foreach($year_array as $year_item)
+									{
+										$year_data .= '[ "'.date('F, Y',strtotime($year_item['year_name'].'-'.$year_item['month_name'].'-01')).'",'.$year_item['date_count'].'],';
+									}
+									$year_data = substr($year_data, 0, -1);
+									print $year_data;
+						print ']);
 
                         var options = {
                             legend: {position: "none"},
@@ -458,8 +458,8 @@ 
                               drawChart8();
                             });
                   </script>';
-                  }
-                  ?>
+				  }
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -469,24 +469,24 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
                 <?php
-                  $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
-		    if (count($month_array) == 0) print _("No data available");
-		    else {
-                  print '<div id="chart9" class="chart" width="100%"></div>
+				  $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
+			if (count($month_array) == 0) print _("No data available");
+			else {
+				  print '<div id="chart9" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart9);
                       function drawChart9() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Day").'", "'._("# of Flights").'"], ';
-                            $month_data = '';
-                          foreach($month_array as $month_item)
-                                    {
-                                        $month_data .= '[ "'.date('F j, Y',strtotime($month_item['date_name'])).'",'.$month_item['date_count'].'],';
-                                    }
-                                    $month_data = substr($month_data, 0, -1);
-                                    print $month_data;
-                        print ']);
+							$month_data = '';
+						  foreach($month_array as $month_item)
+									{
+										$month_data .= '[ "'.date('F j, Y',strtotime($month_item['date_name'])).'",'.$month_item['date_count'].'],';
+									}
+									$month_data = substr($month_data, 0, -1);
+									print $month_data;
+						print ']);
 
                         var options = {
                             legend: {position: "none"},
@@ -504,8 +504,8 @@ 
                               drawChart9();
                             });
                   </script>';
-                  }
-                  ?>
+				  }
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -515,25 +515,25 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
                 <?php
-                    $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
-		    if (empty($date_array)) print _("No data available");
-		    else {
-                  print '<div id="chart5" class="chart" width="100%"></div>
+					$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
+			if (empty($date_array)) print _("No data available");
+			else {
+				  print '<div id="chart5" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart5);
                       function drawChart5() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Date").'", "'._("# of Flights").'"], ';
-                            $date_data = '';
+							$date_data = '';
                         
-                          foreach($date_array as $date_item)
-                                    {
-                                        $date_data .= '[ "'.date("F j, Y", strtotime($date_item['date_name'])).'",'.$date_item['date_count'].'],';
-                                    }
-                                    $date_data = substr($date_data, 0, -1);
-                                    print $date_data;
-                        print ']);
+						  foreach($date_array as $date_item)
+									{
+										$date_data .= '[ "'.date("F j, Y", strtotime($date_item['date_name'])).'",'.$date_item['date_count'].'],';
+									}
+									$date_data = substr($date_data, 0, -1);
+									print $date_data;
+						print ']);
 
                         var options = {
                             legend: {position: "none"},
@@ -551,8 +551,8 @@ 
                               drawChart5();
                             });
                   </script>';
-                  }
-                  ?>
+				  }
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -562,25 +562,25 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
                 <?php
-                  $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
-		    if (empty($hour_array)) print _("No data available");
-		    else {
+				  $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
+			if (empty($hour_array)) print _("No data available");
+			else {
 
-                  print '<div id="chart6" class="chart" width="100%"></div>
+				  print '<div id="chart6" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawChart6);
                       function drawChart6() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Hour").'", "'._("# of Flights").'"], ';
-                            $hour_data = '';
-                          foreach($hour_array as $hour_item)
-                                    {
-                                        $hour_data .= '[ "'.$hour_item['hour_name'].':00",'.$hour_item['hour_count'].'],';
-                                    }
-                                    $hour_data = substr($hour_data, 0, -1);
-                                    print $hour_data;
-                        print ']);
+							$hour_data = '';
+						  foreach($hour_array as $hour_item)
+									{
+										$hour_data .= '[ "'.$hour_item['hour_name'].':00",'.$hour_item['hour_count'].'],';
+									}
+									$hour_data = substr($hour_data, 0, -1);
+									print $hour_data;
+						print ']);
 
                         var options = {
                             legend: {position: "none"},
@@ -598,8 +598,8 @@ 
                               drawChart6();
                             });
                   </script>';
-                  }
-                ?>
+				  }
+				?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -607,21 +607,21 @@ 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
         </div>
 <?php
-    if (($airline_icao == '' || $airline_icao == 'all') && $filter_name == '') {
+	if (($airline_icao == '' || $airline_icao == 'all') && $filter_name == '') {
 ?>
         <div class="row column">
         	<?php
-        	    $polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
-        	    if (!empty($polar)) {
-            		print '<h2>'._("Coverage pattern").'</h2>';
-        		foreach ($polar as $eachpolar) {
-        		    unset($polar_data);
-	        	    $Spotter = new Spotter();
-        		    $data = json_decode($eachpolar['source_data']);
-        		    foreach($data as $value => $key) {
-        			$direction = $Spotter->parseDirection(($value*22.5));
-        			$distance = $key;
-        			$unit = 'km';
+				$polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
+				if (!empty($polar)) {
+					print '<h2>'._("Coverage pattern").'</h2>';
+				foreach ($polar as $eachpolar) {
+					unset($polar_data);
+					$Spotter = new Spotter();
+					$data = json_decode($eachpolar['source_data']);
+					foreach($data as $value => $key) {
+					$direction = $Spotter->parseDirection(($value*22.5));
+					$distance = $key;
+					$unit = 'km';
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
 					$distance = round($distance*0.539957);
 					$unit = 'nm';
@@ -632,10 +632,10 @@ 
 					$distance = $distance;
 					$unit = 'km';
 				}
-        			if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
-        	    		else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
-        		    }
-        	?>
+					if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+						else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+					}
+			?>
             <div class="col-md-6">
                 <h4><?php print $eachpolar['source_name']; ?></h4>
         	<div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
@@ -667,22 +667,22 @@ 
 		</script>
             </div>
             <?php
-        	    }
-        	}
-            ?>
+				}
+			}
+			?>
         </div>
         <div class="row column">
             <div class="col-md-6">
         	<?php
-        	    $msg = $Stats->getStatsSource(date('Y-m-d'),'msg');
-        	    if (!empty($msg)) {
-            		print '<h2>'._("Messages received").'</h2>';
-        		foreach ($msg as $eachmsg) {
-        		    //$eachmsg = $msg[0];
-        		    $data = $eachmsg['source_data'];
-        		    if ($data > 500) $max = (round(($data+100)/100))*100;
-        		    else $max = 500;
-        	?>
+				$msg = $Stats->getStatsSource(date('Y-m-d'),'msg');
+				if (!empty($msg)) {
+					print '<h2>'._("Messages received").'</h2>';
+				foreach ($msg as $eachmsg) {
+					//$eachmsg = $msg[0];
+					$data = $eachmsg['source_data'];
+					if ($data > 500) $max = (round(($data+100)/100))*100;
+					else $max = 500;
+			?>
         	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
         	<script>
 		      var g = new JustGage({
@@ -698,9 +698,9 @@ 
 			  });
 		</script>
             <?php
-        	   }
-        	}
-            ?>
+			   }
+			}
+			?>
             </div>
         </div>
         <div class="row column">
@@ -727,19 +727,19 @@ 
 				$hist_data .= '[ "'.$distance.'",'.$nb.'],';
 			}
 			$hist_data = substr($hist_data, 0, -1);
-            ?>
+			?>
             <div class="col-md-6">
                 <h2><?php echo sprintf(_("Flights Distance for %s"),$source); ?></h2>
                 <?php
-                  print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div>
+				  print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
                       google.setOnLoadCallback(drawCharthist_'.str_replace(' ','_',strtolower($source)).');
                       function drawCharthist_'.str_replace(' ','_',strtolower($source)).'() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Distance").'", "'._("# of Flights").'"], ';
-                            print $hist_data;
-                        print ']);
+							print $hist_data;
+						print ']);
 
                         var options = {
                             legend: {position: "none"},
@@ -757,15 +757,15 @@ 
                               drawCharthist_'.str_replace(' ','_',strtolower($source)).'();
                             });
                   </script>';
-        	?>
+			?>
     	    </div>
 	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
         	<?php
-                  }
-                ?>
+				  }
+				?>
         </div>
 <?php
-    }
+	}
 ?>
     </div>
 </div>  

Braces +44 added lines, -24 removed lines

@@ -6,7 +6,9 @@ 
 $Stats = new Stats();
 $title = _("Statistics");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
 	unset($_COOKIE['stats_airline_icao']);
@@ -15,8 +17,10 @@ 
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
 	$airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+	if (isset($globalFilter['airline'])) {
+		$airline_icao = $globalFilter['airline'][0];
+	}
+	}
 setcookie('stats_airline_icao',$airline_icao);
 require_once('header.php');
 
@@ -36,7 +40,9 @@ 
 	if (isset($last_update[0]['value'])) {
 		date_default_timezone_set('UTC');
 		$lastupdate = strtotime($last_update[0]['value']);
-		if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
+		if (isset($globalTimezone) && $globalTimezone != '') {
+			date_default_timezone_set($globalTimezone);
+		}
 		print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
 	}
     ?>
@@ -89,8 +95,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
                  <?php
                   $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name);
-		    if (count($aircraft_array) == 0) print _("No data available");
-		    else {
+		    if (count($aircraft_array) == 0) {
+		    	print _("No data available");
+		    } else {
 
                     print '<div id="chart1" class="chart" width="100%"></div>
                     <script> 
@@ -186,8 +193,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
 <?php
 	$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name);
-	if (count($pilot_array) == 0) print _("No data available");
-	else {
+	if (count($pilot_array) == 0) {
+		print _("No data available");
+	} else {
 	    print '<div id="chart7" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -232,8 +240,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
 <?php
 	$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name);
-	if (count($owner_array) == 0) print _("No data available");
-	else {
+	if (count($owner_array) == 0) {
+		print _("No data available");
+	} else {
 	    print '<div id="chart7" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -279,8 +288,9 @@ 
                 <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2>
 <?php
 	 //$flightover_array = $Stats->countAllFlightOverCountries();
-	if (count($flightover_array) == 0) print _("No data available");
-	else {
+	if (count($flightover_array) == 0) {
+		print _("No data available");
+	} else {
 	    print '<div id="chart10" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -424,8 +434,9 @@ 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
                 <?php
                   $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
-		    if (count($year_array) == 0) print _("No data available");
-		    else {
+		    if (count($year_array) == 0) {
+		    	print _("No data available");
+		    } else {
                   print '<div id="chart8" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -470,8 +481,9 @@ 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
                 <?php
                   $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
-		    if (count($month_array) == 0) print _("No data available");
-		    else {
+		    if (count($month_array) == 0) {
+		    	print _("No data available");
+		    } else {
                   print '<div id="chart9" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -516,8 +528,9 @@ 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
                 <?php
                     $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
-		    if (empty($date_array)) print _("No data available");
-		    else {
+		    if (empty($date_array)) {
+		    	print _("No data available");
+		    } else {
                   print '<div id="chart5" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -563,8 +576,9 @@ 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
                 <?php
                   $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
-		    if (empty($hour_array)) print _("No data available");
-		    else {
+		    if (empty($hour_array)) {
+		    	print _("No data available");
+		    } else {
 
                   print '<div id="chart6" class="chart" width="100%"></div>
                     <script> 
@@ -632,8 +646,11 @@ 
 					$distance = $distance;
 					$unit = 'km';
 				}
-        			if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
-        	    		else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+        			if (!isset($polar_data)) {
+        				$polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+        			} else {
+        	    			$polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+        	    		}
         		    }
         	?>
             <div class="col-md-6">
@@ -680,8 +697,11 @@ 
         		foreach ($msg as $eachmsg) {
         		    //$eachmsg = $msg[0];
         		    $data = $eachmsg['source_data'];
-        		    if ($data > 500) $max = (round(($data+100)/100))*100;
-        		    else $max = 500;
+        		    if ($data > 500) {
+        		    	$max = (round(($data+100)/100))*100;
+        		    } else {
+        		    	$max = 500;
+        		    }
         	?>
         	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
         	<script>

Spacing +70 added lines, -70 removed lines

@@ -7,17 +7,17 @@ 
 $title = _("Statistics");
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
 	unset($_COOKIE['stats_airline_icao']);
-	setcookie('stats_airline_icao', '', time()-3600);
+	setcookie('stats_airline_icao', '', time() - 3600);
 	$airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
 	$airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
 	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
-setcookie('stats_airline_icao',$airline_icao);
+setcookie('stats_airline_icao', $airline_icao);
 require_once('header.php');
 
 ?>
@@ -37,7 +37,7 @@ 
 		date_default_timezone_set('UTC');
 		$lastupdate = strtotime($last_update[0]['value']);
 		if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
-		print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
+		print '<i>Last update: '.date('Y-m-d G:i:s', $lastupdate).'</i>';
 	}
     ?>
     </div>
@@ -46,30 +46,30 @@ 
     ?>
     <?php include('statistics-sub-menu.php'); ?>
     <p class="global-stats">
-        <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao,$filter_name)); ?></span> <?php echo _("Flights"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
-        <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name)); ?></span> <?php echo _("Arrivals seen"); ?></span>
-        <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao, $filter_name)); ?></span> <?php echo _("Flights"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao, $filter_name)); ?></span> <?php echo _("Arrivals seen"); ?></span>
+        <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 	<?php
 	    if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 	?>
-    	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name)); ?></span> <?php echo _("Pilots"); ?></span>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao, $filter_name)); ?></span> <?php echo _("Pilots"); ?></span>
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         <?php
     	    } else {
     	?>
-    	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name)); ?></span> <?php echo _("Owners"); ?></span>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao, $filter_name)); ?></span> <?php echo _("Owners"); ?></span>
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
     	<?php
     	    }
     	?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name)); ?></span> <?php echo _("Aircrafts types"); ?></span>
-        <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao, $filter_name)); ?></span> <?php echo _("Aircrafts types"); ?></span>
+        <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         <?php
     		if ($airline_icao == '') {
     	?>
         <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name)); ?></span> <?php echo _("Airlines"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 	<?php
 		}
 	?>
@@ -77,18 +77,18 @@ 
 		if (!(isset($globalIVAO) && $globalIVAO) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalphpVMS) && $globalphpVMS)) {
 	?>
         <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name)); ?></span> <?php echo _("Military"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 	<?php
 		}
 	?>
     </p>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
     <div class="specific-stats">
         <div class="row column">
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
                  <?php
-                  $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name);
+                  $aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name);
 		    if (count($aircraft_array) == 0) print _("No data available");
 		    else {
 
@@ -100,7 +100,7 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Aircraft").'", "'._("# of times").'"], ';
                             $aircraft_data = '';
-                          foreach($aircraft_array as $aircraft_item)
+                          foreach ($aircraft_array as $aircraft_item)
                                     {
                                             $aircraft_data .= '[ "'.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
                                     }
@@ -127,11 +127,11 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/aircraft" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 //    echo $airline_icao;
     if ($airline_icao == '' || $airline_icao == 'all') {
-	$airline_array = $Stats->countAllAirlines(true,$filter_name);
+	$airline_array = $Stats->countAllAirlines(true, $filter_name);
 	if (count($airline_array) > 0) {
             print '<div class="col-md-6">';
 	    print '<h2>'._("Top 10 Most Common Airline").'</h2>';
@@ -143,7 +143,7 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Airline").'", "'._("# of times").'"], ';
 	    $airline_data = '';
-	    foreach($airline_array as $airline_item)
+	    foreach ($airline_array as $airline_item)
 	    {
 		$airline_data .= '[ "'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],';
 	    }
@@ -169,13 +169,13 @@ 
 	}
 ?>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
     }
 ?>
         <div class="row column">
 <?php
-    $flightover_array = $Stats->countAllFlightOverCountries($airline_icao,$filter_name);
+    $flightover_array = $Stats->countAllFlightOverCountries($airline_icao, $filter_name);
     if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 	if (empty($flightover_array)) {
 	    print '<div class="col-md-12">';
@@ -185,7 +185,7 @@ 
 ?>
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
 <?php
-	$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name);
+	$pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name);
 	if (count($pilot_array) == 0) print _("No data available");
 	else {
 	    print '<div id="chart7" class="chart" width="100%"></div>
@@ -196,7 +196,7 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Pilots").'", "'._("# of times").'"], ';
 	    $pilot_data = '';
-	    foreach($pilot_array as $pilot_item)
+	    foreach ($pilot_array as $pilot_item)
 	    {
 		$pilot_data .= '[ "'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
 	    }
@@ -224,14 +224,14 @@ 
                 </div>
             </div>
         
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
     } else {
 ?>
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
 <?php
-	$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name);
+	$owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name);
 	if (count($owner_array) == 0) print _("No data available");
 	else {
 	    print '<div id="chart7" class="chart" width="100%"></div>
@@ -242,7 +242,7 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Owner").'", "'._("# of times").'"], ';
                             $owner_data = '';
-	    foreach($owner_array as $owner_item)
+	    foreach ($owner_array as $owner_item)
 	    {
 		$owner_data .= '[ "'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
 	    }
@@ -270,7 +270,7 @@ 
                 </div>
             </div>
         
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
     }
     if (!empty($flightover_array)) {
@@ -289,7 +289,7 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Country").'", "'._("# of times").'"], ';
                             $flightover_data = '';
-	    foreach($flightover_array as $flightover_item)
+	    foreach ($flightover_array as $flightover_item)
 	    {
 		$flightover_data .= '[ "'.$flightover_item['flight_country'].' ('.$flightover_item['flight_country_iso2'].')",'.$flightover_item['flight_count'].'],';
 	    }
@@ -322,14 +322,14 @@ 
     }
 ?>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
     	
         </div>
         <div class="row column">
             <div class="col-md-6">
 <?php
-    $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name);
+    $airport_airport_array = $Stats->countAllDepartureAirports(true, $airline_icao, $filter_name);
     if (count($airport_airport_array) > 0) {
 	print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>';
 	print '<div id="chart3" class="chart" width="100%"></div>
@@ -344,7 +344,7 @@ 
                 var data = google.visualization.arrayToDataTable([ 
                     ["'._("Airport").'", "'._("# of times").'"],';
                     $airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 	    $name = $airport_item['airport_departure_city'].', '.$airport_item['airport_departure_country'].' ('.$airport_item['airport_departure_icao'].')';
 	    $name = str_replace("'", "", $name);
@@ -371,11 +371,11 @@ 
     }
 ?>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
 <?php
-    $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name);
+    $airport_airport_array2 = $Stats->countAllArrivalAirports(true, $airline_icao, $filter_name);
     if (count($airport_airport_array2) > 0) {
 	print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>';
 	print '<div id="chart4" class="chart" width="100%"></div>
@@ -390,10 +390,10 @@ 
                 var data = google.visualization.arrayToDataTable([ 
                     ["'._("Airport").'", "'._("# of times").'"],';
 	$airport_data2 = '';
-	foreach($airport_airport_array2 as $airport_item2)
+	foreach ($airport_airport_array2 as $airport_item2)
 	{
 	    $name2 = $airport_item2['airport_arrival_city'].', '.$airport_item2['airport_arrival_country'].' ('.$airport_item2['airport_arrival_icao'].')';
-	    $name2 = str_replace(array("'",'"'), '', $name2);
+	    $name2 = str_replace(array("'", '"'), '', $name2);
 	    $airport_data2 .= '[ "'.$name2.'",'.$airport_item2['airport_arrival_icao_count'].'],';
 	}
 	$airport_data2 = substr($airport_data2, 0, -1);
@@ -417,13 +417,13 @@ 
 ?>
             </div>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
         <div class="row column">
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
                 <?php
-                  $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
+                  $year_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name);
 		    if (count($year_array) == 0) print _("No data available");
 		    else {
                   print '<div id="chart8" class="chart" width="100%"></div>
@@ -434,9 +434,9 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Month").'", "'._("# of Flights").'"], ';
                             $year_data = '';
-                          foreach($year_array as $year_item)
+                          foreach ($year_array as $year_item)
                                     {
-                                        $year_data .= '[ "'.date('F, Y',strtotime($year_item['year_name'].'-'.$year_item['month_name'].'-01')).'",'.$year_item['date_count'].'],';
+                                        $year_data .= '[ "'.date('F, Y', strtotime($year_item['year_name'].'-'.$year_item['month_name'].'-01')).'",'.$year_item['date_count'].'],';
                                     }
                                     $year_data = substr($year_data, 0, -1);
                                     print $year_data;
@@ -464,12 +464,12 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
                 <?php
-                  $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
+                  $month_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name);
 		    if (count($month_array) == 0) print _("No data available");
 		    else {
                   print '<div id="chart9" class="chart" width="100%"></div>
@@ -480,9 +480,9 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Day").'", "'._("# of Flights").'"], ';
                             $month_data = '';
-                          foreach($month_array as $month_item)
+                          foreach ($month_array as $month_item)
                                     {
-                                        $month_data .= '[ "'.date('F j, Y',strtotime($month_item['date_name'])).'",'.$month_item['date_count'].'],';
+                                        $month_data .= '[ "'.date('F j, Y', strtotime($month_item['date_name'])).'",'.$month_item['date_count'].'],';
                                     }
                                     $month_data = substr($month_data, 0, -1);
                                     print $month_data;
@@ -510,12 +510,12 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
                 <?php
-                    $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
+                    $date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name);
 		    if (empty($date_array)) print _("No data available");
 		    else {
                   print '<div id="chart5" class="chart" width="100%"></div>
@@ -527,7 +527,7 @@ 
                             ["'._("Date").'", "'._("# of Flights").'"], ';
                             $date_data = '';
                         
-                          foreach($date_array as $date_item)
+                          foreach ($date_array as $date_item)
                                     {
                                         $date_data .= '[ "'.date("F j, Y", strtotime($date_item['date_name'])).'",'.$date_item['date_count'].'],';
                                     }
@@ -557,12 +557,12 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
                 <?php
-                  $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
+                  $hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name);
 		    if (empty($hour_array)) print _("No data available");
 		    else {
 
@@ -574,7 +574,7 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Hour").'", "'._("# of Flights").'"], ';
                             $hour_data = '';
-                          foreach($hour_array as $hour_item)
+                          foreach ($hour_array as $hour_item)
                                     {
                                         $hour_data .= '[ "'.$hour_item['hour_name'].':00",'.$hour_item['hour_count'].'],';
                                     }
@@ -604,21 +604,21 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
     if (($airline_icao == '' || $airline_icao == 'all') && $filter_name == '') {
 ?>
         <div class="row column">
         	<?php
-        	    $polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
+        	    $polar = $Stats->getStatsSource(date('Y-m-d'), 'polar');
         	    if (!empty($polar)) {
             		print '<h2>'._("Coverage pattern").'</h2>';
         		foreach ($polar as $eachpolar) {
         		    unset($polar_data);
 	        	    $Spotter = new Spotter();
         		    $data = json_decode($eachpolar['source_data']);
-        		    foreach($data as $value => $key) {
+        		    foreach ($data as $value => $key) {
         			$direction = $Spotter->parseDirection(($value*22.5));
         			$distance = $key;
         			$unit = 'km';
@@ -638,7 +638,7 @@ 
         	?>
             <div class="col-md-6">
                 <h4><?php print $eachpolar['source_name']; ?></h4>
-        	<div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
+        	<div id="polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
         	<script>
         	    (function() {
         	    var margin = {top: 100, right: 100, bottom: 100, left: 100},
@@ -662,7 +662,7 @@ 
 		      color: color,
 		      unit: '<?php echo $unit; ?>'
 		    };
-		    RadarChart("#polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions);
+		    RadarChart("#polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions);
 		    })();
 		</script>
             </div>
@@ -674,19 +674,19 @@ 
         <div class="row column">
             <div class="col-md-6">
         	<?php
-        	    $msg = $Stats->getStatsSource(date('Y-m-d'),'msg');
+        	    $msg = $Stats->getStatsSource(date('Y-m-d'), 'msg');
         	    if (!empty($msg)) {
             		print '<h2>'._("Messages received").'</h2>';
         		foreach ($msg as $eachmsg) {
         		    //$eachmsg = $msg[0];
         		    $data = $eachmsg['source_data'];
-        		    if ($data > 500) $max = (round(($data+100)/100))*100;
+        		    if ($data > 500) $max = (round(($data + 100)/100))*100;
         		    else $max = 500;
         	?>
-        	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
+        	<div id="msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
         	<script>
 		      var g = new JustGage({
-			    id: "msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>",
+			    id: "msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>",
 			    value: <?php echo $data; ?>,
 			    min: 0,
 			    max: <?php print $max; ?>,
@@ -706,12 +706,12 @@ 
         <div class="row column">
 
             <?php
-		$hist = $Stats->getStatsSource(date('Y-m-d'),'hist');
+		$hist = $Stats->getStatsSource(date('Y-m-d'), 'hist');
 		foreach ($hist as $hists) {
 			$hist_data = '';
 			$source = $hists['source_name'];
 			$hist_array = json_decode($hists['source_data']);
-			foreach($hist_array as $distance => $nb)
+			foreach ($hist_array as $distance => $nb)
 			{
 				$unit = 'km';
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
@@ -729,13 +729,13 @@ 
 			$hist_data = substr($hist_data, 0, -1);
             ?>
             <div class="col-md-6">
-                <h2><?php echo sprintf(_("Flights Distance for %s"),$source); ?></h2>
+                <h2><?php echo sprintf(_("Flights Distance for %s"), $source); ?></h2>
                 <?php
-                  print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div>
+                  print '<div id="charthist-'.str_replace(' ', '_', strtolower($source)).'" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
-                      google.setOnLoadCallback(drawCharthist_'.str_replace(' ','_',strtolower($source)).');
-                      function drawCharthist_'.str_replace(' ','_',strtolower($source)).'() {
+                      google.setOnLoadCallback(drawCharthist_'.str_replace(' ', '_', strtolower($source)).');
+                      function drawCharthist_'.str_replace(' ', '_', strtolower($source)).'() {
                         var data = google.visualization.arrayToDataTable([
                             ["'._("Distance").'", "'._("# of Flights").'"], ';
                             print $hist_data;
@@ -750,16 +750,16 @@ 
                             colors: ["#1a3151"]
                         };
 
-                        var chart = new google.visualization.AreaChart(document.getElementById("charthist-'.str_replace(' ','_',strtolower($source)).'"));
+                        var chart = new google.visualization.AreaChart(document.getElementById("charthist-'.str_replace(' ', '_', strtolower($source)).'"));
                         chart.draw(data, options);
                       }
                       $(window).resize(function(){
-                              drawCharthist_'.str_replace(' ','_',strtolower($source)).'();
+                              drawCharthist_'.str_replace(' ', '_', strtolower($source)).'();
                             });
                   </script>';
         	?>
     	    </div>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         	<?php
                   }
                 ?>

live-geojson.php

Indentation +33 added lines, -33 removed lines

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

Spacing +32 added lines, -32 removed lines

@@ -25,22 +25,22 @@ 
 $min = false;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',', $_COOKIE['filter_Airlines']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',', $_COOKIE['filter_Sources']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'], FILTER_SANITIZE_STRING);
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
 }
 
 if (isset($_GET['ident'])) {
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	$spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident);
 	if (empty($spotter_array)) {
 		$from_archive = true;
@@ -48,7 +48,7 @@ 
 	}
 	$allhistory = true;
 } elseif (isset($_GET['flightaware_id'])) {
-	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+	$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
 	if (empty($spotter_array)) {
 		$from_archive = true;
@@ -57,25 +57,25 @@ 
 	$allhistory = true;
 } elseif (isset($_GET['coord']) && (!isset($globalMapPopup) || $globalMapPopup || (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true'))) {
 //if (isset($_GET['coord'])) {
-	$coord = explode(',',$_GET['coord']);
-	$spotter_array = $SpotterLive->getLiveSpotterDatabyCoord($coord,$filter);
+	$coord = explode(',', $_GET['coord']);
+	$spotter_array = $SpotterLive->getLiveSpotterDatabyCoord($coord, $filter);
 
 #} elseif (isset($globalMapPopup) && !$globalMapPopup) {
 } elseif (isset($_GET['archive']) && isset($_GET['begindate']) && isset($_GET['enddate']) && isset($_GET['speed'])) {
 	$from_archive = true;
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
 //	$enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
-	$begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
-	$enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
-	$archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
-	$begindate = date('Y-m-d H:i:s',$begindate);
-	$enddate = date('Y-m-d H:i:s',$enddate);
-	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
+	$begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
+	$enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
+	$archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
+	$begindate = date('Y-m-d H:i:s', $begindate);
+	$enddate = date('Y-m-d H:i:s', $enddate);
+	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
 } elseif ($min) {
 	$spotter_array = $SpotterLive->getMinLiveSpotterData($filter);
 #	$min = true;
 } else {
-	$spotter_array = $SpotterLive->getLiveSpotterData('','',$filter);
+	$spotter_array = $SpotterLive->getLiveSpotterData('', '', $filter);
 }
 
 if (!empty($spotter_array)) {
@@ -90,7 +90,7 @@ 
 	if ($flightcnt == '') $flightcnt = 0;
 } else $flightcnt = 0;
 
-$sqltime = round(microtime(true)-$begintime,2);
+$sqltime = round(microtime(true) - $begintime, 2);
 
 if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) $usenextlatlon = false;
 else $usenextlatlon = true;
@@ -107,7 +107,7 @@ 
 		if (!empty($spotter_array) && is_array($spotter_array))
 		{
 			$output .= '"features": [';
-			foreach($spotter_array as $spotter_item)
+			foreach ($spotter_array as $spotter_item)
 			{
 				$j++;
 				date_default_timezone_set('UTC');
@@ -158,7 +158,7 @@ 
 						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
-							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
+							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ', '_', $spotter_item['aircraft_name'])).'",';
 						} elseif (isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "NA ('.$spotter_item['aircraft_type'].')",';
 						} elseif (!$min) {
@@ -227,16 +227,16 @@ 
 						else $output .= '"heading": "'.$spotter_item['heading'].'",';
 						
 						if (isset($archivespeed)) {
-							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading'], $archivespeed);
 							$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 						} elseif ($usenextlatlon) {
-							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading']);
 							$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 						}
 
 						if (!$min) $output .= '"image": "'.$image.'",';
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
-							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
+							$output .= '"image_copyright": "'.str_replace('"', "'", trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $spotter_item['image_copyright']))).'",';
 						}
 						if (isset($spotter_item['image_source_website'])) {
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
@@ -258,7 +258,7 @@ 
 							$output .= '"waypoints": "'.$spotter_item['waypoints'].'",';
 						}
 						if (isset($spotter_item['acars'])) {
-							$output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",';
+							$output .= '"acars": "'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br />', $spotter_item['acars']['message'])).'",';
 						}
 						// type when not aircraft ?
 						if ($compress) $output .= '"t": "aircraft"';
@@ -328,7 +328,7 @@ 
                 
 			}
 */
-				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
+				$history = filter_input(INPUT_GET, 'history', FILTER_SANITIZE_STRING);
 				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
 				
 				if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
@@ -355,9 +355,9 @@ 
 					    else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
 					}
 					$output_history .= '[';
-					$output_history .=  $spotter_history['longitude'].', ';
-					$output_history .=  $spotter_history['latitude'].', ';
-					$output_history .=  $spotter_history['altitude']*30.48;
+					$output_history .= $spotter_history['longitude'].', ';
+					$output_history .= $spotter_history['latitude'].', ';
+					$output_history .= $spotter_history['altitude']*30.48;
 					$output_history .= '],';
 					$prev_alt = $alt;
 				    //}
@@ -397,7 +397,7 @@ 
 			$output  = substr($output, 0, -1);
 			$output .= ']';
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
-			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
+			$output .= '"totaltime": "'.round(microtime(true) - $begintime, 2).'",';
 			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
 			$output .= '"fc": "'.$j.'"';
 		} else {

Braces +139 added lines, -54 removed lines

@@ -18,26 +18,49 @@ 
 }
 header('Content-Type: text/javascript');
 
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 
 $from_archive = false;
 $min = true;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('sbs'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
+}
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') {
+	$filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') {
+	$filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') {
+	$filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') {
+	$filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
+}
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
-} else $min = false;
+} else {
+	$min = false;
+}
 
 if (isset($_GET['ident'])) {
 	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
@@ -87,20 +110,30 @@ 
 	}
 */
 	$flightcnt = count($spotter_array);
-	if ($flightcnt == '') $flightcnt = 0;
-} else $flightcnt = 0;
+	if ($flightcnt == '') {
+		$flightcnt = 0;
+	}
+	} else {
+	$flightcnt = 0;
+}
 
 $sqltime = round(microtime(true)-$begintime,2);
 
-if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) $usenextlatlon = false;
-else $usenextlatlon = true;
+if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) {
+	$usenextlatlon = false;
+} else {
+	$usenextlatlon = true;
+}
 $j = 0;
 $prev_flightaware_id = '';
 $aircrafts_shadow = array();
 $output = '{';
 	$output .= '"type": "FeatureCollection",';
-		if ($min) $output .= '"minimal": "true",';
-		else $output .= '"minimal": "false",';
+		if ($min) {
+			$output .= '"minimal": "true",';
+		} else {
+			$output .= '"minimal": "false",';
+		}
 		$output .= '"fc": "'.$flightcnt.'",';
 		$output .= '"sqt": "'.$sqltime.'",';
 
@@ -137,11 +170,16 @@ 
 						//$output .= '"sqt": "'.$sqltime.'",';
 						$output .= '"id": "'.$spotter_item['flightaware_id'].'",';
 						$output .= '"properties": {';
-							if ($compress) $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
-							else $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
+							if ($compress) {
+								$output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
+							} else {
+								$output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
+							}
 							$output .= '"fc": "'.$flightcnt.'",';
 							$output .= '"sqt": "'.$sqltime.'",';
-							if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
+							if (isset($begindate)) {
+								$output .= '"archive_date": "'.$begindate.'",';
+							}
 
 /*
 							if ($min) $output .= '"minimal": "true",';
@@ -149,13 +187,21 @@ 
 */
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
-							if ($compress) $output .= '"c": "'.$spotter_item['ident'].'",';
-							else $output .= '"callsign": "'.$spotter_item['ident'].'",';
+							if ($compress) {
+								$output .= '"c": "'.$spotter_item['ident'].'",';
+							} else {
+								$output .= '"callsign": "'.$spotter_item['ident'].'",';
+							}
 						} else {
-							if ($compress) $output .= '"c": "NA",';
-							else $output .= '"callsign": "NA",';
+							if ($compress) {
+								$output .= '"c": "NA",';
+							} else {
+								$output .= '"callsign": "NA",';
+							}
+						}
+						if (isset($spotter_item['registration'])) {
+							$output .= '"registration": "'.$spotter_item['registration'].'",';
 						}
-						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
 							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
@@ -168,25 +214,37 @@ 
 							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
 						}
 						if (!isset($spotter_item['aircraft_shadow'])) {
-							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = '';
-							else {
+							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') {
+								$spotter_item['aircraft_shadow'] = '';
+							} else {
 								$aircraft_icao = $spotter_item['aircraft_icao'];
-								if (isset($aircrafts_shadow[$aircraft_icao])) $spotter_item['aircraft_shadow'] = $aircrafts_shadow[$aircraft_icao];
-								else {
+								if (isset($aircrafts_shadow[$aircraft_icao])) {
+									$spotter_item['aircraft_shadow'] = $aircrafts_shadow[$aircraft_icao];
+								} else {
 									$aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']);
-									if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
-									elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') $spotter_item['aircraft_shadow'] = 'PA18.png';
-									else $spotter_item['aircraft_shadow'] = '';
+									if (count($aircraft_info) > 0) {
+										$spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
+									} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
+										$spotter_item['aircraft_shadow'] = 'PA18.png';
+									} else {
+										$spotter_item['aircraft_shadow'] = '';
+									}
 									$aircrafts_shadow[$aircraft_icao] = $spotter_item['aircraft_shadow'];
 								}
 							}
 						}
 						if ($spotter_item['aircraft_shadow'] == '') {
-							if ($compress) $output .= '"as": "default.png",';
-							else $output .= '"aircraft_shadow": "default.png",';
+							if ($compress) {
+								$output .= '"as": "default.png",';
+							} else {
+								$output .= '"aircraft_shadow": "default.png",';
+							}
 						} else {
-							if ($compress) $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
-							else $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
+							if ($compress) {
+								$output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
+							} else {
+								$output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
+							}
 						}
 						if (isset($spotter_item['airline_name'])) {
 							$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
@@ -194,8 +252,11 @@ 
 							$output .= '"airline_name": "NA",';
 						}
 						if (isset($spotter_item['departure_airport'])) {
-							if ($compress) $output .= '"dac": "'.$spotter_item['departure_airport'].'",';
-							else $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
+							if ($compress) {
+								$output .= '"dac": "'.$spotter_item['departure_airport'].'",';
+							} else {
+								$output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
+							}
 						}
 						if (isset($spotter_item['departure_airport_city'])) {
 							$output .= '"departure_airport": "'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_country'].'",';
@@ -207,8 +268,11 @@ 
 							$output .= '"arrival_airport_time": "'.$spotter_item['arrival_airport_time'].'",';
 						}
 						if (isset($spotter_item['arrival_airport'])) {
-							if ($compress) $output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
-							else $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
+							if ($compress) {
+								$output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
+							} else {
+								$output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
+							}
 						}
 						if (isset($spotter_item['arrival_airport_city'])) {
 							$output .= '"arrival_airport": "'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].'",';
@@ -226,10 +290,16 @@ 
 							$output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
 						}
 						
-						if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",';
-						else $output .= '"altitude": "'.$spotter_item['altitude'].'",';
-						if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
-						else $output .= '"heading": "'.$spotter_item['heading'].'",';
+						if ($compress) {
+							$output .= '"a": "'.$spotter_item['altitude'].'",';
+						} else {
+							$output .= '"altitude": "'.$spotter_item['altitude'].'",';
+						}
+						if ($compress) {
+							$output .= '"h": "'.$spotter_item['heading'].'",';
+						} else {
+							$output .= '"heading": "'.$spotter_item['heading'].'",';
+						}
 						
 						if (isset($archivespeed)) {
 							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
@@ -239,7 +309,9 @@ 
 							$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 						}
 
-						if (!$min) $output .= '"image": "'.$image.'",';
+						if (!$min) {
+							$output .= '"image": "'.$image.'",';
+						}
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
 							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
 						}
@@ -247,8 +319,11 @@ 
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
 						}
 						if (isset($spotter_item['squawk'])) {
-							if ($compress) $output .= '"sq": "'.$spotter_item['squawk'].'",';
-							else $output .= '"squawk": "'.$spotter_item['squawk'].'",';
+							if ($compress) {
+								$output .= '"sq": "'.$spotter_item['squawk'].'",';
+							} else {
+								$output .= '"squawk": "'.$spotter_item['squawk'].'",';
+							}
 						}
 						if (isset($spotter_item['squawk_usage'])) {
 							$output .= '"squawk_usage": "'.$spotter_item['squawk_usage'].'",';
@@ -266,8 +341,11 @@ 
 							$output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",';
 						}
 						// type when not aircraft ?
-						if ($compress) $output .= '"t": "aircraft"';
-						else $output .= '"type": "aircraft"';
+						if ($compress) {
+							$output .= '"t": "aircraft"';
+						} else {
+							$output .= '"type": "aircraft"';
+						}
 						$output .= '},';
 						$output .= '"geometry": {';
 							$output .= '"type": "Point",';
@@ -334,7 +412,9 @@ 
 			}
 */
 				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
-				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
+				if ($history == '' && isset($_COOKIE['history'])) {
+					$history = $_COOKIE['history'];
+				}
 				
 				if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
 				|| (!isset($_COOKIE['flightpath']) 
@@ -356,8 +436,11 @@ 
 						$output_history .= ']}},';
 						$output .= $output_history;
 					    }
-					    if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
-					    else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
+					    if ($compress) {
+					    	$output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
+					    } else {
+					    	$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
+					    }
 					}
 					$output_history .= '[';
 					$output_history .=  $spotter_history['longitude'].', ';
@@ -403,7 +486,9 @@ 
 			$output .= ']';
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
 			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
-			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
+			if (isset($begindate)) {
+				$output .= '"archive_date": "'.$begindate.'",';
+			}
 			$output .= '"fc": "'.$j.'"';
 		} else {
 			$output .= '"features": ';

date-statistics-aircraft.php

Spacing +7 added lines, -7 removed lines

@@ -3,14 +3,14 @@ 
 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);
-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 = array();
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+	$title = sprintf(_("Most Common Aircraft 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">';
@@ -21,13 +21,13 @@ 
 	print '</div>';
 
 	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").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common aircrafts 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 aircrafts of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
 	
 	$aircraft_array = $Spotter->countAllAircraftTypesByDate($date);
 	if (!empty($aircraft_array))
@@ -42,7 +42,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>';

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))
 {

date-statistics-departure-airport.php

Spacing +8 added lines, -8 removed lines

@@ -4,13 +4,13 @@ 
 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 Departure Airports on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+	$title = sprintf(_("Most Common Departure Airports on %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -22,13 +22,13 @@ 
 	print '</div>';
 
 	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 Departure Airports").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports 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 all departure airports of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
 
 	$airport_airport_array = $Spotter->countAllDepartureAirportsByDate($date);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>
@@ -44,7 +44,7 @@ 
         	["'._("Airport").'", "'._("# of times").'"],';
 
 	$airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		$name = $airport_item['airport_departure_city'].', '.$airport_item['airport_departure_country'].' ('.$airport_item['airport_departure_icao'].')';
 		$name = str_replace("'", "", $name);
@@ -83,7 +83,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

date-statistics-arrival-airport.php

Spacing +9 added lines, -9 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 Arrival Airports on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+	$title = sprintf(_("Most Common Arrival Airports on %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -21,13 +21,13 @@ 
 	print '</div>';
   
 	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 Arrival Airports").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all arrival airports 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 all arrival airports of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
 	$airport_airport_array = $Spotter->countAllArrivalAirportsByDate($date);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>
     	<script>
@@ -42,7 +42,7 @@ 
         	["'._("Airport").'", "'._("# of times").'"],';
 
 	$airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		$name = $airport_item['airport_arrival_city'].', '.$airport_item['airport_arrival_country'].' ('.$airport_item['airport_arrival_icao'].')';
 		$name = str_replace("'", "", $name);
@@ -81,7 +81,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';
@@ -106,7 +106,7 @@ 
 	$title = _("Unknown Date");
 	require_once('header.php');
 	print '<h1>'._("Error").'</h1>';
-	print '<p>'._("Sorry, this date does not exist in this database. :(");'</p>';
+	print '<p>'._("Sorry, this date does not exist in this database. :("); '</p>';
 }
 
 require_once('footer.php');

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))
 {
@@ -21,13 +21,13 @@ 
 	print '</div>';
 
 	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))
@@ -44,7 +44,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>';
@@ -54,7 +54,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 {