Ysurac / FlightAirMap

airline-detailed.php

Spacing +11 added lines, -11 removed lines

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

manufacturer-statistics-route.php

Spacing +8 added lines, -8 removed lines

@@ -8,14 +8,14 @@ 
         die();
 }
 $Spotter = new Spotter();
-$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING)));
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 
-$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,"0,1", $sort);
+$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Routes from %s"),$manufacturer);
+	$title = sprintf(_("Most Common Routes from %s"), $manufacturer);
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -24,9 +24,9 @@ 
 	$Stats = new Stats();
 	$all_manufacturers = $Stats->getAllManufacturers();
 	if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers();
-	foreach($all_manufacturers as $all_manufacturer)
+	foreach ($all_manufacturers as $all_manufacturer)
 	{
-		if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
+		if ($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>';
 		} else {
@@ -45,7 +45,7 @@ 
 	include('manufacturer-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."),$manufacturer).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s</strong>."), $manufacturer).'</p>';
 
 	$route_array = $Spotter->countAllRoutesByManufacturer($manufacturer);
 	if (!empty($route_array))
@@ -62,7 +62,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($route_array as $route_item)
+		foreach ($route_array as $route_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

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

airport-statistics-aircraft.php

Spacing +7 added lines, -7 removed lines

@@ -9,13 +9,13 @@ 
 }
 $Spotter = new Spotter();
 
-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByAirport($airport,"0,1","");
+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByAirport($airport, "0,1", "");
 $airport_array = $Spotter->getAllAirportInfo($airport);
 
 if (!empty($airport_array))
 {
-	$title = sprintf(_("Most Common Aircraft to/from %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
+	$title = sprintf(_("Most Common Aircraft to/from %s, %s (%s)"), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/airport" method="post">';
@@ -25,9 +25,9 @@ 
 	$airport_names = $Stats->getAllAirportNames();
 	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
 	ksort($airport_names);
-	foreach($airport_names as $airport_name)
+	foreach ($airport_names as $airport_name)
 	{
-		if($airport == $airport_name['airport_icao'])
+		if ($airport == $airport_name['airport_icao'])
 		{
 			print '<option value="'.$airport_name['airport_icao'].'" selected="selected">'.$airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')</option>';
 		} else {
@@ -58,7 +58,7 @@ 
 	include('airport-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 to/from <strong>%s, %s (%s)</strong>."),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']).'</p>';
+ 	print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights to/from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
 	
 	$aircraft_array = $Spotter->countAllAircraftTypesByAirport($airport);
 	if (!empty($aircraft_array))
@@ -73,7 +73,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>';

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" class="form-inline">';
@@ -28,13 +28,13 @@ 
 	print '<br />';
 
 	print '<div class="info column">';
-	print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
+	print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
 	print '</div>';
 
 	include('date-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft").'</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))
@@ -49,7 +49,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>';

highlights-display.php

Spacing +4 added lines, -4 removed lines

@@ -7,12 +7,12 @@ 
 require_once('header.php');
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	$limit_start = 0;
 	$limit_end = 28;
 	$absolute_difference = 28;
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = $limit_explode[0];
 	$limit_end = $limit_explode[1];
@@ -39,7 +39,7 @@ 
 print '<div class="column">';	
 print '<p>'._("The view below shows all aircrafts that have been selected to have some sort of special characteristic about them, such as unique liveries, destinations etc.").'</p>';
 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 if ($sort != '') {
 	$spotter_array = $Spotter->getSpotterDataByHighlight($limit_start.",".$absolute_difference, $sort);
 } else {
@@ -48,7 +48,7 @@ 
 if (!empty($spotter_array))
 {
 	print '<div class="dispay-view">';
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		if (isset($spotter_item['image']) && $spotter_item['image'] != "")
 		{

live-sat-czml.php

Spacing +20 added lines, -20 removed lines

@@ -20,17 +20,17 @@ 
 
 $spotter_array = array();
 if (isset($_COOKIE['sattypes']) && $_COOKIE['sattypes'] != '') {
-	$sattypes = explode(',',$_COOKIE['sattypes']);
+	$sattypes = explode(',', $_COOKIE['sattypes']);
 	foreach ($sattypes as $sattype) {
-		$spotter_array = array_merge($Satellite->position_all_type($sattype,$timeb-$globalLiveInterval,$timeb),$spotter_array);
+		$spotter_array = array_merge($Satellite->position_all_type($sattype, $timeb - $globalLiveInterval, $timeb), $spotter_array);
 	}
 }
 if (isset($_COOKIE['displayiss']) && $_COOKIE['displayiss']) {
-	$spotter_array = array_merge($Satellite->position('ISS (ZARYA)',time()-$globalLiveInterval,time()),$spotter_array);
-	$spotter_array = array_merge($Satellite->position('TIANGONG 1',time()-$globalLiveInterval,time()),$spotter_array);
-	$spotter_array = array_merge($Satellite->position('TIANGONG-2',time()-$globalLiveInterval,time()),$spotter_array);
+	$spotter_array = array_merge($Satellite->position('ISS (ZARYA)', time() - $globalLiveInterval, time()), $spotter_array);
+	$spotter_array = array_merge($Satellite->position('TIANGONG 1', time() - $globalLiveInterval, time()), $spotter_array);
+	$spotter_array = array_merge($Satellite->position('TIANGONG-2', time() - $globalLiveInterval, time()), $spotter_array);
 }
-$spotter_array = array_unique($spotter_array,SORT_REGULAR);
+$spotter_array = array_unique($spotter_array, SORT_REGULAR);
 /*
 $modelsdb = array();
 if (file_exists('models/space/space_modelsdb')) {
@@ -54,14 +54,14 @@ 
 //	$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"}';
 //$output .= ',"clock": {"currentTime" : "%minitime%","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"step": "SYSTEM_CLOCK_MULTIPLIER"}';
 $output .= '},';
 if (!empty($spotter_array) && is_array($spotter_array))
 {
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		$j++;
 		date_default_timezone_set('UTC');
@@ -76,7 +76,7 @@ 
 			$orientation = '';
 			$prev_satname = $spotter_item['name'];
 			$output .= '{';
-			$output .= '"id": "'.trim(str_replace(array('[+]','[-]'),'',$spotter_item['name'])).'",';
+			$output .= '"id": "'.trim(str_replace(array('[+]', '[-]'), '', $spotter_item['name'])).'",';
 			$output .= '"properties": {';
 			// Not yet supported in CZML with Cesium
 			$output .= '},';
@@ -114,23 +114,23 @@ 
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/cubiesat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
 				} elseif ($spotter_item['name'] == 'TERRA') {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/terra.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'O3B') !== false) {
+				} elseif (strpos($spotter_item['name'], 'O3B') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/o3b.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'GLOBALSTAR') !== false) {
+				} elseif (strpos($spotter_item['name'], 'GLOBALSTAR') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/globalstar.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'GPS') !== false) {
+				} elseif (strpos($spotter_item['name'], 'GPS') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/gps.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'GENESIS') !== false) {
+				} elseif (strpos($spotter_item['name'], 'GENESIS') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/genesis.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'OSCAR 7') !== false) {
+				} elseif (strpos($spotter_item['name'], 'OSCAR 7') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/oscar7.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'FLOCK') !== false) {
+				} elseif (strpos($spotter_item['name'], 'FLOCK') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/cubesat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'PLEIADES') !== false) {
+				} elseif (strpos($spotter_item['name'], 'PLEIADES') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/pleiades.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'DUCHIFAT') !== false) {
+				} elseif (strpos($spotter_item['name'], 'DUCHIFAT') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/duchifat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'FORMOSAT-2') !== false) {
+				} elseif (strpos($spotter_item['name'], 'FORMOSAT-2') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/formosat2.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
 				} elseif ($spotter_item['type'] == 'iridium') {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/iridium.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
@@ -152,14 +152,14 @@ 
 	//		$output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", ';
 			$output .= '"interpolationAlgorithm":"HERMITE","interpolationDegree":3,';
 			$output .= '"cartographicDegrees": [';
-			$output .= '"'.date("c",$spotter_item['timestamp']).'", ';
+			$output .= '"'.date("c", $spotter_item['timestamp']).'", ';
 			$output .= $spotter_item['longitude'].', ';
 			$output .= $spotter_item['latitude'].', ';
 			$output .= $spotter_item['altitude']*1000;
 			$orientation = '"orientation" : { ';
 			$orientation .= '"unitQuaternion": [';
 		} else {
-			$output .= ',"'.date("c",$spotter_item['timestamp']).'", ';
+			$output .= ',"'.date("c", $spotter_item['timestamp']).'", ';
 			$output .= $spotter_item['longitude'].', ';
 			$output .= $spotter_item['latitude'].', ';
 			$output .= $spotter_item['altitude']*1000;

live-santa-geojson.php

Spacing +2 added lines, -2 removed lines

@@ -10,10 +10,10 @@
 $timearray = array();
 if (isset($_GET['now'])) $begin = time();
 else $begin = strtotime(date("Y").'-12-24T02:00:00Z');
-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;
 
 ?>

require/class.Scheduler.php

Spacing +170 added lines, -170 removed lines

@@ -24,9 +24,9 @@ 
 	/ @param String $source source of data
 	*/
 	
-	public function addSchedule($ident,$departure_airport_icao,$departure_airport_time,$arrival_airport_icao,$arrival_airport_time,$source = 'website') {
+	public function addSchedule($ident, $departure_airport_icao, $departure_airport_time, $arrival_airport_icao, $arrival_airport_time, $source = 'website') {
 		date_default_timezone_set('UTC');
-		$date = date("Y-m-d H:i:s",time());
+		$date = date("Y-m-d H:i:s", time());
 	        //if ($departure_airport_time == '' && $arrival_airport_time == '') exit;
 	        //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident";
 	        $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident";
@@ -34,69 +34,69 @@ 
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		if ($sth->fetchColumn() > 0) {
 			if ($departure_airport_time == '' && $arrival_airport_time == '') {
 			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao);
+			    $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao);
 			} elseif ($arrival_airport_time == '') {
 			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao);
+			    $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao);
 			} elseif ($departure_airport_time == '') {
 			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
+			    $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_time' => $arrival_airport_time);
 			} else {
 			    //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident AND departure_airport_icao = :departure_airport_icao AND departure_airport_time = :departure_airport_time AND arrival_airport_icao = :arrival_airport_icao AND arrival_airport_time = :arrival_airport_time";
 			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
+			    $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_time' => $arrival_airport_time);
 			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 			if ($sth->fetchColumn() == 0) {
 				//$query = 'UPDATE schedule SET departure_airport_icao = :departure_airport_icao, departure_airport_time = :departure_airport_time, arrival_airport_icao = :arrival_airport_icao, arrival_airport_time = :arrival_airport_time, date_modified = :date, source = :source WHERE ident = :ident';
 				if ($departure_airport_time == '' && $arrival_airport_time == '') {
                             	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
+				    $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
 				} elseif ($arrival_airport_time == '') {
                             	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
+				    $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
 				} elseif ($departure_airport_time == '') {
                             	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
+				    $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
 				} else {
                             	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
+				    $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
 				}
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 			} else {
 				//$query = 'UPDATE schedule SET date_lastseen = :date WHERE ident = :ident';
 				$query = 'UPDATE routes SET date_lastseen = :date WHERE CallSign = :ident';
-				$query_values = array(':ident' => $ident,':date' => $date);
+				$query_values = array(':ident' => $ident, ':date' => $date);
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 			}
 		} else {
 			$query = 'INSERT INTO  routes (CallSign,FromAirport_ICAO, FromAirport_Time, ToAirport_ICAO, ToAirport_Time,date_added,source)  VALUES (:ident,:departure_airport_icao,:departure_airport_time,:arrival_airport_icao,:arrival_airport_time,:date,:source)';
-			$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
+			$query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
 			 try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -105,10 +105,10 @@ 
 
 	public function getSchedule($ident) {
 	        $Translation = new Translation($this->db);
-	        $operator = $Translation->checkTranslation($ident,false);
+	        $operator = $Translation->checkTranslation($ident, false);
 	        if ($ident != $operator) {
 	    		$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :operator OR CallSign = :ident LIMIT 1";
-	    		$query_values = array(':ident' => $ident,'operator' => $operator);
+	    		$query_values = array(':ident' => $ident, 'operator' => $operator);
 	    	} else {
 		        $query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident LIMIT 1";
 	    		$query_values = array(':ident' => $ident);
@@ -116,7 +116,7 @@ 
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -140,7 +140,7 @@ 
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -155,16 +155,16 @@ 
 	* @param String $carrier IATA code
 	* @return Flight departure and arrival airports and time
 	*/
-	private function getAirFrance($callsign, $date = 'NOW',$carrier = 'AF') {
+	private function getAirFrance($callsign, $date = 'NOW', $carrier = 'AF') {
 		$Common = new Common();
 		$check_date = new Datetime($date);
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$url = "http://www.airfrance.fr/cgi-bin/AF/FR/fr/local/resainfovol/infovols/detailsVolJson.do?codeCompagnie[0]=".$carrier."&numeroVol[0]=".$numvol."&dayFlightDate=".$check_date->format('d')."&yearMonthFlightDate=".$check_date->format('Ym');
 		$json = $Common->getData($url);
 	
 		$parsed_json = json_decode($json);
-		if (property_exists($parsed_json,'errors') === false) {
+		if (property_exists($parsed_json, 'errors') === false) {
 			//$originLong = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'originLong'};
 			$originShort = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'originShort'};
 			//$departureDateMedium = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'departureDateMedium'};
@@ -174,9 +174,9 @@ 
 			//$arrivalDateMedium = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'arrivalDateMedium'};
 			$arrivalTime = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'arrivalTime'};
 
-			preg_match('/\((.*?)\)/',$originShort,$originiata);
+			preg_match('/\((.*?)\)/', $originShort, $originiata);
 			$DepartureAirportIata = $originiata[1];
-			preg_match('/\((.*?)\)/',$destinationShort,$destinationiata);
+			preg_match('/\((.*?)\)/', $destinationShort, $destinationiata);
 			$ArrivalAirportIata = $destinationiata[1];
 
 			/*
@@ -185,7 +185,7 @@ 
 			$arrivalTime = gmdate('H:i',strtotime($arrivalTime));
 			*/
 		
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airfrance');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_airfrance');
 		} else return array();
 	}
 
@@ -200,8 +200,8 @@ 
 		$Common = new Common();
 		date_default_timezone_set($globalTimezone);
 		$check_date = new Datetime($date);
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$url = "http://www.easyjet.com/ft/api/flights?date=".$check_date->format('Y-m-d')."&fn=".$callsign;
 		$json = $Common->getData($url);
 		$parsed_json = json_decode($json);
@@ -213,7 +213,7 @@ 
 			$departureTime = $parsed_json->{'flights'}[0]->{'dates'}->{'fstd'};
 			$arrivalTime = $parsed_json->{'flights'}[0]->{'dates'}->{'fsta'};
 
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_easyjet');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_easyjet');
 		} else return array();
 	}
 
@@ -224,12 +224,12 @@ 
 	*/
 	private function getRyanair($callsign) {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$url = "http://www.ryanair.com/fr/api/2/flight-info/0/50/";
 		$post = '{"flight":"'.$numvol.'","minDepartureTime":"00:00","maxDepartureTime":"23:59"}';
-		$headers = array('Content-Type: application/json','Content-Length: ' . strlen($post));
-		$json = $Common->getData($url,'post',$post,$headers);
+		$headers = array('Content-Type: application/json', 'Content-Length: '.strlen($post));
+		$json = $Common->getData($url, 'post', $post, $headers);
 		$parsed_json = json_decode($json);
 		if (isset($parsed_json->{'flightInfo'})) {
 			$flights = $parsed_json->{'flightInfo'};
@@ -238,7 +238,7 @@ 
 				$ArrivalAirportIata = $parsed_json->{'flightInfo'}[0]->{'arrivalAirport'}->{'iata'}; //name
 				$departureTime = $parsed_json->{'flightInfo'}[0]->{'departureTime'};
 				$arrivalTime = $parsed_json->{'flightInfo'}[0]->{'arrivalTime'};
-				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime, 'Source' => 'website_ryanair');
+				return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_ryanair');
 			} else return array();
 		} else return array();
 	}
@@ -250,8 +250,8 @@ 
 	*/
 	private function getSwiss($callsign) {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$url = "http://www.world-of-swiss.com/fr/routenetwork.json";
 		$json = $Common->getData($url);
 		$parsed_json = json_decode($json);
@@ -265,12 +265,12 @@ 
 				if ($flight->{'no'} == "Vol LX ".$numvol) {
 					$DepartureAirportIata = $flight->{'from'}->{'code'}; //city
 					$ArrivalAirportIata = $flight->{'to'}->{'code'}; //city
-					$departureTime = substr($flight->{'from'}->{'hour'},0,5);
-					$arrivalTime = substr($flight->{'to'}->{'hour'},0,5);
+					$departureTime = substr($flight->{'from'}->{'hour'},0, 5);
+					$arrivalTime = substr($flight->{'to'}->{'hour'},0, 5);
 				}
 			}
 			if (isset($DepartureAirportIata) && isset($ArrivalAirportIata)) {
-				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_swiss');
+				return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_swiss');
 			} else return array();
 		} else return array();
 	}
@@ -285,21 +285,21 @@ 
 		global $globalBritishAirwaysKey;
 		$Common = new Common();
 		$check_date = new Datetime($date);
-		$numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign));
-		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array();
+		$numvol = sprintf('%04d', preg_replace('/^[A-Z]*/', '', $callsign));
+		if (!filter_var(preg_replace('/^[A-Z]*/', '', $callsign), FILTER_VALIDATE_INT)) return array();
 		if ($globalBritishAirwaysKey == '') return array();
 		$url = "https://api.ba.com/rest-v1/v1/flights;flightNumber=".$numvol.";scheduledDepartureDate=".$check_date->format('Y-m-d').".json";
 		$headers = array('Client-Key: '.$globalBritishAirwaysKey);
-		$json = $Common->getData($url,'get','',$headers);
+		$json = $Common->getData($url, 'get', '', $headers);
 		if ($json == '') return array();
 		$parsed_json = json_decode($json);
 		$flights = $parsed_json->{'FlightsResponse'};
 		if (count($flights) > 0) {
 			$DepartureAirportIata = $parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'DepartureAirport'};
 			$ArrivalAirportIata = $parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ArrivalAirport'};
-			$departureTime = date('H:i',strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledDepartureDateTime'}));
-			$arrivalTime = date('H:i',strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledArrivalDateTime'}));
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_britishairways');
+			$departureTime = date('H:i', strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledDepartureDateTime'}));
+			$arrivalTime = date('H:i', strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledArrivalDateTime'}));
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_britishairways');
 		} else return array();
 	}
 
@@ -313,27 +313,27 @@ 
 		global $globalLufthansaKey;
 		$Common = new Common();
 		$check_date = new Datetime($date);
-		$numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign));
-		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array();
+		$numvol = sprintf('%04d', preg_replace('/^[A-Z]*/', '', $callsign));
+		if (!filter_var(preg_replace('/^[A-Z]*/', '', $callsign), FILTER_VALIDATE_INT)) return array();
 		if (!isset($globalLufthansaKey) || $globalLufthansaKey == '' || !isset($globalLufthansaKey['key']) || $globalLufthansaKey['key'] == '') return array();
 		$url = "https://api.lufthansa.com/v1/oauth/token";
-		$post = array('client_id' => $globalLufthansaKey['key'],'client_secret' => $globalLufthansaKey['secret'],'grant_type' => 'client_credentials');
-		$data = $Common->getData($url,'post',$post);
+		$post = array('client_id' => $globalLufthansaKey['key'], 'client_secret' => $globalLufthansaKey['secret'], 'grant_type' => 'client_credentials');
+		$data = $Common->getData($url, 'post', $post);
 		$parsed_data = json_decode($data);
 		if (!isset($parsed_data->{'access_token'})) return array();
 		$token = $parsed_data->{'access_token'};
 		
 		$url = "https://api.lufthansa.com/v1/operations/flightstatus/LH".$numvol."/".$check_date->format('Y-m-d');
-		$headers = array('Authorization: Bearer '.$token,'Accept: application/json');
-		$json = $Common->getData($url,'get','',$headers);
+		$headers = array('Authorization: Bearer '.$token, 'Accept: application/json');
+		$json = $Common->getData($url, 'get', '', $headers);
 		if ($json == '') return array();
 		$parsed_json = json_decode($json);
 		if (isset($parsed_json->{'FlightStatusResource'}) && count($parsed_json->{'FlightStatusResource'}) > 0) {
 			$DepartureAirportIata = $parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Departure'}->{'AirportCode'};
-			$departureTime = date('H:i',strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Departure'}->{'ScheduledTimeLocal'}->{'DateTime'}));
+			$departureTime = date('H:i', strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Departure'}->{'ScheduledTimeLocal'}->{'DateTime'}));
 			$ArrivalAirportIata = $parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'AirportCode'};
-			$arrivalTime = date('H:i',strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'ScheduledTimeLocal'}->{'DateTime'}));
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_lufthansa');
+			$arrivalTime = date('H:i', strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'ScheduledTimeLocal'}->{'DateTime'}));
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_lufthansa');
 		} else return array();
 	}
 
