Ysurac / FlightAirMap

registration-statistics-time.php

Spacing +5 added lines, -5 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);
-$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
 $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 $aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Time of Day of aircraft with registration %s"),$registration);
+	$title = sprintf(_("Most Common Time of Day of aircraft with registration %s"), $registration);
 	require_once('header.php');
   
 	print '<div class="info column">';
@@ -23,7 +23,7 @@ 
 	include('registration-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Time of Day").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common time of day from aircraft with registration <strong>%s</strong>."),$registration).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common time of day from aircraft with registration <strong>%s</strong>."), $registration).'</p>';
 
 	$hour_array = $Spotter->countAllHoursByRegistration($registration);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
@@ -35,7 +35,7 @@ 
             var data = google.visualization.arrayToDataTable([
             	["'._("Hour").'", "'._("# of Flights").'"], ';
             	$hour_data = '';
-	foreach($hour_array as $hour_item)
+	foreach ($hour_array as $hour_item)
 	{
 		$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';
 	}

Indentation +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
           function drawChart() {
             var data = google.visualization.arrayToDataTable([
             	["'._("Hour").'", "'._("# of Flights").'"], ';
-            	$hour_data = '';
+				$hour_data = '';
 	foreach($hour_array as $hour_item)
 	{
 		$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';

country-statistics-registration.php

Spacing +8 added lines, -8 removed lines

@@ -7,8 +7,8 @@ 
         die();
 }
 $Spotter = new Spotter();
-$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING)));
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 if (isset($_GET['sort'])) {
 	$spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
 } else {
@@ -17,16 +17,16 @@ 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft by registration from %s"),$country);
+	$title = sprintf(_("Most Common Aircraft by registration from %s"), $country);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/country" method="post">';
 	print '<select name="country" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$all_countries = $Spotter->getAllCountries();
-	foreach($all_countries as $all_country)
+	foreach ($all_countries as $all_country)
 	{
-		if($country == $all_country['country'])
+		if ($country == $all_country['country'])
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 		} else {
@@ -41,7 +41,7 @@ 
 	if ($_GET['country'] != "NA")
 	{
 		print '<div class="info column">';
-		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 		print '</div>';
 	} else {
 		print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -50,7 +50,7 @@ 
 	include('country-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft by Registration").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of airlines or departure/arrival airports from <strong>%s</strong>."),$country).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of airlines or departure/arrival airports from <strong>%s</strong>."), $country).'</p>';
 	$aircraft_array = $Spotter->countAllAircraftRegistrationByCountry($country);
 	if (!empty($aircraft_array))
 	{
@@ -65,7 +65,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>';

Indentation +2 added lines, -2 removed lines

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

route.php

Spacing +2 added lines, -2 removed lines

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

registration-statistics-arrival-airport.php

Spacing +7 added lines, -7 removed lines

@@ -3,16 +3,16 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-$sort=filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
 if ($registration != '') {
 	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 	$aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
-} else $spotter_array=array();
+} else $spotter_array = array();
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Arrival Airports of aircraft with registration %s"),$registration);
+	$title = sprintf(_("Most Common Arrival Airports of aircraft with registration %s"), $registration);
 
 	require_once('header.php');
 		print '<div class="info column">';
@@ -25,7 +25,7 @@ 
 	include('registration-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Arrival Airports").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights with aircraft registration <strong>%s</strong>."),$registration).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights with aircraft registration <strong>%s</strong>."), $registration).'</p>';
 	$airport_airport_array = $Spotter->countAllArrivalAirportsByRegistration($registration);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>
     	<script>
@@ -40,7 +40,7 @@ 
         	["'._("Airport").'", "'._("# of times").'"],';
 
 	$airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		$name = $airport_item['airport_arrival_city'].', '.$airport_item['airport_arrival_country'].' ('.$airport_item['airport_arrival_icao'].')';
 		$name = str_replace("'", "", $name);
@@ -78,7 +78,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 if ($registration != '') {
 	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 	$aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
-} else $spotter_array=array();
+} else {
+	$spotter_array=array();
+}
 
 if (!empty($spotter_array))
 {

sitemap.php

Indentation +107 added lines, -107 removed lines

@@ -15,9 +15,9 @@ 
 		foreach($spotter_array as $spotter_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>weekly</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>weekly</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -32,9 +32,9 @@ 
 		foreach($aircraft_types as $aircraft_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.$aircraft_item['aircraft_icao'].'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>daily</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.$aircraft_item['aircraft_icao'].'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>daily</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -49,9 +49,9 @@ 
 		foreach($aircraft_registrations as $aircraft_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.$aircraft_item['registration'].'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>daily</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.$aircraft_item['registration'].'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>daily</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -65,9 +65,9 @@ 
 		foreach($airline_names as $airline_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.$airline_item['airline_icao'].'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>daily</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.$airline_item['airline_icao'].'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>daily</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -81,9 +81,9 @@ 
 		foreach($airport_names as $airport_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>daily</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>daily</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -97,9 +97,9 @@ 
 		foreach($manufacturer_names as $manufacturer_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $manufacturer_item['aircraft_manufacturer'])).'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>daily</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $manufacturer_item['aircraft_manufacturer'])).'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>daily</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -113,9 +113,9 @@ 
 		foreach($country_names as $country_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/country/'.strtolower(str_replace(" ", "-", $country_item['country'])).'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>daily</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/country/'.strtolower(str_replace(" ", "-", $country_item['country'])).'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>daily</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -130,9 +130,9 @@ 
 		{
 			if (ctype_alnum($ident_item['ident'])) {
 				$output .= '<url>';
-				    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/ident/'.$ident_item['ident'].'</loc>';
-				    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-				    $output .= '<changefreq>daily</changefreq>';
+					$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/ident/'.$ident_item['ident'].'</loc>';
+					$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+					$output .= '<changefreq>daily</changefreq>';
 				$output .= '</url>';
 			}
 		}
@@ -147,9 +147,9 @@ 
 		foreach($date_names as $date_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>daily</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>daily</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -163,9 +163,9 @@ 
 		foreach($route_names as $route_item)
 		{
 			$output .= '<url>';
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/route/'.$route_item['airport_departure_icao'].'/'.$route_item['airport_arrival_icao'].'</loc>';
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-			    $output .= '<changefreq>daily</changefreq>';
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/route/'.$route_item['airport_departure_icao'].'/'.$route_item['airport_arrival_icao'].'</loc>';
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+				$output .= '<changefreq>daily</changefreq>';
 			$output .= '</url>';
 		}
 	$output .= '</urlset>';
@@ -177,117 +177,117 @@ 
 		
 		/* STATIC PAGES */
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/latest</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/latest</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/highlights</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/highlights</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/search</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/search</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/about</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>weekly</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/about</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>weekly</changefreq>';
 		$output .= '</url>';
 		
 		
 		/* STATISTIC PAGES */
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/aircraft</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/aircraft</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/registration</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/registration</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/manufacturer</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/manufacturer</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airline</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airline</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airline-country</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airline-country</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-departure</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-departure</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-departure-country</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-departure-country</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-arrival</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-arrival</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-arrival-country</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-arrival-country</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/route-airport</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/route-airport</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/route-waypoint</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/route-waypoint</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/callsign</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/callsign</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/date</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/date</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 		$output .= '<url>';
-		    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/time</loc>';
-		    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
-		    $output .= '<changefreq>daily</changefreq>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/time</loc>';
+			$output .= '<lastmod>'.date("c", time()).'</lastmod>';
+			$output .= '<changefreq>daily</changefreq>';
 		$output .= '</url>';
 	$output .= '</urlset>';
 	
@@ -297,37 +297,37 @@ 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/static</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/static</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/flight</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/flight</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/aircraft</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/aircraft</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/registration</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/registration</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/airline</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/airline</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/airport</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/airport</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/manufacturer</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/manufacturer</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/country</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/country</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/ident</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/ident</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/date</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/date</loc>';
 		$output .= '</sitemap>';
 		$output .= '<sitemap>';
-	    	$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/route</loc>';
+			$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/route</loc>';
 		$output .= '</sitemap>';
 	$output .= '</sitemapindex>';
 	

Spacing +20 added lines, -20 removed lines

@@ -12,7 +12,7 @@ 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$spotter_array = $Spotter->getAllFlightsforSitemap();
-		foreach($spotter_array as $spotter_item)
+		foreach ($spotter_array as $spotter_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>';
@@ -23,13 +23,13 @@ 
 	$output .= '</urlset>';
 	
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "aircraft"){
+} else if (isset($_GET['type']) && $_GET['type'] == "aircraft") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$aircraft_types = $Spotter->getAllAircraftTypes();
-		foreach($aircraft_types as $aircraft_item)
+		foreach ($aircraft_types as $aircraft_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.$aircraft_item['aircraft_icao'].'</loc>';
@@ -40,13 +40,13 @@ 
 	$output .= '</urlset>';
 	
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "registration"){
+} else if (isset($_GET['type']) && $_GET['type'] == "registration") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$aircraft_registrations = $Spotter->getAllAircraftRegistrations();
-		foreach($aircraft_registrations as $aircraft_item)
+		foreach ($aircraft_registrations as $aircraft_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.$aircraft_item['registration'].'</loc>';
@@ -56,13 +56,13 @@ 
 		}
 	$output .= '</urlset>';
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "airline"){
+} else if (isset($_GET['type']) && $_GET['type'] == "airline") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$airline_names = $Spotter->getAllAirlineNames();
-		foreach($airline_names as $airline_item)
+		foreach ($airline_names as $airline_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.$airline_item['airline_icao'].'</loc>';
@@ -72,13 +72,13 @@ 
 		}
 	$output .= '</urlset>';
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "airport"){
+} else if (isset($_GET['type']) && $_GET['type'] == "airport") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$airport_names = $Spotter->getAllAirportNames();
-		foreach($airport_names as $airport_item)
+		foreach ($airport_names as $airport_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>';
@@ -88,13 +88,13 @@ 
 		}
 	$output .= '</urlset>';
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "manufacturer"){
+} else if (isset($_GET['type']) && $_GET['type'] == "manufacturer") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$manufacturer_names = $Spotter->getAllManufacturers();
-		foreach($manufacturer_names as $manufacturer_item)
+		foreach ($manufacturer_names as $manufacturer_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $manufacturer_item['aircraft_manufacturer'])).'</loc>';
@@ -104,13 +104,13 @@ 
 		}
 	$output .= '</urlset>';
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "country"){
+} else if (isset($_GET['type']) && $_GET['type'] == "country") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$country_names = $Spotter->getAllCountries();
-		foreach($country_names as $country_item)
+		foreach ($country_names as $country_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/country/'.strtolower(str_replace(" ", "-", $country_item['country'])).'</loc>';
@@ -120,13 +120,13 @@ 
 		}
 	$output .= '</urlset>';
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "ident"){
+} else if (isset($_GET['type']) && $_GET['type'] == "ident") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$ident_names = $Spotter->getAllIdents();
-		foreach($ident_names as $ident_item)
+		foreach ($ident_names as $ident_item)
 		{
 			if (ctype_alnum($ident_item['ident'])) {
 				$output .= '<url>';
@@ -138,13 +138,13 @@ 
 		}
 	$output .= '</urlset>';
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "date"){
+} else if (isset($_GET['type']) && $_GET['type'] == "date") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$date_names = $Spotter->getAllDates();
-		foreach($date_names as $date_item)
+		foreach ($date_names as $date_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
@@ -154,13 +154,13 @@ 
 		}
 	$output .= '</urlset>';
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "route"){
+} else if (isset($_GET['type']) && $_GET['type'] == "route") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$route_names = $Spotter->getAllRoutes();
-		foreach($route_names as $route_item)
+		foreach ($route_names as $route_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/route/'.$route_item['airport_departure_icao'].'/'.$route_item['airport_arrival_icao'].'</loc>';
@@ -170,7 +170,7 @@ 
 		}
 	$output .= '</urlset>';
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "static"){
+} else if (isset($_GET['type']) && $_GET['type'] == "static") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';

polar-geojson.php

Spacing +6 added lines, -6 removed lines

@@ -17,10 +17,10 @@ 
 header('Content-Type: text/javascript');
 
 
-$polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
+$polar = $Stats->getStatsSource(date('Y-m-d'), 'polar');
 $output = '{"type": "FeatureCollection","features": [';
 if (!empty($polar)) {
-	foreach($polar as $eachpolar) {
+	foreach ($polar as $eachpolar) {
 		$data = json_decode($eachpolar['source_data']);
 		$name = $eachpolar['source_name'];
 		$coord = $Location->getLocationInfobySourceName($name);
@@ -33,15 +33,15 @@ 
 			$initial_longitude = $globalCenterLongitude;
 		}
 		$first = '';
-		foreach($data as $value => $key) {
-			$final_coord = $Common->getCoordfromDistanceBearing($initial_latitude,$initial_longitude,$value*22.5,$key);
-			if ($first == '') $first = '['.round($final_coord['longitude'],5).','.round($final_coord['latitude'],5).']';
+		foreach ($data as $value => $key) {
+			$final_coord = $Common->getCoordfromDistanceBearing($initial_latitude, $initial_longitude, $value*22.5, $key);
+			if ($first == '') $first = '['.round($final_coord['longitude'], 5).','.round($final_coord['latitude'], 5).']';
 			$output .= '['.$final_coord['longitude'].','.$final_coord['latitude'].'],';
 		}
 		$output .= $first;
 		$output .= ']]}},';
 	}
-	$output  = substr($output, 0, -1);
+	$output = substr($output, 0, -1);
 }
 $output .= ']}';
 print $output;

Braces +3 added lines, -1 removed lines

@@ -35,7 +35,9 @@
 		$first = '';
 		foreach($data as $value => $key) {
 			$final_coord = $Common->getCoordfromDistanceBearing($initial_latitude,$initial_longitude,$value*22.5,$key);
-			if ($first == '') $first = '['.round($final_coord['longitude'],5).','.round($final_coord['latitude'],5).']';
+			if ($first == '') {
+				$first = '['.round($final_coord['longitude'],5).','.round($final_coord['latitude'],5).']';
+			}
 			$output .= '['.$final_coord['longitude'].','.$final_coord['latitude'].'],';
 		}
 		$output .= $first;

archive-geojson.php

Indentation +8 added lines, -8 removed lines

@@ -9,10 +9,10 @@ 
 $Common = new Common();
 
 if (isset($_GET['download'])) {
-    if ($_GET['download'] == "true")
-    {
+	if ($_GET['download'] == "true")
+	{
 	header('Content-disposition: attachment; filename="flightairmap.json"');
-    }
+	}
 }
 header('Content-Type: text/javascript');
 
@@ -91,7 +91,7 @@ 
 				}
 
 				//waypoint plotting
-                /*
+				/*
 				$output .= '{';
 					$output .= '"type": "Feature",';
 						$output .= '"properties": {';
@@ -270,8 +270,8 @@ 
 					$output_time .= (strtotime($spotter_history['date'])*1000).',';
 				}
 				if (isset($output_time)) {
-				    $output_time  = substr($output_time, 0, -1);
-				    $output .= '"time": ['.$output_time.'],';
+					$output_time  = substr($output_time, 0, -1);
+					$output .= '"time": ['.$output_time.'],';
 				}
 
 
@@ -285,8 +285,8 @@ 
 						$output .= '"coordinates": [';
 						
 				if (isset($output_history)) {
-				    $output_history  = substr($output_history, 0, -1);
-				    $output .= $output_history;
+					$output_history  = substr($output_history, 0, -1);
+					$output .= $output_history;
 				}
 				
 						$output .= ']';

Spacing +26 added lines, -26 removed lines

@@ -23,13 +23,13 @@ 
 $min = false;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',',$_COOKIE['Airlines']);
-if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
+if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',', $_COOKIE['Airlines']);
+if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',', $_COOKIE['Sources']);
 if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') $filter['airlinestype'] = $_COOKIE['airlinestype'];
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
@@ -37,12 +37,12 @@ 
 }
 
 if (isset($_GET['ident'])) {
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	$from_archive = true;
 	$spotter_array = $SpotterArchive->getLastArchiveSpotterDataByIdent($ident);
 	$allhistory = true;
 } elseif (isset($_GET['flightaware_id'])) {
-	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+	$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	$from_archive = true;
 	$spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
 	$allhistory = true;
@@ -50,20 +50,20 @@ 
 	$from_archive = true;
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
 //	$enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
-	$begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
-	$enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
-	$archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
-	$begindate = date('Y-m-d H:i:s',$begindate);
-	$enddate = date('Y-m-d H:i:s',$enddate);
-	$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate,$enddate,$filter);
+	$begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
+	$enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
+	$archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
+	$begindate = date('Y-m-d H:i:s', $begindate);
+	$enddate = date('Y-m-d H:i:s', $enddate);
+	$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate, $enddate, $filter);
 }
 
 if (!empty($spotter_array)) {
-	$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
+	$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
 	if ($flightcnt == '') $flightcnt = 0;
 } else $flightcnt = 0;
 
-$sqltime = round(microtime(true)-$begintime,2);
+$sqltime = round(microtime(true) - $begintime, 2);
 
 //var_dump($spotter_array);
 $j = 0;
@@ -78,7 +78,7 @@ 
 		if (!empty($spotter_array) && is_array($spotter_array))
 		{
 			$output .= '"features": [';
-			foreach($spotter_array as $spotter_item)
+			foreach ($spotter_array as $spotter_item)
 			{
 				$j++;
 				date_default_timezone_set('UTC');
@@ -161,7 +161,7 @@ 
 						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
-							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
+							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ', '_', $spotter_item['aircraft_name'])).'",';
 						} elseif (isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "NA ('.$spotter_item['aircraft_type'].')",';
 						} elseif (!$min) {
@@ -228,15 +228,15 @@ 
 						if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
 						else $output .= '"heading": "'.$spotter_item['heading'].'",';
 						
-						if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
-						else $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
+						if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading'], $archivespeed);
+						else $nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading']);
 						//$output .= '"nextlatitude": "'.$nextcoord['latitude'].'",';
 						//$output .= '"nextlongitude": "'.$nextcoord['longitude'].'",';
 						$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 
 						if (!$min) $output .= '"image": "'.$image.'",';
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
-							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
+							$output .= '"image_copyright": "'.str_replace('"', "'", trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $spotter_item['image_copyright']))).'",';
 						}
 						if (isset($spotter_item['image_source_website'])) {
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
@@ -258,7 +258,7 @@ 
 							$output .= '"waypoints": "'.$spotter_item['waypoints'].'",';
 						}
 						if (isset($spotter_item['acars'])) {
-							$output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",';
+							$output .= '"acars": "'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br />', $spotter_item['acars']['message'])).'",';
 						}
 						$spotter_history_array = $SpotterArchive->getCoordArchiveSpotterDataById($spotter_item['flightaware_id']);
 						//$spotter_history_array = array();
@@ -270,7 +270,7 @@ 
 					$output_time .= (strtotime($spotter_history['date'])*1000).',';
 				}
 				if (isset($output_time)) {
-				    $output_time  = substr($output_time, 0, -1);
+				    $output_time = substr($output_time, 0, -1);
 				    $output .= '"time": ['.$output_time.'],';
 				}
 
@@ -285,7 +285,7 @@ 
 						$output .= '"coordinates": [';
 						
 				if (isset($output_history)) {
-				    $output_history  = substr($output_history, 0, -1);
+				    $output_history = substr($output_history, 0, -1);
 				    $output .= $output_history;
 				}
 				
@@ -297,7 +297,7 @@ 
 			$output  = substr($output, 0, -1);
 			$output .= ']';
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
-			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
+			$output .= '"totaltime": "'.round(microtime(true) - $begintime, 2).'",';
 			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
 			$output .= '"fc": "'.$flightcnt.'"';
 		} else {

Braces +120 added lines, -46 removed lines

@@ -16,21 +16,40 @@ 
 }
 header('Content-Type: text/javascript');
 
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 
 $from_archive = false;
 $min = false;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',',$_COOKIE['Airlines']);
-if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
-if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') $filter['airlinestype'] = $_COOKIE['airlinestype'];
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('sbs'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
+}
+if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') {
+	$filter['airlines'] = explode(',',$_COOKIE['Airlines']);
+}
+if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') {
+	$filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
+}
+if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') {
+	$filter['airlinestype'] = $_COOKIE['airlinestype'];
+}
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
@@ -60,8 +79,12 @@ 
 
 if (!empty($spotter_array)) {
 	$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
-	if ($flightcnt == '') $flightcnt = 0;
-} else $flightcnt = 0;
+	if ($flightcnt == '') {
+		$flightcnt = 0;
+	}
+	} else {
+	$flightcnt = 0;
+}
 
 $sqltime = round(microtime(true)-$begintime,2);
 
@@ -70,8 +93,11 @@ 
 
 $output = '{';
 	$output .= '"type": "FeatureCollection",';
-		if ($min) $output .= '"minimal": "true",';
-		else $output .= '"minimal": "false",';
+		if ($min) {
+			$output .= '"minimal": "true",';
+		} else {
+			$output .= '"minimal": "false",';
+		}
 		$output .= '"fc": "'.$flightcnt.'",';
 		$output .= '"sqt": "'.$sqltime.'",';
 
@@ -140,11 +166,16 @@ 
 						//$output .= '"fc": "'.$flightcnt.'",';
 						//$output .= '"sqt": "'.$sqltime.'",';
 						$output .= '"properties": {';
-							if ($compress) $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
-							else $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
+							if ($compress) {
+								$output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
+							} else {
+								$output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
+							}
 							$output .= '"fc": "'.$flightcnt.'",';
 							$output .= '"sqt": "'.$sqltime.'",';
-							if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
+							if (isset($begindate)) {
+								$output .= '"archive_date": "'.$begindate.'",';
+							}
 
 /*
 							if ($min) $output .= '"minimal": "true",';
@@ -152,13 +183,21 @@ 
 */
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
-							if ($compress) $output .= '"c": "'.$spotter_item['ident'].'",';
-							else $output .= '"callsign": "'.$spotter_item['ident'].'",';
+							if ($compress) {
+								$output .= '"c": "'.$spotter_item['ident'].'",';
+							} else {
+								$output .= '"callsign": "'.$spotter_item['ident'].'",';
+							}
 						} else {
-							if ($compress) $output .= '"c": "NA",';
-							else $output .= '"callsign": "NA",';
+							if ($compress) {
+								$output .= '"c": "NA",';
+							} else {
+								$output .= '"callsign": "NA",';
+							}
+						}
+						if (isset($spotter_item['registration'])) {
+							$output .= '"registration": "'.$spotter_item['registration'].'",';
 						}
-						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
 							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
@@ -171,19 +210,29 @@ 
 							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
 						}
 						if (!isset($spotter_item['aircraft_shadow'])) {
-							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = '';
-							else {
+							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') {
+								$spotter_item['aircraft_shadow'] = '';
+							} else {
 								$aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']);
-								if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
-								else $spotter_item['aircraft_shadow'] = '';
+								if (count($aircraft_info) > 0) {
+									$spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
+								} else {
+									$spotter_item['aircraft_shadow'] = '';
+								}
 							}
 						}
 						if ($spotter_item['aircraft_shadow'] == '') {
-							if ($compress) $output .= '"as": "default.png",';
-							else $output .= '"aircraft_shadow": "default.png",';
+							if ($compress) {
+								$output .= '"as": "default.png",';
+							} else {
+								$output .= '"aircraft_shadow": "default.png",';
+							}
 						} else {
-							if ($compress) $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
-							else $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
+							if ($compress) {
+								$output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
+							} else {
+								$output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
+							}
 						}
 						if (isset($spotter_item['airline_name'])) {
 							$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
@@ -191,8 +240,11 @@ 
 							$output .= '"airline_name": "NA",';
 						}
 						if (isset($spotter_item['departure_airport'])) {
-							if ($compress) $output .= '"dac": "'.$spotter_item['departure_airport'].'",';
-							else $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
+							if ($compress) {
+								$output .= '"dac": "'.$spotter_item['departure_airport'].'",';
+							} else {
+								$output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
+							}
 						}
 						if (isset($spotter_item['departure_airport_city'])) {
 							$output .= '"departure_airport": "'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_country'].'",';
@@ -204,8 +256,11 @@ 
 							$output .= '"arrival_airport_time": "'.$spotter_item['arrival_airport_time'].'",';
 						}
 						if (isset($spotter_item['arrival_airport'])) {
-							if ($compress) $output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
-							else $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
+							if ($compress) {
+								$output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
+							} else {
+								$output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
+							}
 						}
 						if (isset($spotter_item['arrival_airport_city'])) {
 							$output .= '"arrival_airport": "'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].'",';
@@ -223,18 +278,29 @@ 
 							$output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
 						}
 						
-						if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",';
-						else $output .= '"altitude": "'.$spotter_item['altitude'].'",';
-						if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
-						else $output .= '"heading": "'.$spotter_item['heading'].'",';
+						if ($compress) {
+							$output .= '"a": "'.$spotter_item['altitude'].'",';
+						} else {
+							$output .= '"altitude": "'.$spotter_item['altitude'].'",';
+						}
+						if ($compress) {
+							$output .= '"h": "'.$spotter_item['heading'].'",';
+						} else {
+							$output .= '"heading": "'.$spotter_item['heading'].'",';
+						}
 						
-						if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
-						else $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
+						if (isset($archivespeed)) {
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
+						} else {
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
+						}
 						//$output .= '"nextlatitude": "'.$nextcoord['latitude'].'",';
 						//$output .= '"nextlongitude": "'.$nextcoord['longitude'].'",';
 						$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 
-						if (!$min) $output .= '"image": "'.$image.'",';
+						if (!$min) {
+							$output .= '"image": "'.$image.'",';
+						}
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
 							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
 						}
@@ -242,8 +308,11 @@ 
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
 						}
 						if (isset($spotter_item['squawk'])) {
-							if ($compress) $output .= '"sq": "'.$spotter_item['squawk'].'",';
-							else $output .= '"squawk": "'.$spotter_item['squawk'].'",';
+							if ($compress) {
+								$output .= '"sq": "'.$spotter_item['squawk'].'",';
+							} else {
+								$output .= '"squawk": "'.$spotter_item['squawk'].'",';
+							}
 						}
 						if (isset($spotter_item['squawk_usage'])) {
 							$output .= '"squawk_usage": "'.$spotter_item['squawk_usage'].'",';
@@ -277,8 +346,11 @@ 
 
 
 							// FIXME : type when not aircraft ?
-						if ($compress) $output .= '"t": "aircraft"';
-						else $output .= '"type": "aircraft"';
+						if ($compress) {
+							$output .= '"t": "aircraft"';
+						} else {
+							$output .= '"type": "aircraft"';
+						}
 						$output .= '},';
 						$output .= '"geometry": {';
 						$output .= '"type": "MultiPoint",';
@@ -298,7 +370,9 @@ 
 			$output .= ']';
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
 			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
-			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
+			if (isset($begindate)) {
+				$output .= '"archive_date": "'.$begindate.'",';
+			}
 			$output .= '"fc": "'.$flightcnt.'"';
 		} else {
 			$output .= '"features": ';

getImages.php

Spacing +14 added lines, -14 removed lines

@@ -4,9 +4,9 @@ 
 	$hex = str_replace("#", "", $hex);
 	$color = array();
 	if (strlen($hex) == 3) {
-	    $color['r'] = hexdec(substr($hex, 0, 1) . substr($hex,0,1));
-	    $color['g'] = hexdec(substr($hex, 1, 1) . substr($hex,1,1));
-	    $color['b'] = hexdec(substr($hex, 2, 1) . substr($hex,2,1));
+	    $color['r'] = hexdec(substr($hex, 0, 1).substr($hex, 0, 1));
+	    $color['g'] = hexdec(substr($hex, 1, 1).substr($hex, 1, 1));
+	    $color['b'] = hexdec(substr($hex, 2, 1).substr($hex, 2, 1));
 	} else if (strlen($hex) == 6) {
 	    $color['r'] = hexdec(substr($hex, 0, 2));
 	    $color['g'] = hexdec(substr($hex, 2, 2));
@@ -16,7 +16,7 @@ 
 }
 
 
-if (!isset($_GET['color']) || $_GET['color'] == '' || !preg_match('/^([a-fA-F0-9]){3}(([a-fA-F0-9]){3})?\b/',$_GET['color'])) { 
+if (!isset($_GET['color']) || $_GET['color'] == '' || !preg_match('/^([a-fA-F0-9]){3}(([a-fA-F0-9]){3})?\b/', $_GET['color'])) { 
     exit(0);
 }
 $color = $_GET['color'];
@@ -37,15 +37,15 @@ 
 
 if (extension_loaded('gd') && function_exists('gd_info')) {
     $image = imagecreatefrompng($original);
-    $index = imagecolorexact($image,26,49,81);
+    $index = imagecolorexact($image, 26, 49, 81);
     if ($index < 0) {
-	$index = imagecolorexact($image,25,49,79);
+	$index = imagecolorexact($image, 25, 49, 79);
     }
     if ($index < 0) {
-	$index = imagecolorexact($image,0,0,0);
+	$index = imagecolorexact($image, 0, 0, 0);
     }
     $c = hexToRGB($color);
-    imagecolorset($image,$index,$c['r'],$c['g'],$c['b']);
+    imagecolorset($image, $index, $c['r'], $c['g'], $c['b']);
  /*
     $ig = imagecolorat($image, 0, 0);
     imagecolortransparent($image, $ig);
@@ -53,14 +53,14 @@ 
 
     header('Content-type: image/png');
     if (isset($_GET['resize']) && function_exists('imagecopyresampled')) {
-	$resize = filter_input(INPUT_GET,'resize',FILTER_SANITIZE_NUMBER_INT);
-	$newimg = imagecreatetruecolor($resize,$resize);
+	$resize = filter_input(INPUT_GET, 'resize', FILTER_SANITIZE_NUMBER_INT);
+	$newimg = imagecreatetruecolor($resize, $resize);
         imagealphablending($newimg, false);
 	imagesavealpha($newimg, true);
-	imagecopyresampled($newimg,$image,0,0,0,0,15,15,imagesx($image),imagesy($image));
+	imagecopyresampled($newimg, $image, 0, 0, 0, 0, 15, 15, imagesx($image), imagesy($image));
 	if (isset($_GET['heading'])) {
-    	    $heading = filter_input(INPUT_GET,'heading',FILTER_SANITIZE_NUMBER_INT);
-    	    $rotation = imagerotate($newimg,$heading,imageColorAllocateAlpha($newimg,0,0,0,127));
+    	    $heading = filter_input(INPUT_GET, 'heading', FILTER_SANITIZE_NUMBER_INT);
+    	    $rotation = imagerotate($newimg, $heading, imageColorAllocateAlpha($newimg, 0, 0, 0, 127));
     	    imagealphablending($rotation, false);
 	    imagesavealpha($rotation, true);
     	    imagepng($rotation);
@@ -79,7 +79,7 @@ 
 	imagepng($image);
 	imagepng($image);
 	if (is_writable('cache')) {
-    	    imagepng($image,dirname(__FILE__).DIRECTORY_SEPARATOR.'cache/'.$color.'-'.$filename);
+    	    imagepng($image, dirname(__FILE__).DIRECTORY_SEPARATOR.'cache/'.$color.'-'.$filename);
 	}
         imagedestroy($image);
     }

Indentation +49 added lines, -49 removed lines

@@ -4,31 +4,31 @@ 
 	$hex = str_replace("#", "", $hex);
 	$color = array();
 	if (strlen($hex) == 3) {
-	    $color['r'] = hexdec(substr($hex, 0, 1) . substr($hex,0,1));
-	    $color['g'] = hexdec(substr($hex, 1, 1) . substr($hex,1,1));
-	    $color['b'] = hexdec(substr($hex, 2, 1) . substr($hex,2,1));
+		$color['r'] = hexdec(substr($hex, 0, 1) . substr($hex,0,1));
+		$color['g'] = hexdec(substr($hex, 1, 1) . substr($hex,1,1));
+		$color['b'] = hexdec(substr($hex, 2, 1) . substr($hex,2,1));
 	} else if (strlen($hex) == 6) {
-	    $color['r'] = hexdec(substr($hex, 0, 2));
-	    $color['g'] = hexdec(substr($hex, 2, 2));
-	    $color['b'] = hexdec(substr($hex, 4, 2));
+		$color['r'] = hexdec(substr($hex, 0, 2));
+		$color['g'] = hexdec(substr($hex, 2, 2));
+		$color['b'] = hexdec(substr($hex, 4, 2));
 	}
 	return $color;
 }
 
 
 if (!isset($_GET['color']) || $_GET['color'] == '' || !preg_match('/^([a-fA-F0-9]){3}(([a-fA-F0-9]){3})?\b/',$_GET['color'])) { 
-    exit(0);
+	exit(0);
 }
 $color = $_GET['color'];
 if (!isset($_GET['filename']) || !preg_match('/^[a-z0-9-_]+\.png$/', strtolower($_GET['filename']))) {
-    echo "Incorrect filename";
-    exit(0);
+	echo "Incorrect filename";
+	exit(0);
 }
 $filename = $_GET['filename'];
 if (file_exists(dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.$color.'-'.$filename)) {
-    header('Content-type: image/png');
-    readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.$color.'-'.$filename);
-    exit(0);
+	header('Content-type: image/png');
+	readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.$color.'-'.$filename);
+	exit(0);
 }
 if (isset($_GET['tracker'])) {
 	$original = dirname(__FILE__).DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.'vehicules'.DIRECTORY_SEPARATOR.$filename;
@@ -38,66 +38,66 @@ 
 	$original = dirname(__FILE__).DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.'aircrafts'.DIRECTORY_SEPARATOR.'new'.DIRECTORY_SEPARATOR.$filename;
 }
 if (!file_exists($original)) {
-    echo "File not found";
+	echo "File not found";
 }
 
 if (extension_loaded('gd') && function_exists('gd_info')) {
-    $image = imagecreatefrompng($original);
-    $index = imagecolorexact($image,26,49,81);
-    if ($index < 0) {
+	$image = imagecreatefrompng($original);
+	$index = imagecolorexact($image,26,49,81);
+	if ($index < 0) {
 	$index = imagecolorexact($image,25,49,79);
-    }
-    if ($index < 0) {
+	}
+	if ($index < 0) {
 	$index = imagecolorexact($image,0,0,0);
-    }
-    $c = hexToRGB($color);
-    imagecolorset($image,$index,$c['r'],$c['g'],$c['b']);
+	}
+	$c = hexToRGB($color);
+	imagecolorset($image,$index,$c['r'],$c['g'],$c['b']);
  /*
     $ig = imagecolorat($image, 0, 0);
     imagecolortransparent($image, $ig);
    */
 
-    header('Content-type: image/png');
-    if (isset($_GET['resize']) && function_exists('imagecopyresampled')) {
+	header('Content-type: image/png');
+	if (isset($_GET['resize']) && function_exists('imagecopyresampled')) {
 	$resize = filter_input(INPUT_GET,'resize',FILTER_SANITIZE_NUMBER_INT);
 	$newimg = imagecreatetruecolor($resize,$resize);
-        imagealphablending($newimg, false);
+		imagealphablending($newimg, false);
 	imagesavealpha($newimg, true);
 	imagecopyresampled($newimg,$image,0,0,0,0,15,15,imagesx($image),imagesy($image));
 	if (isset($_GET['heading'])) {
-    	    $heading = filter_input(INPUT_GET,'heading',FILTER_SANITIZE_NUMBER_INT);
-    	    $rotation = imagerotate($newimg,$heading,imageColorAllocateAlpha($newimg,0,0,0,127));
-    	    imagealphablending($rotation, false);
-	    imagesavealpha($rotation, true);
-    	    imagepng($rotation);
-    	    imagedestroy($newimg);
-    	    imagedestroy($image);
-    	    imagedestroy($rotation);
+			$heading = filter_input(INPUT_GET,'heading',FILTER_SANITIZE_NUMBER_INT);
+			$rotation = imagerotate($newimg,$heading,imageColorAllocateAlpha($newimg,0,0,0,127));
+			imagealphablending($rotation, false);
+		imagesavealpha($rotation, true);
+			imagepng($rotation);
+			imagedestroy($newimg);
+			imagedestroy($image);
+			imagedestroy($rotation);
 	
 	} else {
-    	    imagepng($newimg);
-    	    imagedestroy($newimg);
-    	    imagedestroy($image);
-        }
-    } else {
+			imagepng($newimg);
+			imagedestroy($newimg);
+			imagedestroy($image);
+		}
+	} else {
 	imagealphablending($image, false);
-        imagesavealpha($image, true);
+		imagesavealpha($image, true);
 	imagepng($image);
 	imagepng($image);
 	if (is_writable('cache')) {
-    	    imagepng($image,dirname(__FILE__).DIRECTORY_SEPARATOR.'cache/'.$color.'-'.$filename);
+			imagepng($image,dirname(__FILE__).DIRECTORY_SEPARATOR.'cache/'.$color.'-'.$filename);
+	}
+		imagedestroy($image);
 	}
-        imagedestroy($image);
-    }
 } else {
-    header('Content-type: image/png');
-    if (isset($_GET['tracker'])) {
-        readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename);
-    } elseif (isset($_GET['marine'])) {
-        readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename);
-    } else {
-        if ($color == 'FF0000') readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename);
+	header('Content-type: image/png');
+	if (isset($_GET['tracker'])) {
+		readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename);
+	} elseif (isset($_GET['marine'])) {
+		readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename);
+	} else {
+		if ($color == 'FF0000') readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename);
 	else readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/'.$filename);
-    }
+	}
 }
 ?>