@@ -347,23 +347,23 @@ 
 		global $globalTransaviaKey;
 		$Common = new Common();
 		$check_date = new Datetime($date);
-		$numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign));
-		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array();
+		$numvol = sprintf('%04d', preg_replace('/^[A-Z]*/', '', $callsign));
+		if (!filter_var(preg_replace('/^[A-Z]*/', '', $callsign), FILTER_VALIDATE_INT)) return array();
 		if ($globalTransaviaKey == '') return array();
 		$url = "https://tst.api.transavia.com/v1/flightstatus/departuredate/".$check_date->format('Ymd').'/flightnumber/HV'.$numvol;
 		//$url = "https://api.transavia.com/v1/flightstatus/departuredate/".$check_date->format('Ymd').'/flightnumber/HV'.$numvol;
 		$headers = array('apikey: '.$globalTransaviaKey);
-		$json = $Common->getData($url,'get','',$headers);
+		$json = $Common->getData($url, 'get', '', $headers);
 		//echo 'result : '.$json;
 		if ($json == '') return array();
 		$parsed_json = json_decode($json);
 		
 		if (isset($parsed_json->{'data'}[0])) {
 			$DepartureAirportIata = $parsed_json->{'data'}[0]->{'flight'}->{'departureAirport'}->{'locationCode'};
-			$departureTime = date('H:i',strtotime($parsed_json->{'data'}[0]->{'flight'}->{'departureDateTime'}));
+			$departureTime = date('H:i', strtotime($parsed_json->{'data'}[0]->{'flight'}->{'departureDateTime'}));
 			$ArrivalAirportIata = $parsed_json->{'data'}[0]->{'flight'}->{'arrivalAirport'}->{'locationCode'};
-			$arrivalTime = date('H:i',strtotime($parsed_json->{'data'}[0]->{'flight'}->{'arrivalDateTime'}));
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_transavia');
+			$arrivalTime = date('H:i', strtotime($parsed_json->{'data'}[0]->{'flight'}->{'arrivalDateTime'}));
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_transavia');
 		} else return array();
 	}
 
@@ -374,14 +374,14 @@ 
 	*/
 	public function getTunisair($callsign) {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$url = "http://www.tunisair.com/site/publish/module/Volj/fr/Flight_List.asp";
 		$data = $Common->getData($url);
 		$table = $Common->table2array($data);
 		foreach ($table as $flight) {
-			if (isset($flight[1]) && $flight[1] == "TU ".sprintf('%04d',$numvol)) {
-				return array('DepartureAirportIATA' => $flight[2],'DepartureTime' => str_replace('.',':',$flight[5]),'ArrivalAirportIATA' => $flight[3],'ArrivalTime' => str_replace('.',':',$flight[6]),'Source' => 'website_tunisair');
+			if (isset($flight[1]) && $flight[1] == "TU ".sprintf('%04d', $numvol)) {
+				return array('DepartureAirportIATA' => $flight[2], 'DepartureTime' => str_replace('.', ':', $flight[5]), 'ArrivalAirportIATA' => $flight[3], 'ArrivalTime' => str_replace('.', ':', $flight[6]), 'Source' => 'website_tunisair');
 			}
 		}
 		return array();
@@ -392,21 +392,21 @@ 
 	* @param String $callsign The callsign
 	* @return Flight departure and arrival airports and time
 	*/
-	public function getVueling($callsign,$date = 'NOW') {
+	public function getVueling($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$check_date = new Datetime($date);
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
-		$final_date = str_replace('/','%2F',$check_date->format('d/m/Y'));
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
+		$final_date = str_replace('/', '%2F', $check_date->format('d/m/Y'));
 		$url = "http://www.vueling.com/Base/BaseProxy/RenderMacro/?macroalias=FlightStatusResult&searchBy=bycode&date=".$final_date."&flightNumber=".$numvol."&idioma=en-GB";
 		$data = $Common->getData($url);
-		$data=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$data));
+		$data = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $data));
 		if ($data != '') {
-			preg_match('/flightOri=[A-Z]{3}/',$data,$result);
-			$DepartureAirportIata = str_replace('flightOri=','',$result[0]);
-			preg_match('/flightDest=[A-Z]{3}/',$data,$result);
-			$ArrivalAirportIata = str_replace('flightDest=','',$result[0]);
-			if ($DepartureAirportIata != '' && $ArrivalAirportIata != '') return array('DepartureAirportIATA' => $DepartureAirportIata,'ArrivalAirportIATA' => $ArrivalAirportIata,'Source' => 'website_vueling');
+			preg_match('/flightOri=[A-Z]{3}/', $data, $result);
+			$DepartureAirportIata = str_replace('flightOri=', '', $result[0]);
+			preg_match('/flightDest=[A-Z]{3}/', $data, $result);
+			$ArrivalAirportIata = str_replace('flightDest=', '', $result[0]);
+			if ($DepartureAirportIata != '' && $ArrivalAirportIata != '') return array('DepartureAirportIATA' => $DepartureAirportIata, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'Source' => 'website_vueling');
 			else return array();
 		}
 		return array();