\ No newline at end of file

Braces +5 added lines, -2 removed lines

@@ -96,8 +96,11 @@
     } elseif (isset($_GET['marine'])) {
         readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename);
     } else {
-        if ($color == 'FF0000') readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename);
-	else readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/'.$filename);
+        if ($color == 'FF0000') {
+        	readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename);
+        } else {
+		readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/'.$filename);
+	}
     }
 }
 ?>
\ No newline at end of file

require/class.ACARS.php

Indentation +72 added lines, -72 removed lines

@@ -16,11 +16,11 @@ 
 		$this->SI = new SpotterImport($this->db);
 	}
 	/**
-	* Change IATA to ICAO value for ident
-	*
-	* @param String $ident ident
-	* @return String the icao
-	*/
+	 * Change IATA to ICAO value for ident
+	 *
+	 * @param String $ident ident
+	 * @return String the icao
+	 */
 	public function ident2icao($ident) {
 		if (substr($ident,0,2) == 'AF') {
 			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
@@ -36,11 +36,11 @@ 
 	}
 
 	/**
-	* Deletes all info in the live table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the live table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveAcarsData()
 	{
 		global $globalDBdriver;
@@ -60,11 +60,11 @@ 
 	}
 
 	/**
-	* Deletes all info in the archive table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the archive table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteArchiveAcarsData()
 	{
 		global $globalACARSArchiveKeepMonths, $globalDBdriver;
@@ -85,11 +85,11 @@ 
 
 
 	/**
-	* Parse ACARS data
-	*
-	* @param String ACARS data in acarsdec data
-	*
-	*/
+	 * Parse ACARS data
+	 *
+	 * @param String ACARS data in acarsdec data
+	 *
+	 */
 	public function parse($data) {
 		global $globalDebug, $globalACARSArchive;
 		//$Image = new Image($this->db);
@@ -666,11 +666,11 @@ 
 
 
 	/**
-	* Add ACARS data
-	*
-	* @param String ACARS data in acarsdec data
-	*
-	*/
+	 * Add ACARS data
+	 *
+	 * @param String ACARS data in acarsdec data
+	 *
+	 */
 	function add($data) {
 		global $globalDebug, $globalACARSArchive;
 		$Image = new Image($this->db);
@@ -725,15 +725,15 @@ 
 	}
 
 	/**
-	* Add Live ACARS data in DB
-	*
-	* @param String $ident ident
-	* @param String $registration Registration of the aircraft
-	* @param String $label Label of the ACARS message
-	* @param String $block_id Block id of the ACARS message
-	* @param String $msg_no Number of the ACARS message
-	* @param String $message ACARS message
-	*/
+	 * Add Live ACARS data in DB
+	 *
+	 * @param String $ident ident
+	 * @param String $registration Registration of the aircraft
+	 * @param String $label Label of the ACARS message
+	 * @param String $block_id Block id of the ACARS message
+	 * @param String $msg_no Number of the ACARS message
+	 * @param String $message ACARS message
+	 */
 	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
@@ -771,15 +771,15 @@ 
 	}
 
 	/**
-	* Add Archive ACARS data in DB
-	*
-	* @param String $ident ident
-	* @param String $registration Registration of the aircraft
-	* @param String $label Label of the ACARS message
-	* @param String $block_id Block id of the ACARS message
-	* @param String $msg_no Number of the ACARS message
-	* @param String $message ACARS message
-	*/
+	 * Add Archive ACARS data in DB
+	 *
+	 * @param String $ident ident
+	 * @param String $registration Registration of the aircraft
+	 * @param String $label Label of the ACARS message
+	 * @param String $block_id Block id of the ACARS message
+	 * @param String $msg_no Number of the ACARS message
+	 * @param String $message ACARS message
+	 */
 	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
@@ -813,11 +813,11 @@ 
 	}
 
 	/**
-	* Get Message title from label from DB
-	*
-	* @param String $label
-	* @return String Return ACARS title
-	*/
+	 * Get Message title from label from DB
+	 *
+	 * @param String $label
+	 * @return String Return ACARS title
+	 */
 	public function getTitlefromLabel($label) {
 		$Connection = new Connection($this->db);
 		$this->db = $Connection->db;
@@ -837,10 +837,10 @@ 
 	}
 
 	/**
-	* List all Message title & label from DB
-	*
-	* @return Array Return ACARS data in array
-	*/
+	 * List all Message title & label from DB
+	 *
+	 * @return Array Return ACARS data in array
+	 */
 	public function getAllTitleLabel() {
 		$query = "SELECT * FROM acars_label ORDER BY title";
 		$query_values = array();
@@ -858,11 +858,11 @@ 
 	}
 
 	/**
-	* Get Live ACARS data from DB
-	*
-	* @param String $ident
-	* @return Array Return ACARS data in array
-	*/
+	 * Get Live ACARS data from DB
+	 *
+	 * @param String $ident
+	 * @return Array Return ACARS data in array
+	 */
 	public function getLiveAcarsData($ident) {
 		$query = "SELECT * FROM acars_live WHERE ident = :ident ORDER BY acars_live_id DESC";
 		$query_values = array(':ident' => $ident);
@@ -880,10 +880,10 @@ 
 	}
 
 	/**
-	* Get Latest ACARS data from DB
-	*
-	* @return Array Return ACARS data in array
-	*/
+	 * Get Latest ACARS data from DB
+	 *
+	 * @return Array Return ACARS data in array
+	 */
 	public function getLatestAcarsData($limit = '',$label = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
@@ -980,10 +980,10 @@ 
 	}
 
 	/**
-	* Get Archive ACARS data from DB
-	*
-	* @return Array Return ACARS data in array
-	*/
+	 * Get Archive ACARS data from DB
+	 *
+	 * @return Array Return ACARS data in array
+	 */
 	public function getArchiveAcarsData($limit = '',$label = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
@@ -1085,13 +1085,13 @@ 
 	}
 
 	/**
-	* Add ModeS data to DB
-	*
-	* @param String $ident ident
-	* @param String $registration Registration of the aircraft
-	* @param String $icao
-	* @param String $ICAOTypeCode
-	*/
+	 * Add ModeS data to DB
+	 *
+	 * @param String $ident ident
+	 * @param String $registration Registration of the aircraft
+	 * @param String $icao
+	 * @param String $ICAOTypeCode
+	 */
 	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
 		global $globalDebug, $globalDBdriver;
 		$ident = trim($ident);