@@ -420,27 +420,27 @@ 
 	*/
 	public function getIberia($callsign, $date = 'NOW') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
 		$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$url = "https://www.iberia.com/web/flightDetail.do";
-		$post = array('numvuelo' => $numvol,'fecha' => $check_date->format('Ymd'),'airlineID' => 'IB');
-		$data = $Common->getData($url,'post',$post);
+		$post = array('numvuelo' => $numvol, 'fecha' => $check_date->format('Ymd'), 'airlineID' => 'IB');
+		$data = $Common->getData($url, 'post', $post);
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			//print_r($table);
 			if (count($table) > 0) {
 				$flight = $table;
-				preg_match('/([A-Z]{3})/',$flight[3][0],$DepartureAirportIataMatch);
-				preg_match('/([A-Z]{3})/',$flight[5][0],$ArrivalAirportIataMatch);
+				preg_match('/([A-Z]{3})/', $flight[3][0], $DepartureAirportIataMatch);
+				preg_match('/([A-Z]{3})/', $flight[5][0], $ArrivalAirportIataMatch);
 				$DepartureAirportIata = $DepartureAirportIataMatch[0];
 				$ArrivalAirportIata = $ArrivalAirportIataMatch[0];
-				$departureTime = substr(trim(str_replace(' lunes','',str_replace('&nbsp;','',$flight[3][2]))),0,5);
-				$arrivalTime = trim(str_replace(' lunes','',str_replace('&nbsp;','',$flight[5][1])));
+				$departureTime = substr(trim(str_replace(' lunes', '', str_replace('&nbsp;', '', $flight[3][2]))), 0, 5);
+				$arrivalTime = trim(str_replace(' lunes', '', str_replace('&nbsp;', '', $flight[5][1])));
 				if ($arrivalTime == 'Hora estimada de llegada') {
-					$arrivalTime = substr(trim(str_replace(' lunes','',str_replace('&nbsp;','',$flight[5][2]))),0,5);
-				} else $arrivalTime = substr($arrivalTime,0,5);
-				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_iberia');
+					$arrivalTime = substr(trim(str_replace(' lunes', '', str_replace('&nbsp;', '', $flight[5][2]))), 0, 5);
+				} else $arrivalTime = substr($arrivalTime, 0, 5);
+				return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_iberia');
 			}
 		}
 		return array();
@@ -453,11 +453,11 @@ 
 	* @return Flight departure and arrival airports and time
 	*/
 
-	private function getStarAlliance($callsign, $date = 'NOW',$carrier = '') {
+	private function getStarAlliance($callsign, $date = 'NOW', $carrier = '') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
 		$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$url = "http://www.staralliance.com/flifoQueryAction.do?myAirline=&airlineCode=".$carrier."&flightNo=".$numvol."&day=".$check_date->format('d')."&month=".$check_date->format('m')."&year=".$check_date->format('Y')."&departuredate=".$check_date->format('d-M-Y');
 		$data = $Common->getData($url);
 		if ($data != '') {
@@ -466,13 +466,13 @@ 
 				$flight = $table;
 				//print_r($table);
 				if (isset($flight[25]) && isset($flight[29])) {
-					preg_match('/([A-Z]{3})/',$flight[25][1],$DepartureAirportIataMatch);
-					preg_match('/([A-Z]{3})/',$flight[25][3],$ArrivalAirportIataMatch);
+					preg_match('/([A-Z]{3})/', $flight[25][1], $DepartureAirportIataMatch);
+					preg_match('/([A-Z]{3})/', $flight[25][3], $ArrivalAirportIataMatch);
 					$DepartureAirportIata = $DepartureAirportIataMatch[0];
 					$ArrivalAirportIata = $ArrivalAirportIataMatch[0];
-					$departureTime = substr(trim(str_replace('Scheduled: ','',$flight[29][0])),0,5);
-					$arrivalTime = substr(trim(str_replace('Scheduled: ','',$flight[29][1])),0,5);
-					return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_staralliance');
+					$departureTime = substr(trim(str_replace('Scheduled: ', '', $flight[29][0])), 0, 5);
+					$arrivalTime = substr(trim(str_replace('Scheduled: ', '', $flight[29][1])), 0, 5);
+					return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_staralliance');
 				} else return array();
 			}
 			
@@ -490,10 +490,10 @@ 
 	*/
 	private function getAlitalia($callsign, $date = 'NOW') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
 		$check_date = new Datetime($date);
-		$url= "http://booking.alitalia.com/FlightStatus/fr_fr/FlightInfo?Brand=az&NumeroVolo=".$numvol."&DataCompleta=".$check_date->format('d/m/Y');
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$url = "http://booking.alitalia.com/FlightStatus/fr_fr/FlightInfo?Brand=az&NumeroVolo=".$numvol."&DataCompleta=".$check_date->format('d/m/Y');
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->text2array($data);
@@ -501,7 +501,7 @@ 
 			$ArrivalAirportIata = '';
 			$departureTime = $table[4];
 			$arrivalTime = $table[5];
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_alitalia');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_alitalia');
 		}
 	}
 