Spacing +255 added lines, -255 removed lines

@@ -22,14 +22,14 @@ 
 	* @return String the icao
 	*/
 	public function ident2icao($ident) {
-		if (substr($ident,0,2) == 'AF') {
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+		if (substr($ident, 0, 2) == 'AF') {
+			if (filter_var(substr($ident, 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
+			else $icao = 'AFR'.ltrim(substr($ident, 2), '0');
 		} else {
 			$Spotter = new Spotter($this->db);
-			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
+			$identicao = $Spotter->getAllAirlineInfo(substr($ident, 0, 2));
 			if (isset($identicao[0])) {
-				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
+				$icao = $identicao[0]['icao'].ltrim(substr($ident, 2), '0');
 			} else $icao = $ident;
 		}
 		return $icao;
@@ -53,7 +53,7 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 		return "success";
@@ -77,7 +77,7 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 		return "success";
@@ -102,13 +102,13 @@ 
 		$ident = '';
 		$message = '';
 		$result = array();
-		$n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		$n = sscanf($data, '(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
+		if ($n == 0) $n = sscanf($data, 'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
+		if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
+		if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
 		if ($n != 0) {
-			$registration = str_replace('.','',$registration);
-			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
+			$registration = str_replace('.', '', $registration);
+			$result = array('registration' => $registration, 'ident' => $ident, 'label' => $label, 'block_id' => $block_id, 'msg_no' => $msg_no, 'message' => $message);
 			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
 		} else $message = $data;
 		$decode = array();
@@ -128,14 +128,14 @@ 
 				$temp = '';
 				$n = sscanf($message, "FST01%4c%4c%c%06d%c%07d%03d%*8[0-9a-zA-Z ]-%02dC", $dair, $darr, $lac, $la, $lnc, $ln, $alt, $temp);
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
-					$latitude = $la / 10000.0;
-					$longitude = $ln / 10000.0;
+					$latitude = $la/10000.0;
+					$longitude = $ln/10000.0;
 					if ($lac == 'S') $latitude = '-'.$latitude;
 					if ($lnc == 'W') $longitude = '-'.$longitude;
 					// Temp not always available
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
+					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => $alt);
+					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt, 'Temperature' => $temp.'°C');
 
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -147,19 +147,19 @@ 
 				$dhour = '';
 				$darr = '';
 				$ahour = '';
-				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
+				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr, $ahour);
 				if ($n == 4 && strlen($darr) == 4) {
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
+					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '.$darr.' - departure hour : '.$dhour.' - arrival hour : '.$ahour."\n";
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
 					$found = true;
 				}
-				elseif ($n == 2 || $n  == 4) {
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
+				elseif ($n == 2 || $n == 4) {
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
 					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
@@ -217,11 +217,11 @@ 
 				$ahour = '';
 				$aair = '';
 				$apiste = '';
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste);
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao, $aident, $dair, $darr, $ddate, $dhour, $ahour, $aair, $apiste);
 				if ($n > 8) {
-					if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
+					if ($globalDebug) echo 'airicao : '.$airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '.$darr.' - date depart : '.$ddate.' - departure hour : '.$dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
 					$icao = trim($aident);
 
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
@@ -246,8 +246,8 @@ 
 				if ($n == 10 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
 					$las = $las.'.'.$lass;
 					$lns = $lns.'.'.$lns;
-					$latitude = $las / 1000.0;
-					$longitude = $lns / 1000.0;
+					$latitude = $las/1000.0;
+					$longitude = $lns/1000.0;
 					if ($lac == 'S') $latitude = '-'.$latitude;
 					if ($lnc == 'W') $longitude = '-'.$longitude;
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
@@ -342,17 +342,17 @@ 
 				$alt = '';
 				$fuel = '';
 				$speed = '';
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed);
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed);
 				if ($n == 9) {
 					//if (self->$debug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
 					$icao = trim($aident);
 					$decode['icao'] = $icao;
-					$latitude = $las / 100.0;
-					$longitude = $lns / 100.0;
+					$latitude = $las/100.0;
+					$longitude = $lns/100.0;
 					if ($lac == 'S') $latitude = '-'.$latitude;
 					if ($lnc == 'W') $longitude = '-'.$longitude;
 
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Altitude' => 'FL'.$alt, 'Fuel' => $fuel, 'speed' => $speed);
 					$found = true;
 				}
 			}
@@ -371,7 +371,7 @@ 
 					if ($lac == 'S') $latitude = '-'.$latitude;
 					if ($lnc == 'W') $longitude = '-'.$longitude;
 
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
 					$found = true;
 				}
 			}
@@ -404,7 +404,7 @@ 
 				$dair = '';
 				$darr = '';
 				$aident = '';
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
 				if ($n == 8) {
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
 					$icao = trim($aident);
@@ -437,7 +437,7 @@ 
 				*/
 				$dair = '';
 				$darr = '';
-				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
+				$n = sscanf($message, '%4[A-Z]%4[A-Z]%*4d', $dair, $darr);
 				if ($n == 3) {
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
 					//$icao = $Translation->checkTranslation($ident);
@@ -453,7 +453,7 @@ 
 				*/
 				$dair = '';
 				$darr = '';
-				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
+				$n = sscanf($message, '3J01 DSPTCH %*d/%*d %4s/%4s .%*6s', $dair, $darr);
 				if ($n == 3) {
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
 					//$icao = $Translation->checkTranslation($ident);
@@ -464,7 +464,7 @@ 
 				}
 			}
 			if (!$found) {
-				$n = sscanf($message,'MET01%4c',$airport);
+				$n = sscanf($message, 'MET01%4c', $airport);
 				if ($n == 1) {
 					if ($globalDebug) echo 'airport name : '.$airport;
 					$decode = array('Airport/Waypoint name' => $airport);
@@ -473,241 +473,241 @@ 
 			}
 
 			if ($label == 'H1') {
-				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
+				if (preg_match('/^#CFBFLR/', $message) || preg_match('/^#CFBWRN/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Equipment failure'), $decode);
 				}
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
+				elseif (preg_match('/^#DFB\*TKO/', $message) || preg_match('/^#DFBTKO/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Take off performance data'), $decode);
 				}
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
+				elseif (preg_match('/^#DFB\*CRZ/', $message) || preg_match('/^#DFBCRZ/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Cruise performance data'), $decode);
 				}
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
+				elseif (preg_match('/^#DFB\*WOB/', $message) || preg_match('/^#DFBWOB/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weather observation'), $decode);
 				}
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
+				elseif (preg_match(':^#DFB/PIREP:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Pilot Report'), $decode);
 				}
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
+				elseif (preg_match('/^#DFBEDA/', $message) || preg_match('/^#DFBENG/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Engine Data'), $decode);
 				}