@@ -513,21 +513,21 @@ 
 	*/
 	private function getBrussels($callsign, $date = 'NOW') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
 		$check_date = new Datetime($date);
-		$url= "http://www.brusselsairlines.com/api/flightstatus/getresults?from=NA&to=NA&date=".$check_date->format('d/m/Y')."&hour=NA&lookup=flightnumber&flightnumber=".$numvol."&publicationID=302";
+		$url = "http://www.brusselsairlines.com/api/flightstatus/getresults?from=NA&to=NA&date=".$check_date->format('d/m/Y')."&hour=NA&lookup=flightnumber&flightnumber=".$numvol."&publicationID=302";
 		//http://www.brusselsairlines.com/fr-fr/informations-pratiques/statut-de-votre-vol/resultat.aspx?flightnumber=".$numvol."&date=".$check_date->format('d/m/Y')."&lookup=flightnumber";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		if ($data != '') {
 		    //echo $data;
-		    $parsed_json = json_decode($data,true);
+		    $parsed_json = json_decode($data, true);
 		    if (isset($parsed_json[0]['FromAirportCode'])) {
 			$DepartureAirportIata = $parsed_json[0]['FromAirportCode'];
 			$ArrivalAirportIata = $parsed_json[0]['ToAirportCode'];
-			$departureTime = date('H:i',strtotime($parsed_json[0]['ScheduledDepatureDate']));
-			$arrivalTime = date('H:i',strtotime($parsed_json[0]['ScheduledArrivalDate']));
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_brussels');
+			$departureTime = date('H:i', strtotime($parsed_json[0]['ScheduledDepatureDate']));
+			$arrivalTime = date('H:i', strtotime($parsed_json[0]['ScheduledArrivalDate']));
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_brussels');
 		    }
 		}
 	}
@@ -604,21 +604,21 @@ 
 	*/
 	private function getFlyTap($callsign) {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		$url= "http://www.flytap.com/France/fr/PlanifierEtReserver/Outils/DepartsEtArrivees";
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		$url = "http://www.flytap.com/France/fr/PlanifierEtReserver/Outils/DepartsEtArrivees";
 		//$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
-		$post = array('arrivalsdepartures_content' => 'number','arrivalsdepartures_tp' => $numvol,'arrivalsdepartures_trk' => 'ARR','arrivalsdepartures_date_trk' => '1','aptCode' => '','arrivalsdepartures' => 'DEP','arrivalsdepartures_date' => '1','aptCodeFrom' => '','aptCodeTo' => '','arrivalsdepartures2' => 'DEP','arrivalsdepartures_date2' => '1');
-		$data = $Common->getData($url,'post',$post);
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
+		$post = array('arrivalsdepartures_content' => 'number', 'arrivalsdepartures_tp' => $numvol, 'arrivalsdepartures_trk' => 'ARR', 'arrivalsdepartures_date_trk' => '1', 'aptCode' => '', 'arrivalsdepartures' => 'DEP', 'arrivalsdepartures_date' => '1', 'aptCodeFrom' => '', 'aptCodeTo' => '', 'arrivalsdepartures2' => 'DEP', 'arrivalsdepartures_date2' => '1');
+		$data = $Common->getData($url, 'post', $post);
 		if ($data != '') {
 			$table = $Common->table2array($data);
-			$departureTime = trim(substr($table[15][0],0,5));
-			$arrivalTime = trim(substr($table[35][0],0,5));
-			preg_match('/([A-Z]{3})/',$table[11][0],$DepartureAirportIataMatch);
-			preg_match('/([A-Z]{3})/',$table[31][0],$ArrivalAirportIataMatch);
+			$departureTime = trim(substr($table[15][0], 0, 5));
+			$arrivalTime = trim(substr($table[35][0], 0, 5));
+			preg_match('/([A-Z]{3})/', $table[11][0], $DepartureAirportIataMatch);
+			preg_match('/([A-Z]{3})/', $table[31][0], $ArrivalAirportIataMatch);
 			$DepartureAirportIata = $DepartureAirportIataMatch[0];
 			$ArrivalAirportIata = $ArrivalAirportIataMatch[0];
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flytap');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_flytap');
 		}
 		return array();
 	}
@@ -640,10 +640,10 @@ 
 			} 
 		}
 		if ($airline_icao == '') return array();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		$url= "http://info.flightmapper.net/flight/".$airline_icao.'_'.$numvol;
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		$url = "http://info.flightmapper.net/flight/".$airline_icao.'_'.$numvol;
 		//$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->table2array($data);
@@ -653,13 +653,13 @@ 
 				$darr = '';
 				$ahour = '';
 				$aarr = '';
-				$n = sscanf($sched,'%*s %5[0-9:] %*[^()] (%3[A-Z]) %5[0-9:] %*[^()] (%3[A-Z])',$dhour,$darr,$ahour,$aarr);
+				$n = sscanf($sched, '%*s %5[0-9:] %*[^()] (%3[A-Z]) %5[0-9:] %*[^()] (%3[A-Z])', $dhour, $darr, $ahour, $aarr);
 				if ($n == 7) {
 				    $departureTime = $dhour;
 				    $arrivalTime = $ahour;
-				    $DepartureAirportIata = str_replace(array('(',')'),'',$darr);
-				    $ArrivalAirportIata = str_replace(array('(',')'),'',$aarr);
-				    return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightmapper');
+				    $DepartureAirportIata = str_replace(array('(', ')'), '', $darr);
+				    $ArrivalAirportIata = str_replace(array('(', ')'), '', $aarr);
+				    return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_flightmapper');
 				}
 			}
 		}
@@ -683,20 +683,20 @@ 
 			} 
 		}
 		*/
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		$url= "http://fr.flightaware.com/live/flight/".$callsign;
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		$url = "http://fr.flightaware.com/live/flight/".$callsign;
 		//$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			if (isset($table[11][0])) {
-				$departureTime = str_replace('h',':',substr($table[5][0],0,5));
-				$arrivalTime = str_replace('h',':',substr($table[5][1],0,5));
+				$departureTime = str_replace('h', ':', substr($table[5][0], 0, 5));
+				$arrivalTime = str_replace('h', ':', substr($table[5][1], 0, 5));
 				echo $table[3][0];
-				sscanf($table[3][0],'%*[^(] (%3[A-Z] / %*4[A-Z])',$DepartureAirportIata);
-				sscanf($table[3][1],'%*[^(] (%3[A-Z] / %*4[A-Z])',$ArrivalAirportIata);
-				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightaware');
+				sscanf($table[3][0], '%*[^(] (%3[A-Z] / %*4[A-Z])', $DepartureAirportIata);
+				sscanf($table[3][1], '%*[^(] (%3[A-Z] / %*4[A-Z])', $ArrivalAirportIata);
+				return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_flightaware');
 			}
 		}
 		return array();
@@ -709,7 +709,7 @@ 
 	*/
 	public function getCostToTravel($callsign) {
 		$Common = new Common();
-		$url= "http://www.costtotravel.com/flight-number/".$callsign;
+		$url = "http://www.costtotravel.com/flight-number/".$callsign;
 		//$check_date = new Datetime($date);
 		//if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
@@ -717,11 +717,11 @@ 
 			$table = $Common->table2array($data);
 			//print_r($table);
 			if (isset($table[11][1])) {
-				$departureTime = substr($table[11][1],0,5);
-				$arrivalTime = substr($table[17][1],0,5);
-				$DepartureAirportIata = substr($table[13][1],0,3);
-				$ArrivalAirportIata = substr($table[15][1],0,3);
-				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_costtotravel');
+				$departureTime = substr($table[11][1], 0, 5);
+				$arrivalTime = substr($table[17][1], 0, 5);
+				$DepartureAirportIata = substr($table[13][1], 0, 3);
+				$ArrivalAirportIata = substr($table[15][1], 0, 3);
+				return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_costtotravel');
 			}
 		}
 		return array();
@@ -733,13 +733,13 @@ 
 	* @param String $date date we want flight number info
 	* @return Flight departure and arrival airports and time
 	*/
-	private function getAirCanada($callsign,$date = 'NOW') {
+	private function getAirCanada($callsign, $date = 'NOW') {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
 		$check_date = new Datetime($date);
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		$url= "http://services.aircanada.com/portal/rest/getFlightsByFlightNumber?forceTimetable=true&flightNumber=".$numvol."&carrierCode=AC&date=".$check_date->format('m-d-Y')."&app_key=AE919FDCC80311DF9BABC975DFD72085&cache=74249";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		$url = "http://services.aircanada.com/portal/rest/getFlightsByFlightNumber?forceTimetable=true&flightNumber=".$numvol."&carrierCode=AC&date=".$check_date->format('m-d-Y')."&app_key=AE919FDCC80311DF9BABC975DFD72085&cache=74249";
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		$dom = new DomDocument();
 		$dom->loadXML($data);
@@ -747,11 +747,11 @@ 
 		$departure = $dom->getElementsByTagName('DepartureStationInfo')->item(0);
 		if (isset($departure->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue)) {
 			$DepartureAirportIata = $departure->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue;
-			$departureTime = date('H:i',strtotime($departure->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue));
+			$departureTime = date('H:i', strtotime($departure->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue));
 			$arrival = $dom->getElementsByTagName('ArrivalStationInfo')->item(0);
 			$ArrivalAirportIata = $arrival->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue;
-			$arrivalTime = date('H:i',strtotime($arrival->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue));
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_aircanada');
+			$arrivalTime = date('H:i', strtotime($arrival->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue));
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_aircanada');
 		} else return array();
 	}
 
@@ -763,21 +763,21 @@ 
 	*/
 	private function getVietnamAirlines($callsign, $date = 'NOW') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
 		$check_date = new Datetime($date);
-		$url= "https://cat.sabresonicweb.com/SSWVN/meridia?posid=VNVN&page=flifoFlightInfoDetailsMessage_learn&action=flightInfoDetails&airline=VN&language=fr&depDay=".$check_date->format('j')."&depMonth=".strtoupper($check_date->format('M'))."&=&flight=".$numvol."&";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$url = "https://cat.sabresonicweb.com/SSWVN/meridia?posid=VNVN&page=flifoFlightInfoDetailsMessage_learn&action=flightInfoDetails&airline=VN&language=fr&depDay=".$check_date->format('j')."&depMonth=".strtoupper($check_date->format('M'))."&=&flight=".$numvol."&";
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			$flight = $table;
-			preg_match('/([A-Z]{3})/',$flight[3][0],$DepartureAirportIataMatch);
-			preg_match('/([A-Z]{3})/',$flight[21][0],$ArrivalAirportIataMatch);
+			preg_match('/([A-Z]{3})/', $flight[3][0], $DepartureAirportIataMatch);
+			preg_match('/([A-Z]{3})/', $flight[21][0], $ArrivalAirportIataMatch);
 			$DepartureAirportIata = $DepartureAirportIataMatch[0];
 			$ArrivalAirportIata = $ArrivalAirportIataMatch[0];
 			$departureTime = $flight[5][1];
 			$arrivalTime = $flight[23][1];
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_vietnamairlines');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_vietnamairlines');
 		}
 	}
 