-				elseif (preg_match(':^#M1AAEP:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
+				elseif (preg_match(':^#M1AAEP:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Position/Weather Report'), $decode);
 				}
-				elseif (preg_match(':^#M2APWD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
+				elseif (preg_match(':^#M2APWD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'), $decode);
 				}
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
+				elseif (preg_match(':^#M1BREQPWI:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Predicted wind info request'), $decode);
 				}
-				elseif (preg_match(':^#CF:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
+				elseif (preg_match(':^#CF:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Central Fault Display'), $decode);
 				}
-				elseif (preg_match(':^#DF:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
+				elseif (preg_match(':^#DF:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'), $decode);
 				}
-				elseif (preg_match(':^#EC:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
+				elseif (preg_match(':^#EC:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Engine Display System'), $decode);
 				}
-				elseif (preg_match(':^#EI:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
+				elseif (preg_match(':^#EI:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Engine Report'), $decode);
 				}
-				elseif (preg_match(':^#H1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
+				elseif (preg_match(':^#H1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'), $decode);
 				}
-				elseif (preg_match(':^#H2:',$message)) {
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
+				elseif (preg_match(':^#H2:', $message)) {
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'), $decode);
 				}
-				elseif (preg_match(':^#HD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
+				elseif (preg_match(':^#HD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'), $decode);
 				}
-				elseif (preg_match(':^#M1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
+				elseif (preg_match(':^#M1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'), $decode);
 				}
-				elseif (preg_match(':^#M2:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
+				elseif (preg_match(':^#M2:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'), $decode);
 				}
-				elseif (preg_match(':^#M3:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
+				elseif (preg_match(':^#M3:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'), $decode);
 				}
-				elseif (preg_match(':^#MD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
+				elseif (preg_match(':^#MD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'), $decode);
 				}
-				elseif (preg_match(':^#PS:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
+				elseif (preg_match(':^#PS:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'), $decode);
 				}
-				elseif (preg_match(':^#S1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
+				elseif (preg_match(':^#S1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'SDU - Left'), $decode);
 				}
-				elseif (preg_match(':^#S2:',$message)) {
-					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
+				elseif (preg_match(':^#S2:', $message)) {
+					$decode = array_merge(array('Message nature' => 'SDU - Right'), $decode);
 				}
-				elseif (preg_match(':^#SD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
+				elseif (preg_match(':^#SD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'SDU - Selected'), $decode);
 				}
-				elseif (preg_match(':^#T[0-8]:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
+				elseif (preg_match(':^#T[0-8]:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'), $decode);
 				}
-				elseif (preg_match(':^#WO:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
+				elseif (preg_match(':^#WO:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weather Observation Report'), $decode);
 				}
-				elseif (preg_match(':^#A1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
+				elseif (preg_match(':^#A1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'), $decode);
 				}
-				elseif (preg_match(':^#A3:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
+				elseif (preg_match(':^#A3:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'), $decode);
 				}
-				elseif (preg_match(':^#A4:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
+				elseif (preg_match(':^#A4:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Systems Message'), $decode);
 				}
-				elseif (preg_match(':^#A6:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
+				elseif (preg_match(':^#A6:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request ADS Reports'), $decode);
 				}
-				elseif (preg_match(':^#A8:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
+				elseif (preg_match(':^#A8:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'), $decode);
 				}
-				elseif (preg_match(':^#A9:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
+				elseif (preg_match(':^#A9:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATIS report'), $decode);
 				}
-				elseif (preg_match(':^#A0:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
+				elseif (preg_match(':^#A0:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'), $decode);
 				}
-				elseif (preg_match(':^#AA:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
+				elseif (preg_match(':^#AA:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
 				}
-				elseif (preg_match(':^#AB:',$message)) {
-					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
+				elseif (preg_match(':^#AB:', $message)) {
+					$decode = array_merge(array('Message nature' => 'TWIP Report'), $decode);
 				}
-				elseif (preg_match(':^#AC:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
+				elseif (preg_match(':^#AC:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance'), $decode);
 				}
-				elseif (preg_match(':^#AD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
+				elseif (preg_match(':^#AD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'), $decode);
 				}
-				elseif (preg_match(':^#AF:',$message)) {
-					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
+				elseif (preg_match(':^#AF:', $message)) {
+					$decode = array_merge(array('Message nature' => 'CPC Command/Response'), $decode);
 				}
-				elseif (preg_match(':^#B1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
+				elseif (preg_match(':^#B1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'), $decode);
 				}
-				elseif (preg_match(':^#B2:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
+				elseif (preg_match(':^#B2:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'), $decode);
 				}
-				elseif (preg_match(':^#B3:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
+				elseif (preg_match(':^#B3:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'), $decode);
 				}
-				elseif (preg_match(':^#B4:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
+				elseif (preg_match(':^#B4:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'), $decode);
 				}
-				elseif (preg_match(':^#B6:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
+				elseif (preg_match(':^#B6:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Provide ADS Report'), $decode);
 				}
-				elseif (preg_match(':^#B8:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
+				elseif (preg_match(':^#B8:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request Departure Slot'), $decode);
 				}
-				elseif (preg_match(':^#B9:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
+				elseif (preg_match(':^#B9:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request ATIS Report'), $decode);
 				}
-				elseif (preg_match(':^#B0:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
+				elseif (preg_match(':^#B0:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'), $decode);
 				}
-				elseif (preg_match(':^#BA:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
+				elseif (preg_match(':^#BA:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
 				}
-				elseif (preg_match(':^#BB:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
+				elseif (preg_match(':^#BB:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request TWIP Report'), $decode);
 				}
-				elseif (preg_match(':^#BC:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
+				elseif (preg_match(':^#BC:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'), $decode);
 				}
-				elseif (preg_match(':^#BD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
+				elseif (preg_match(':^#BD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'), $decode);
 				}
-				elseif (preg_match(':^#BE:',$message)) {
-					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
+				elseif (preg_match(':^#BE:', $message)) {
+					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'), $decode);
 				}
-				elseif (preg_match(':^#BF:',$message)) {
-					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
+				elseif (preg_match(':^#BF:', $message)) {
+					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'), $decode);
 				}
-				elseif (preg_match(':^#H3:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
+				elseif (preg_match(':^#H3:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Icing Report'), $decode);
 				}
 			}
 			if ($label == '10') {
-				if (preg_match(':^DTO01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
+				if (preg_match(':^DTO01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'), $decode);
 				}
-				elseif (preg_match(':^AIS01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
+				elseif (preg_match(':^AIS01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'AIS Request'), $decode);
 				}
-				elseif (preg_match(':^FTX01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
+				elseif (preg_match(':^FTX01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Free Text Downlink'), $decode);
 				}
-				elseif (preg_match(':^FPL01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
+				elseif (preg_match(':^FPL01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Plan Request'), $decode);
 				}
-				elseif (preg_match(':^WAB01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
+				elseif (preg_match(':^WAB01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'), $decode);
 				}
-				elseif (preg_match(':^MET01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
+				elseif (preg_match(':^MET01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weather Data Request'), $decode);
 				}
-				elseif (preg_match(':^WAB02:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
+				elseif (preg_match(':^WAB02:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'), $decode);
 				}
 			}
 			if ($label == '15') {
-				if (preg_match(':^FST01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Status Report'),$decode);
+				if (preg_match(':^FST01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Status Report'), $decode);
 				}
 			}
 			if (!$found && $label == 'SA') {
-				$n = sscanf($message, "%d%c%c%6[0-9]", $version,$state,$type,$at);
+				$n = sscanf($message, "%d%c%c%6[0-9]", $version, $state, $type, $at);
 				if ($n == 4) {
 					$vsta = array('Version' => $version);
 					if ($state == 'E') {
-						$vsta = array_merge($vsta,array('Link state' => 'Established'));
+						$vsta = array_merge($vsta, array('Link state' => 'Established'));
 					}
 					elseif ($state == 'L') {
-						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
+						$vsta = array_merge($vsta, array('Link state' => 'Lost'));
 					}
 					else {
-						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
+						$vsta = array_merge($vsta, array('Link state' => 'Unknown'));
 					}
 					if ($type == 'V') {
-						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
+						$vsta = array_merge($vsta, array('Link type' => 'VHF ACARS'));
 					}
 					elseif ($type == 'S') {
-						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
+						$vsta = array_merge($vsta, array('Link type' => 'Generic SATCOM'));
 					}
 					elseif ($type == 'H') {
-						$vsta = array_merge($vsta,array('Link type' => 'HF'));
+						$vsta = array_merge($vsta, array('Link type' => 'HF'));
 					}
 					elseif ($type == 'G') {
-						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
+						$vsta = array_merge($vsta, array('Link type' => 'GlobalStar SATCOM'));
 					}
 					elseif ($type == 'C') {
-						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
+						$vsta = array_merge($vsta, array('Link type' => 'ICO SATCOM'));
 					}
 					elseif ($type == '2') {
-						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
+						$vsta = array_merge($vsta, array('Link type' => 'VDL Mode 2'));
 					}
 					elseif ($type == 'X') {
-						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
+						$vsta = array_merge($vsta, array('Link type' => 'Inmarsat Aero'));
 					}
 					elseif ($type == 'I') {
-						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
+						$vsta = array_merge($vsta, array('Link type' => 'Irridium SATCOM'));
 					}
 					else {
-						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
+						$vsta = array_merge($vsta, array('Link type' => 'Unknown'));
 					}
-					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
-					$decode = array_merge($vsta,$decode);
+					$vsta = array_merge($vsta, array('Event occured at' => implode(':', str_split($at, 2))));
+					$decode = array_merge($vsta, $decode);
 				}
 			}
 
 			$title = $this->getTitlefromLabel($label);
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
+			if ($title != '') $decode = array_merge(array('Message title' => $title), $decode);
 
 			/*
 			// Business jets always use GS0001
@@ -740,13 +740,13 @@ 
 		$message = $this->parse($data);
 		if (isset($message['registration']) && $message['registration'] != '' && $message['ident'] != '' && $message['registration'] != '!') {
 		
-			$ident = (string)$message['ident'];
+			$ident = (string) $message['ident'];
 			$label = $message['label'];
 			$block_id = $message['block_id'];
 			$msg_no = $message['msg_no'];
 			$msg = $message['message'];
 			$decode = $message['decode'];
-			$registration = (string)$message['registration'];
+			$registration = (string) $message['registration'];
 		
 			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
 			else $latitude = '';
@@ -763,23 +763,23 @@ 
 			}
 		
 			// Business jets always use GS0001
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
+			if ($ident != 'GS0001') $info = $this->addModeSData($ident, $registration, $icao, $airicao, $latitude, $longitude);
 			if ($globalDebug && isset($info) && $info != '') echo $info;
 
 			if (count($decode) > 0) $decode_json = json_encode($decode);
 			else $decode_json = '';
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
-				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
+				$Schedule->addSchedule($icao, $decode['Departure airport'], $decode['Departure hour'], $decode['Arrival airport'], $decode['Arrival hour'], 'ACARS');
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
-				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
+				$Schedule->addSchedule($icao, $decode['Departure airport'], '', $decode['Arrival airport'], '', 'ACARS');
 			}
 
-			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
+			$result = $this->addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
+			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10', '80', '81', '82', '3F');
+			if ($result && in_array($label, $globalACARSArchive)) $this->addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
 
 			if ($globalDebug && count($decode) > 0) {
-				echo "Human readable data : ".implode(' - ',$decode)."\n";
+				echo "Human readable data : ".implode(' - ', $decode)."\n";
 			}
 		}
 	}
@@ -794,7 +794,7 @@ 
 	* @param String $msg_no Number of the ACARS message
 	* @param String $message ACARS message
 	*/
-	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
+	public function addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
@@ -803,22 +803,22 @@ 
 
 			if ($globalDebug) echo "Test if not already in Live ACARS table...";
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
-			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
+			$query_test_values = array(':ident' => $ident, ':registration' => $registration, ':message' => $message);
 			try {
 				$stht = $this->db->prepare($query_test);
 				$stht->execute($query_test_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 			if ($stht->fetchColumn() == 0) {
 				if ($globalDebug) echo "Add Live ACARS data...";
 				$query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)";
-				$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s"));
+				$query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode, ':date' => date("Y-m-d H:i:s"));
 				try {
 
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 			} else {
@@ -840,10 +840,10 @@ 
 	* @param String $msg_no Number of the ACARS message
 	* @param String $message ACARS message
 	*/
-	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
+	public function addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
-		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/',$message) === 0 && preg_match('/^ARR0/',$message) === 0 && preg_match('/^ETA/',$message) === 0 && preg_match('/^WXR/',$message) === 0 && preg_match('/^FTX01.FIC/',$message) === 0) {
+		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/', $message) === 0 && preg_match('/^ARR0/', $message) === 0 && preg_match('/^ETA/', $message) === 0 && preg_match('/^WXR/', $message) === 0 && preg_match('/^FTX01.FIC/', $message) === 0) {
 			/*
 				    if ($globalDebug) echo "Test if not already in Archive ACARS table...";
 			    	    $query_test = "SELECT COUNT(*) as nb FROM acars_archive WHERE ident = :ident AND registration = :registration AND message = :message";
@@ -859,12 +859,12 @@ 
 			*/
 			if ($globalDebug) echo "Add Live ACARS data...";
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
-			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
+			$query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
 			try {
 
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 //    	    }
@@ -887,7 +887,7 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 			die;
 		}
@@ -908,7 +908,7 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 			die;
 		}
@@ -930,7 +930,7 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 			die;
 		}
@@ -944,7 +944,7 @@ 
 	*
 	* @return Array Return ACARS data in array
 	*/
-	public function getLatestAcarsData($limit = '',$label = '') {
+	public function getLatestAcarsData($limit = '', $label = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
 		$Spotter = new Spotter($this->db);
@@ -956,8 +956,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -979,48 +979,48 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$i = 0;
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
 			$data = array();
 			if ($row['registration'] != '') {
-				$row['registration'] = str_replace('.','',$row['registration']);
+				$row['registration'] = str_replace('.', '', $row['registration']);
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
+				else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
+			} else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 			if ($row['registration'] == '') $row['registration'] = 'NA';
 			if ($row['ident'] == '') $row['ident'] = 'NA';
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
 			if (isset($identicao[0])) {
-				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+				if (substr($row['ident'], 0, 2) == 'AF') {
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
 
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
 			} else $icao = $row['ident'];
-			$icao = $Translation->checkTranslation($icao,false);
+			$icao = $Translation->checkTranslation($icao, false);
 
-			$decode = json_decode($row['decode'],true);
+			$decode = json_decode($row['decode'], true);
 			$found = false;
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
 				if (isset($airport_info[0]['icao'])) {
 					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 					$found = true;
 				}
 			}
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
 				if (isset($airport_info[0]['icao'])) {
 					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 					$found = true;
 				}
 			}
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
 				if (isset($airport_info[0]['icao'])) {
 					$decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
@@ -1028,7 +1028,7 @@ 
 				}
 			}
 			if ($found) $row['decode'] = json_encode($decode);
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
 			$result[] = $data;
 			$i++;
 		}
@@ -1044,7 +1044,7 @@ 
 	*
 	* @return Array Return ACARS data in array
 	*/
-	public function getArchiveAcarsData($limit = '',$label = '') {
+	public function getArchiveAcarsData($limit = '', $label = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
 		$Spotter = new Spotter($this->db);
@@ -1056,8 +1056,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -1087,45 +1087,45 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
-		$i=0;
+		$i = 0;
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
 			$data = array();
 			if ($row['registration'] != '') {
-				$row['registration'] = str_replace('.','',$row['registration']);
+				$row['registration'] = str_replace('.', '', $row['registration']);
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				if (count($image_array) > 0) $data = array_merge($data, array('image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
+				else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
+			} else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 			$icao = '';
 			if ($row['registration'] == '') $row['registration'] = 'NA';
 			if ($row['ident'] == '') $row['ident'] = 'NA';
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
 			if (isset($identicao[0])) {
-				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
+				if (substr($row['ident'], 0, 2) == 'AF') {
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
 			} else $icao = $row['ident'];
 			$icao = $Translation->checkTranslation($icao);
 
 
-			$decode = json_decode($row['decode'],true);
+			$decode = json_decode($row['decode'], true);
 			$found = false;
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
 				if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 				$found = true;
 			}
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
 				if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 				$found = true;
 			}
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
 				if (isset($airport_info[0]['icao'])) {
 					$decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
@@ -1134,7 +1134,7 @@ 
 			}
 			if ($found) $row['decode'] = json_encode($decode);
 
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
 			$result[] = $data;
 			$i++;
 		}
@@ -1152,7 +1152,7 @@ 
 	* @param String $icao
 	* @param String $ICAOTypeCode
 	*/
-	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
+	public function addModeSData($ident, $registration, $icao = '', $ICAOTypeCode = '', $latitude = '', $longitude = '') {
 		global $globalDebug, $globalDBdriver;
 		$ident = trim($ident);
 		$Translation = new Translation($this->db);
@@ -1166,7 +1166,7 @@ 
 			return '';
 		}
 
-		$registration = str_replace('.','',$registration);
+		$registration = str_replace('.', '', $registration);
 		$ident = $Translation->ident2icao($ident);
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
 		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
@@ -1176,7 +1176,7 @@ 
 
 			$sthsi = $this->db->prepare($querysi);
 			$sthsi->execute($querysi_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			if ($globalDebug) echo $e->getMessage();
 			return "error : ".$e->getMessage();
 		}
@@ -1187,8 +1187,8 @@ 
 			$Translation = new Translation($this->db);
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
 			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
+			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'], $ident, 'ACARS');
+			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'], $ident, 'ACARS');
 		} else {
 			if ($registration != '' && $latitude != '' && $longitude != '') {
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
@@ -1196,7 +1196,7 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					if ($globalDebug) echo $e->getMessage();
 					return "error : ".$e->getMessage();
 				}
@@ -1204,7 +1204,7 @@ 
 				$sth->closeCursor();
 				if (isset($result['modes'])) $hex = $result['modes'];
 				else $hex = '';
-				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
+				$SI_data = array('hex' => $hex, 'ident' => $ident, 'aircraft_icao' => $ICAOTypeCode, 'registration' => $registration, 'latitude' => $latitude, '$longitude' => $longitude, 'format_source' => 'ACARS');
 				$this->SI->add($SI_data);
 			}
 		}
@@ -1216,7 +1216,7 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			if ($globalDebug) echo $e->getMessage();
 			return "error : ".$e->getMessage();
 		}
@@ -1227,7 +1227,7 @@ 
 			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
 			else $ModeS = '';
 			if ($ModeS == '') {
-				$id = explode('-',$result['flightaware_id']);
+				$id = explode('-', $result['flightaware_id']);
 				$ModeS = $id[0];
 			}
 			if ($ModeS != '') {
@@ -1238,21 +1238,21 @@ 
 
 					$sthc = $this->db->prepare($queryc);
 					$sthc->execute($queryc_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					if ($globalDebug) echo $e->getMessage();
 					return "error : ".$e->getMessage();
 				}
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
 				$sthc->closeCursor();
-				if (count($row) ==  0) {
+				if (count($row) == 0) {
 					if ($globalDebug) echo " Add to ModeS table - ";
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
-					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
+					$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
 					try {
 
 						$sthi = $this->db->prepare($queryi);
 						$sthi->execute($queryi_values);
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						if ($globalDebug) echo $e->getMessage();
 						return "error : ".$e->getMessage();
 					}
@@ -1260,16 +1260,16 @@ 
 					if ($globalDebug) echo " Update ModeS table - ";
 					if ($ICAOTypeCode != '') {
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
 					} else {
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration);
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration);
 					}
 					try {
 
 						$sthi = $this->db->prepare($queryi);
 						$sthi->execute($queryi_values);
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						if ($globalDebug) echo $e->getMessage();
 						return "error : ".$e->getMessage();
 					}
@@ -1307,13 +1307,13 @@ 
 					elseif ($globalDBdriver == 'pgsql') {
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
 					}
-					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
+					$queryi_values = array(':Registration' => $registration, ':ident' => $icao);
 				}
 				try {
 
 					$sthi = $this->db->prepare($queryi);
 					$sthi->execute($queryi_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					if ($globalDebug) echo $e->getMessage();
 					return "error : ".$e->getMessage();
 				}

Braces +409 added lines, -261 removed lines

@@ -23,14 +23,19 @@ 
 	*/
 	public function ident2icao($ident) {
 		if (substr($ident,0,2) == 'AF') {
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+				$icao = $ident;
+			} else {
+				$icao = 'AFR'.ltrim(substr($ident,2),'0');
+			}
 		} else {
 			$Spotter = new Spotter($this->db);
 			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
 			if (isset($identicao[0])) {
 				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
-			} else $icao = $ident;
+			} else {
+				$icao = $ident;
+			}
 		}
 		return $icao;
 	}
@@ -103,14 +108,24 @@ 
 		$message = '';
 		$result = array();
 		$n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		if ($n == 0) {
+			$n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		}
+		if ($n == 0) {
+			$n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		}
+		if ($n == 0) {
+			$n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		}
 		if ($n != 0) {
 			$registration = str_replace('.','',$registration);
 			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
-			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
-		} else $message = $data;
+			if ($globalDebug) {
+				echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
+			}
+		} else {
+			$message = $data;
+		}
 		$decode = array();
 		$found = false;
 //		if ($registration != '' && $ident != '' && $registration != '!') {
@@ -130,12 +145,21 @@ 
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
 					$latitude = $la / 10000.0;
 					$longitude = $ln / 10000.0;
-					if ($lac == 'S') $latitude = '-'.$latitude;
-					if ($lnc == 'W') $longitude = '-'.$longitude;
+					if ($lac == 'S') {
+						$latitude = '-'.$latitude;
+					}
+					if ($lnc == 'W') {
+						$longitude = '-'.$longitude;
+					}
 					// Temp not always available
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
+					if ($globalDebug) {
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
+					}
+					if ($temp == '') {
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
+					} else {
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
+					}
 
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -149,25 +173,35 @@ 
 				$ahour = '';
 				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
 				if ($n == 4 && strlen($darr) == 4) {
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
+					if ($dhour != '') {
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
+					}
+					if ($ahour != '') {
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
+					}
+					if ($globalDebug) {
+						echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
+					}
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
 					$found = true;
-				}
-				elseif ($n == 2 || $n  == 4) {
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
+				} elseif ($n == 2 || $n  == 4) {
+					if ($dhour != '') {
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
+					}
+					if ($globalDebug) {
+						echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
+					}
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					$decode = array('Arrival airport' => $dair, 'Arrival hour' => $dhour);
 					$found = true;
-				}
-				elseif ($n == 1) {
-					if ($globalDebug) echo 'airport arrival : '.$darr."\n";
+				} elseif ($n == 1) {
+					if ($globalDebug) {
+						echo 'airport arrival : '.$darr."\n";
+					}
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					$decode = array('Arrival airport' => $darr);
@@ -185,7 +219,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%4c,%4c,%*7s,%*d", $dair, $darr);
 				if ($n == 4) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -219,14 +255,23 @@ 
 				$apiste = '';
 				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste);
 				if ($n > 8) {
-					if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
+					if ($globalDebug) {
+						echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
+					}
+					if ($dhour != '') {
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
+					}
+					if ($ahour != '') {
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
+					}
 					$icao = trim($aident);
 
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
-					if ($ahour == '') $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
-					else $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
+					if ($ahour == '') {
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
+					} else {
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
+					}
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
 					$decode['icao'] = $icao;
 					$found = true;
@@ -248,9 +293,15 @@ 
 					$lns = $lns.'.'.$lns;
 					$latitude = $las / 1000.0;
 					$longitude = $lns / 1000.0;
-					if ($lac == 'S') $latitude = '-'.$latitude;
-					if ($lnc == 'W') $longitude = '-'.$longitude;
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
+					if ($lac == 'S') {
+						$latitude = '-'.$latitude;
+					}
+					if ($lnc == 'W') {
+						$longitude = '-'.$longitude;
+					}
+					if ($globalDebug) {
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
+					}
 					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
 					$found = true;
 				}
@@ -268,7 +319,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%*[0-9A-Z ]/%*s %4c/%4c .", $dair, $darr);
 				if ($n == 4) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -281,7 +334,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%*[0-9],%4c,%4c,", $dair, $darr);
 				if ($n == 4) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -294,7 +349,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "002AF %4c %4c ", $dair, $darr);
 				if ($n == 2) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -308,7 +365,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "#DFBA%*02d/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
 				if ($n == 6) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -321,7 +380,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "#DFBA%*02d/%*[0-9A-Z,]/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
 				if ($n == 7) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -349,8 +410,12 @@ 
 					$decode['icao'] = $icao;
 					$latitude = $las / 100.0;
 					$longitude = $lns / 100.0;
-					if ($lac == 'S') $latitude = '-'.$latitude;
-					if ($lnc == 'W') $longitude = '-'.$longitude;
+					if ($lac == 'S') {
+						$latitude = '-'.$latitude;
+					}
+					if ($lnc == 'W') {
+						$longitude = '-'.$longitude;
+					}
 
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
 					$found = true;
@@ -368,8 +433,12 @@ 
 				if ($n == 4) {
 					$latitude = $las;
 					$longitude = $lns;
-					if ($lac == 'S') $latitude = '-'.$latitude;
-					if ($lnc == 'W') $longitude = '-'.$longitude;
+					if ($lac == 'S') {
+						$latitude = '-'.$latitude;
+					}
+					if ($lnc == 'W') {
+						$longitude = '-'.$longitude;
+					}
 
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
 					$found = true;
@@ -385,7 +454,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%*[0-9A-Z] NLINFO %*d/%*d %4c/%4c .", $dair, $darr);
 				if ($n == 5) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -406,7 +477,9 @@ 
 				$aident = '';
 				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
 				if ($n == 8) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					$icao = trim($aident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode['icao'] = $icao;
@@ -423,7 +496,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%*d/%*d %4s/%4s .%*6s", $dair, $darr);
 				if ($n == 5) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -439,7 +514,9 @@ 
 				$darr = '';
 				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
 				if ($n == 3) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -455,7 +532,9 @@ 
 				$darr = '';
 				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
 				if ($n == 3) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -466,7 +545,9 @@ 
 			if (!$found) {
 				$n = sscanf($message,'MET01%4c',$airport);
 				if ($n == 1) {
-					if ($globalDebug) echo 'airport name : '.$airport;
+					if ($globalDebug) {
+						echo 'airport name : '.$airport;
+					}
 					$decode = array('Airport/Waypoint name' => $airport);
 					$found = true;
 				}
@@ -475,184 +556,126 @@ 
 			if ($label == 'H1') {
 				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
-				}
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
+				} elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
-				}
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
+				} elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
-				}
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
+				} elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
-				}
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
+				} elseif (preg_match(':^#DFB/PIREP:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
-				}
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
+				} elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
-				}
-				elseif (preg_match(':^#M1AAEP:',$message)) {
+				} elseif (preg_match(':^#M1AAEP:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
-				}
-				elseif (preg_match(':^#M2APWD:',$message)) {
+				} elseif (preg_match(':^#M2APWD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
-				}
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
+				} elseif (preg_match(':^#M1BREQPWI:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
-				}
-				elseif (preg_match(':^#CF:',$message)) {
+				} elseif (preg_match(':^#CF:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
-				}
-				elseif (preg_match(':^#DF:',$message)) {
+				} elseif (preg_match(':^#DF:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
-				}
-				elseif (preg_match(':^#EC:',$message)) {
+				} elseif (preg_match(':^#EC:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
-				}
-				elseif (preg_match(':^#EI:',$message)) {
+				} elseif (preg_match(':^#EI:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
-				}
-				elseif (preg_match(':^#H1:',$message)) {
+				} elseif (preg_match(':^#H1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
-				}
-				elseif (preg_match(':^#H2:',$message)) {
+				} elseif (preg_match(':^#H2:',$message)) {
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
-				}
-				elseif (preg_match(':^#HD:',$message)) {
+				} elseif (preg_match(':^#HD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
-				}
-				elseif (preg_match(':^#M1:',$message)) {
+				} elseif (preg_match(':^#M1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
-				}
-				elseif (preg_match(':^#M2:',$message)) {
+				} elseif (preg_match(':^#M2:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
-				}
-				elseif (preg_match(':^#M3:',$message)) {
+				} elseif (preg_match(':^#M3:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
-				}
-				elseif (preg_match(':^#MD:',$message)) {
+				} elseif (preg_match(':^#MD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
-				}
-				elseif (preg_match(':^#PS:',$message)) {
+				} elseif (preg_match(':^#PS:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
-				}
-				elseif (preg_match(':^#S1:',$message)) {
+				} elseif (preg_match(':^#S1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
-				}
-				elseif (preg_match(':^#S2:',$message)) {
+				} elseif (preg_match(':^#S2:',$message)) {
 					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
-				}
-				elseif (preg_match(':^#SD:',$message)) {
+				} elseif (preg_match(':^#SD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
-				}
-				elseif (preg_match(':^#T[0-8]:',$message)) {
+				} elseif (preg_match(':^#T[0-8]:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
-				}
-				elseif (preg_match(':^#WO:',$message)) {
+				} elseif (preg_match(':^#WO:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
-				}
-				elseif (preg_match(':^#A1:',$message)) {
+				} elseif (preg_match(':^#A1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
-				}
-				elseif (preg_match(':^#A3:',$message)) {
+				} elseif (preg_match(':^#A3:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
-				}
-				elseif (preg_match(':^#A4:',$message)) {
+				} elseif (preg_match(':^#A4:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
-				}
-				elseif (preg_match(':^#A6:',$message)) {
+				} elseif (preg_match(':^#A6:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
-				}
-				elseif (preg_match(':^#A8:',$message)) {
+				} elseif (preg_match(':^#A8:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
-				}
-				elseif (preg_match(':^#A9:',$message)) {
+				} elseif (preg_match(':^#A9:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
-				}
-				elseif (preg_match(':^#A0:',$message)) {
+				} elseif (preg_match(':^#A0:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
-				}
-				elseif (preg_match(':^#AA:',$message)) {
+				} elseif (preg_match(':^#AA:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
-				}
-				elseif (preg_match(':^#AB:',$message)) {
+				} elseif (preg_match(':^#AB:',$message)) {
 					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
-				}
-				elseif (preg_match(':^#AC:',$message)) {
+				} elseif (preg_match(':^#AC:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
-				}
-				elseif (preg_match(':^#AD:',$message)) {
+				} elseif (preg_match(':^#AD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
-				}
-				elseif (preg_match(':^#AF:',$message)) {
+				} elseif (preg_match(':^#AF:',$message)) {
 					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
-				}
-				elseif (preg_match(':^#B1:',$message)) {
+				} elseif (preg_match(':^#B1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
-				}
-				elseif (preg_match(':^#B2:',$message)) {
+				} elseif (preg_match(':^#B2:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
-				}
-				elseif (preg_match(':^#B3:',$message)) {
+				} elseif (preg_match(':^#B3:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
-				}
-				elseif (preg_match(':^#B4:',$message)) {
+				} elseif (preg_match(':^#B4:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
-				}
-				elseif (preg_match(':^#B6:',$message)) {
+				} elseif (preg_match(':^#B6:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
-				}
-				elseif (preg_match(':^#B8:',$message)) {
+				} elseif (preg_match(':^#B8:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
-				}
-				elseif (preg_match(':^#B9:',$message)) {
+				} elseif (preg_match(':^#B9:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
-				}
-				elseif (preg_match(':^#B0:',$message)) {
+				} elseif (preg_match(':^#B0:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
-				}
-				elseif (preg_match(':^#BA:',$message)) {
+				} elseif (preg_match(':^#BA:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
-				}
-				elseif (preg_match(':^#BB:',$message)) {
+				} elseif (preg_match(':^#BB:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
-				}
-				elseif (preg_match(':^#BC:',$message)) {
+				} elseif (preg_match(':^#BC:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
-				}
-				elseif (preg_match(':^#BD:',$message)) {
+				} elseif (preg_match(':^#BD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
-				}
-				elseif (preg_match(':^#BE:',$message)) {
+				} elseif (preg_match(':^#BE:',$message)) {
 					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
-				}
-				elseif (preg_match(':^#BF:',$message)) {
+				} elseif (preg_match(':^#BF:',$message)) {
 					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
-				}
-				elseif (preg_match(':^#H3:',$message)) {
+				} elseif (preg_match(':^#H3:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
 				}
 			}
 			if ($label == '10') {
 				if (preg_match(':^DTO01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
-				}
-				elseif (preg_match(':^AIS01:',$message)) {
+				} elseif (preg_match(':^AIS01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
-				}
-				elseif (preg_match(':^FTX01:',$message)) {
+				} elseif (preg_match(':^FTX01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
-				}
-				elseif (preg_match(':^FPL01:',$message)) {
+				} elseif (preg_match(':^FPL01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
-				}
-				elseif (preg_match(':^WAB01:',$message)) {
+				} elseif (preg_match(':^WAB01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
-				}
-				elseif (preg_match(':^MET01:',$message)) {
+				} elseif (preg_match(':^MET01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
-				}
-				elseif (preg_match(':^WAB02:',$message)) {
+				} elseif (preg_match(':^WAB02:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
 				}
 			}
@@ -667,38 +690,28 @@ 
 					$vsta = array('Version' => $version);
 					if ($state == 'E') {
 						$vsta = array_merge($vsta,array('Link state' => 'Established'));
-					}
-					elseif ($state == 'L') {
+					} elseif ($state == 'L') {
 						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
-					}
-					else {
+					} else {
 						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
 					}
 					if ($type == 'V') {
 						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
-					}
-					elseif ($type == 'S') {
+					} elseif ($type == 'S') {
 						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
-					}
-					elseif ($type == 'H') {
+					} elseif ($type == 'H') {
 						$vsta = array_merge($vsta,array('Link type' => 'HF'));
-					}
-					elseif ($type == 'G') {
+					} elseif ($type == 'G') {
 						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
-					}
-					elseif ($type == 'C') {
+					} elseif ($type == 'C') {
 						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
-					}
-					elseif ($type == '2') {
+					} elseif ($type == '2') {
 						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
-					}
-					elseif ($type == 'X') {
+					} elseif ($type == 'X') {
 						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
-					}
-					elseif ($type == 'I') {
+					} elseif ($type == 'I') {
 						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
-					}
-					else {
+					} else {
 						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
 					}
 					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
@@ -707,7 +720,9 @@ 
 			}
 
 			$title = $this->getTitlefromLabel($label);
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
+			if ($title != '') {
+				$decode = array_merge(array('Message title' => $title),$decode);
+			}
 
 			/*
 			// Business jets always use GS0001
@@ -748,14 +763,26 @@ 
 			$decode = $message['decode'];
 			$registration = (string)$message['registration'];
 		
-			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
-			else $latitude = '';
-			if (isset($decode['longitude'])) $longitude = $decode['longitude'];
-			else $longitude = '';
-			if (isset($decode['airicao'])) $airicao = $decode['airicao'];
-			else $airicao = '';
-			if (isset($decode['icao'])) $icao = $decode['icao'];
-			else $icao = $Translation->checkTranslation($ident);
+			if (isset($decode['latitude'])) {
+				$latitude = $decode['latitude'];
+			} else {
+				$latitude = '';
+			}
+			if (isset($decode['longitude'])) {
+				$longitude = $decode['longitude'];
+			} else {
+				$longitude = '';
+			}
+			if (isset($decode['airicao'])) {
+				$airicao = $decode['airicao'];
+			} else {
+				$airicao = '';
+			}
+			if (isset($decode['icao'])) {
+				$icao = $decode['icao'];
+			} else {
+				$icao = $Translation->checkTranslation($ident);
+			}
 		
 			$image_array = $Image->getSpotterImage($registration);
 			if (!isset($image_array[0]['registration'])) {
@@ -763,11 +790,18 @@ 
 			}
 		
 			// Business jets always use GS0001
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
-			if ($globalDebug && isset($info) && $info != '') echo $info;
+			if ($ident != 'GS0001') {
+				$info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
+			}
+			if ($globalDebug && isset($info) && $info != '') {
+				echo $info;
+			}
 
-			if (count($decode) > 0) $decode_json = json_encode($decode);
-			else $decode_json = '';
+			if (count($decode) > 0) {
+				$decode_json = json_encode($decode);
+			} else {
+				$decode_json = '';
+			}
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
 				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
@@ -775,8 +809,12 @@ 
 			}
 
 			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
+			if (!isset($globalACARSArchive)) {
+				$globalACARSArchive = array('10','80','81','82','3F');
+			}
+			if ($result && in_array($label,$globalACARSArchive)) {
+				$this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
+			}
 
 			if ($globalDebug && count($decode) > 0) {
 				echo "Human readable data : ".implode(' - ',$decode)."\n";
@@ -801,7 +839,9 @@ 
 			$Connection = new Connection($this->db);
 			$this->db = $Connection->db;
 
-			if ($globalDebug) echo "Test if not already in Live ACARS table...";
+			if ($globalDebug) {
+				echo "Test if not already in Live ACARS table...";
+			}
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
 			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
 			try {
@@ -811,7 +851,9 @@ 
 				return "error : ".$e->getMessage();
 			}
 			if ($stht->fetchColumn() == 0) {
-				if ($globalDebug) echo "Add Live ACARS data...";
+				if ($globalDebug) {
+					echo "Add Live ACARS data...";
+				}
 				$query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)";
 				$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s"));
 				try {
@@ -822,10 +864,14 @@ 
 					return "error : ".$e->getMessage();
 				}
 			} else {
-				if ($globalDebug) echo "Data already in DB...\n";
+				if ($globalDebug) {
+					echo "Data already in DB...\n";
+				}
 				return false;
 			}
-			if ($globalDebug) echo "Done\n";
+			if ($globalDebug) {
+				echo "Done\n";
+			}
 			return true;
 		}
 	}
@@ -857,7 +903,9 @@ 
 			    	    }
 				    if ($stht->fetchColumn() == 0) {
 			*/
-			if ($globalDebug) echo "Add Live ACARS data...";
+			if ($globalDebug) {
+				echo "Add Live ACARS data...";
+			}
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
 			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
 			try {
@@ -868,7 +916,9 @@ 
 				return "error : ".$e->getMessage();
 			}
 //    	    }
-			if ($globalDebug) echo "Done\n";
+			if ($globalDebug) {
+				echo "Done\n";
+			}
 		}
 	}
 
@@ -892,8 +942,11 @@ 
 			die;
 		}
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (count($row) > 0) return $row[0]['title'];
-		else return '';
+		if (count($row) > 0) {
+			return $row[0]['title'];
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -913,8 +966,11 @@ 
 			die;
 		}
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (count($row) > 0) return $row;
-		else return array();
+		if (count($row) > 0) {
+			return $row;
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -935,8 +991,11 @@ 
 			die;
 		}
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (count($row) > 0) return $row[0];
-		else return array();
+		if (count($row) > 0) {
+			return $row[0];
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -988,20 +1047,36 @@ 
 			if ($row['registration'] != '') {
 				$row['registration'] = str_replace('.','',$row['registration']);
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			if ($row['registration'] == '') $row['registration'] = 'NA';
-			if ($row['ident'] == '') $row['ident'] = 'NA';
+				if (count($image_array) > 0) {
+					$data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
+				} else {
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				}
+			} else {
+				$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+			}
+			if ($row['registration'] == '') {
+				$row['registration'] = 'NA';
+			}
+			if ($row['ident'] == '') {
+				$row['ident'] = 'NA';
+			}
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
 			if (isset($identicao[0])) {
 				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+						$icao = $row['ident'];
+					} else {
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
+					}
+				} else {
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+				}
 
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
-			} else $icao = $row['ident'];
+			} else {
+				$icao = $row['ident'];
+			}
 			$icao = $Translation->checkTranslation($icao,false);
 
 			$decode = json_decode($row['decode'],true);
@@ -1027,7 +1102,9 @@ 
 					$found = true;
 				}
 			}
-			if ($found) $row['decode'] = json_encode($decode);
+			if ($found) {
+				$row['decode'] = json_encode($decode);
+			}
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
 			$result[] = $data;
 			$i++;
@@ -1035,8 +1112,9 @@ 
 		if (isset($result)) {
 			$result[0]['query_number_rows'] = $i;
 			return $result;
+		} else {
+			return array();
 		}
-		else return array();
 	}
 
 	/**
@@ -1096,20 +1174,36 @@ 
 			if ($row['registration'] != '') {
 				$row['registration'] = str_replace('.','',$row['registration']);
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				if (count($image_array) > 0) {
+					$data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
+				} else {
+					$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				}
+			} else {
+				$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+			}
 			$icao = '';
-			if ($row['registration'] == '') $row['registration'] = 'NA';
-			if ($row['ident'] == '') $row['ident'] = 'NA';
+			if ($row['registration'] == '') {
+				$row['registration'] = 'NA';
+			}
+			if ($row['ident'] == '') {
+				$row['ident'] = 'NA';
+			}
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
 			if (isset($identicao[0])) {
 				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+						$icao = $row['ident'];
+					} else {
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
+					}
+				} else {
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+				}
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
-			} else $icao = $row['ident'];
+			} else {
+				$icao = $row['ident'];
+			}
 			$icao = $Translation->checkTranslation($icao);
 
 
@@ -1117,12 +1211,16 @@ 
 			$found = false;
 			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
-				if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
+				if (isset($airport_info[0]['icao'])) {
+					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
+				}
 				$found = true;
 			}
 			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
-				if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
+				if (isset($airport_info[0]['icao'])) {
+					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
+				}
 				$found = true;
 			}
 			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
@@ -1132,7 +1230,9 @@ 
 					$found = true;
 				}
 			}
-			if ($found) $row['decode'] = json_encode($decode);
+			if ($found) {
+				$row['decode'] = json_encode($decode);
+			}
 
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
 			$result[] = $data;
@@ -1141,7 +1241,9 @@ 
 		if (isset($result)) {
 			$result[0]['query_number_rows'] = $i;
 			return $result;
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -1157,19 +1259,29 @@ 
 		$ident = trim($ident);
 		$Translation = new Translation($this->db);
 		$Spotter = new Spotter($this->db);
-		if ($globalDebug) echo "Test if we add ModeS data...";
+		if ($globalDebug) {
+			echo "Test if we add ModeS data...";
+		}
 		//if ($icao == '') $icao = ACARS->ident2icao($ident);
-		if ($icao == '') $icao = $Translation->checkTranslation($ident);
-		if ($globalDebug) echo '- Ident : '.$icao.' - ';
+		if ($icao == '') {
+			$icao = $Translation->checkTranslation($ident);
+		}
+		if ($globalDebug) {
+			echo '- Ident : '.$icao.' - ';
+		}
 		if ($ident == '' || $registration == '') {
-			if ($globalDebug) echo "Ident or registration null, exit\n";
+			if ($globalDebug) {
+				echo "Ident or registration null, exit\n";
+			}
 			return '';
 		}
 
 		$registration = str_replace('.','',$registration);
 		$ident = $Translation->ident2icao($ident);
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
-		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
+		if ($globalDebug) {
+			echo "Check if needed to add translation ".$ident.'... ';
+		}
 		$querysi = "SELECT ident FROM spotter_live s,aircraft_modes a WHERE a.ModeS = s.ModeS AND a.Registration = :registration AND s.format_source <> 'ACARS' LIMIT 1";
 		$querysi_values = array(':registration' => $registration);
 		try {
@@ -1177,7 +1289,9 @@ 
 			$sthsi = $this->db->prepare($querysi);
 			$sthsi->execute($querysi_values);
 		} catch(PDOException $e) {
-			if ($globalDebug) echo $e->getMessage();
+			if ($globalDebug) {
+				echo $e->getMessage();
+			}
 			return "error : ".$e->getMessage();
 		}
 		$resultsi = $sthsi->fetch(PDO::FETCH_ASSOC);
@@ -1186,9 +1300,14 @@ 
 		if (count($resultsi) > 0 && $resultsi['ident'] != $ident && $resultsi['ident'] != '') {
 			$Translation = new Translation($this->db);
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
-			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
+			if ($globalDebug) {
+				echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
+			}
+			if ($ident != $trans_ident) {
+				$Translation->addOperator($resultsi['ident'],$ident,'ACARS');
+			} elseif ($trans_ident == $ident) {
+				$Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
+			}
 		} else {
 			if ($registration != '' && $latitude != '' && $longitude != '') {
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
@@ -1197,18 +1316,25 @@ 
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
 				} catch(PDOException $e) {
-					if ($globalDebug) echo $e->getMessage();
+					if ($globalDebug) {
+						echo $e->getMessage();
+					}
 					return "error : ".$e->getMessage();
 				}
 				$result = $sth->fetch(PDO::FETCH_ASSOC);
 				$sth->closeCursor();
-				if (isset($result['modes'])) $hex = $result['modes'];
-				else $hex = '';
+				if (isset($result['modes'])) {
+					$hex = $result['modes'];
+				} else {
+					$hex = '';
+				}
 				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
 				$this->SI->add($SI_data);
 			}
 		}
-		if ($globalDebug) echo 'Done'."\n";
+		if ($globalDebug) {
+			echo 'Done'."\n";
+		}
 
 		$query = "SELECT flightaware_id, ModeS FROM spotter_output WHERE ident = :ident AND format_source <> 'ACARS' ORDER BY spotter_id DESC LIMIT 1";
 		$query_values = array(':ident' => $icao);
@@ -1217,15 +1343,20 @@ 
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
 		} catch(PDOException $e) {
-			if ($globalDebug) echo $e->getMessage();
+			if ($globalDebug) {
+				echo $e->getMessage();
+			}
 			return "error : ".$e->getMessage();
 		}
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
 		//print_r($result);
 		if (isset($result['flightaware_id'])) {
-			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
-			else $ModeS = '';
+			if (isset($result['ModeS'])) {
+				$ModeS = $result['ModeS'];
+			} else {
+				$ModeS = '';
+			}
 			if ($ModeS == '') {
 				$id = explode('-',$result['flightaware_id']);
 				$ModeS = $id[0];
@@ -1239,13 +1370,17 @@ 
 					$sthc = $this->db->prepare($queryc);
 					$sthc->execute($queryc_values);
 				} catch(PDOException $e) {
-					if ($globalDebug) echo $e->getMessage();
+					if ($globalDebug) {
+						echo $e->getMessage();
+					}
 					return "error : ".$e->getMessage();
 				}
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
 				$sthc->closeCursor();
 				if (count($row) ==  0) {
-					if ($globalDebug) echo " Add to ModeS table - ";
+					if ($globalDebug) {
+						echo " Add to ModeS table - ";
+					}
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
 					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
 					try {
@@ -1253,11 +1388,15 @@ 
 						$sthi = $this->db->prepare($queryi);
 						$sthi->execute($queryi_values);
 					} catch(PDOException $e) {
-						if ($globalDebug) echo $e->getMessage();
+						if ($globalDebug) {
+							echo $e->getMessage();
+						}
 						return "error : ".$e->getMessage();
 					}
 				} else {
-					if ($globalDebug) echo " Update ModeS table - ";
+					if ($globalDebug) {
+						echo " Update ModeS table - ";
+					}
 					if ($ICAOTypeCode != '') {
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
 						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
@@ -1270,7 +1409,9 @@ 
 						$sthi = $this->db->prepare($queryi);
 						$sthi->execute($queryi_values);
 					} catch(PDOException $e) {
-						if ($globalDebug) echo $e->getMessage();
+						if ($globalDebug) {
+							echo $e->getMessage();
+						}
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1292,7 +1433,9 @@ 
 					    return "error : ".$e->getMessage();
 				}
 				*/
-				if ($globalDebug) echo " Update Spotter_output table - ";
+				if ($globalDebug) {
+					echo " Update Spotter_output table - ";
+				}
 				if ($ICAOTypeCode != '') {
 					if ($globalDBdriver == 'mysql') {
 						$queryi = "UPDATE spotter_output SET registration = :Registration,aircraft_icao = :ICAOTypeCode WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
@@ -1303,8 +1446,7 @@ 
 				} else {
 					if ($globalDBdriver == 'mysql') {
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
-					}
-					elseif ($globalDBdriver == 'pgsql') {
+					} elseif ($globalDBdriver == 'pgsql') {
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
 					}
 					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
@@ -1314,15 +1456,21 @@ 
 					$sthi = $this->db->prepare($queryi);
 					$sthi->execute($queryi_values);
 				} catch(PDOException $e) {
-					if ($globalDebug) echo $e->getMessage();
+					if ($globalDebug) {
+						echo $e->getMessage();
+					}
 					return "error : ".$e->getMessage();
 				}
 
 			}
 		} else {
-			if ($globalDebug) echo " Can't find ModeS in spotter_output - ";
+			if ($globalDebug) {
+				echo " Can't find ModeS in spotter_output - ";
+			}
+		}
+		if ($globalDebug) {
+			echo "Done\n";
 		}
-		if ($globalDebug) echo "Done\n";
 	}
 }
 ?>