@@ -788,16 +788,16 @@ 
 	* @param String $carrier airline code
 	* @return Flight departure and arrival airports and time
 	*/
-	private function getAirBerlin($callsign, $date = 'NOW',$carrier = 'AB') {
+	private function getAirBerlin($callsign, $date = 'NOW', $carrier = 'AB') {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
 		//AB = airberlin, HG/NLY = NIKI, 4T/BHP = Belair 
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
 		$check_date = new Datetime($date);
-		$url= "http://www.airberlin.com/en-US/site/aims.php";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
-		$post = array('type' => 'departure','searchFlightNo' => '1','requestsent' => 'true', 'flightno' => $numvol,'date' => $check_date->format('Y-m-d'),'carrier' => $carrier);
-		$data = $Common->getData($url,'post',$post);
+		$url = "http://www.airberlin.com/en-US/site/aims.php";
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
+		$post = array('type' => 'departure', 'searchFlightNo' => '1', 'requestsent' => 'true', 'flightno' => $numvol, 'date' => $check_date->format('Y-m-d'), 'carrier' => $carrier);
+		$data = $Common->getData($url, 'post', $post);
 		//echo $data;
 		$DepartureAirportIata = '';
 		$ArrivalAirportIata = '';
@@ -810,8 +810,8 @@ 
 			if (isset($flight[5][2])) $departureAirport = $flight[5][2];
 			else $departureAirport = '';
 		} else return array();
-		$post = array('type' => 'arrival','searchFlightNo' => '1','requestsent' => 'true', 'flightno' => $numvol,'date' => $check_date->format('Y-m-d'),'carrier' => 'AB');
-		$data = $Common->getData($url,'post',$post);
+		$post = array('type' => 'arrival', 'searchFlightNo' => '1', 'requestsent' => 'true', 'flightno' => $numvol, 'date' => $check_date->format('Y-m-d'), 'carrier' => 'AB');
+		$data = $Common->getData($url, 'post', $post);
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			$flight = $table;
@@ -839,13 +839,13 @@ 
 			}
 		}
 		if (isset($DepartureAirportIata)) {
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airberlin');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_airberlin');
 		} else return array();
 	}
 
 
 	
-	public function fetchSchedule($ident,$date = 'NOW') {
+	public function fetchSchedule($ident, $date = 'NOW') {
 		global $globalSchedulesSources, $globalSchedulesFetch;
 		//$Common = new Common();
 		if (!$globalSchedulesFetch) return array();
@@ -915,7 +915,7 @@ 
 				// Brussels Airlines
 				case "BEL":
 				case "SN":
-					return $this->getBrussels($ident,$date);
+					return $this->getBrussels($ident, $date);
 /*
 				// Copa Airlines
 				case "CMP":
@@ -1000,17 +1000,17 @@ 
 				// Air France
 				case "AF":
 				case "AFR":
-					return $this->getAirFrance($ident,$date,'AF');
+					return $this->getAirFrance($ident, $date, 'AF');
 				// HOP
 				case "A5":
 				case "HOP":
-					return $this->getAirFrance($ident,$date,'A5');
+					return $this->getAirFrance($ident, $date, 'A5');
 				// EasyJet
 				case "U2":
 				case "DS":
 				case "EZY":
 				case "EZS":
-					return $this->getEasyJet($ident,$date);
+					return $this->getEasyJet($ident, $date);
 				// Ryanair
 				case "FR":
 				case "RYR":
@@ -1060,25 +1060,25 @@ 
 					return $this->getIberia($ident);
 				// Vietnam Airlines
 				case "HVN":
-					return $this->getVietnamAirlines($ident,$date);
+					return $this->getVietnamAirlines($ident, $date);
 				// Air Berlin
 				case "AB":
 				case "BER":
-					return $this->getAirBerlin($ident,$date,'AB');
+					return $this->getAirBerlin($ident, $date, 'AB');
 				// NIKI
 				case "HG":
 				case "NLY":
-					return $this->getAirBerlin($ident,$date,'HG');
+					return $this->getAirBerlin($ident, $date, 'HG');
 				// BelAir
 				case "4T":
 				case "BHP":
-					return $this->getAirBerlin($ident,$date,'4T');
+					return $this->getAirBerlin($ident, $date, '4T');
 				default:
 					// Randomly use a generic function to get hours
 					if (strlen($airline_icao) == 2) {
-						if (!isset($globalSchedulesSources)) $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
+						if (!isset($globalSchedulesSources)) $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
 						if (count($globalSchedulesSources) > 0) {
-							$rand = mt_rand(0,count($globalSchedulesSources)-1);
+							$rand = mt_rand(0, count($globalSchedulesSources) - 1);
 							$source = $globalSchedulesSources[$rand];
 							if ($source == 'flightmapper') return $this->getFlightMapper($ident);
 							elseif ($source == 'costtotravel') return $this->getCostToTravel($ident);