Ysurac / FlightAirMap

live-geojson.php

Indentation +32 added lines, -32 removed lines

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

Spacing +33 added lines, -33 removed lines

@@ -25,22 +25,22 @@ 
 $min = false;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',', $_COOKIE['filter_Airlines']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',', $_COOKIE['filter_Sources']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'], FILTER_SANITIZE_STRING);
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
 }
 
 if (isset($_GET['ident'])) {
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	$spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident);
 	if (empty($spotter_array)) {
 		$from_archive = true;
@@ -48,7 +48,7 @@ 
 	}
 	$allhistory = true;
 } elseif (isset($_GET['flightaware_id'])) {
-	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+	$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
 	if (empty($spotter_array)) {
 		$from_archive = true;
@@ -57,37 +57,37 @@ 
 	$allhistory = true;
 } elseif (isset($_GET['coord']) && (!isset($globalMapPopup) || $globalMapPopup || (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true'))) {
 //if (isset($_GET['coord'])) {
-	$coord = explode(',',$_GET['coord']);
-	$spotter_array = $SpotterLive->getLiveSpotterDatabyCoord($coord,$filter);
+	$coord = explode(',', $_GET['coord']);
+	$spotter_array = $SpotterLive->getLiveSpotterDatabyCoord($coord, $filter);
 
 #} elseif (isset($globalMapPopup) && !$globalMapPopup) {
 } elseif (isset($_GET['archive']) && isset($_GET['begindate']) && isset($_GET['enddate']) && isset($_GET['speed'])) {
 	$from_archive = true;
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
 //	$enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
-	$begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
-	$enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
-	$archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
-	$begindate = date('Y-m-d H:i:s',$begindate);
-	$enddate = date('Y-m-d H:i:s',$enddate);
-	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
+	$begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
+	$enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
+	$archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
+	$begindate = date('Y-m-d H:i:s', $begindate);
+	$enddate = date('Y-m-d H:i:s', $enddate);
+	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
 } elseif ($min) {
 	$spotter_array = $SpotterLive->getMinLiveSpotterData($filter);
 #	$min = true;
 } else {
-	$spotter_array = $SpotterLive->getLiveSpotterData('','',$filter);
+	$spotter_array = $SpotterLive->getLiveSpotterData('', '', $filter);
 }
 
 if (!empty($spotter_array)) {
 	if (isset($_GET['archive'])) {
-		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
+		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
 	} else {
 		$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
 	}
 	if ($flightcnt == '') $flightcnt = 0;
 } else $flightcnt = 0;
 
-$sqltime = round(microtime(true)-$begintime,2);
+$sqltime = round(microtime(true) - $begintime, 2);
 
 $j = 0;
 $prev_flightaware_id = '';
@@ -102,7 +102,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');
@@ -153,7 +153,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) {
@@ -221,8 +221,8 @@ 
 						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'].'],';
@@ -230,7 +230,7 @@ 
 
 						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']).'",';
@@ -252,7 +252,7 @@ 
 							$output .= '"waypoints": "'.$spotter_item['waypoints'].'",';
 						}
 						if (isset($spotter_item['acars'])) {
-							$output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",';
+							$output .= '"acars": "'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br />', $spotter_item['acars']['message'])).'",';
 						}
 						// type when not aircraft ?
 						if ($compress) $output .= '"t": "aircraft"';
@@ -324,7 +324,7 @@ 
 */
 				//if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) || $globalMapHistory || $allhistory) || (isset($_GET['history']) && $_GET['history'] != '' && $_GET['history'] != 'NA' && ($_GET['history'] == $spotter_item['ident'] || $_GET['history'] == $spotter_item['flightaware_id'])))) {
 				//if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) || $globalMapHistory || $allhistory) || (isset($_GET['history']) && $_GET['history'] != '' && $_GET['history'] != 'NA' && ($_GET['history'] == $spotter_item['ident'] || $_GET['history'] == $spotter_item['flightaware_id']))) || (isset($_GET['history']) && $_GET['history'] == '' && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])) {
-				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
+				$history = filter_input(INPUT_GET, 'history', FILTER_SANITIZE_STRING);
 				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
 				if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) || $globalMapHistory || $allhistory) 
 				|| (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))) 
@@ -354,9 +354,9 @@ 
 					    else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
 					}
 					$output_history .= '[';
-					$output_history .=  $spotter_history['longitude'].', ';
-					$output_history .=  $spotter_history['latitude'].', ';
-					$output_history .=  $spotter_history['altitude']*30.48;
+					$output_history .= $spotter_history['longitude'].', ';
+					$output_history .= $spotter_history['latitude'].', ';
+					$output_history .= $spotter_history['altitude']*30.48;
 					$output_history .= '],';
 					$prev_alt = $alt;
 				    //}
@@ -400,7 +400,7 @@ 
 			//$output .= ']}}';
 			$output .= ']';
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
-			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
+			$output .= '"totaltime": "'.round(microtime(true) - $begintime, 2).'",';
 			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
 			$output .= '"fc": "'.$j.'"';
 		} else {

Braces +133 added lines, -51 removed lines

@@ -18,22 +18,43 @@ 
 }
 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['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('sbs'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
+}
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') {
+	$filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') {
+	$filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') {
+	$filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') {
+	$filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
+}
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
@@ -84,8 +105,12 @@ 
 	} else {
 		$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
 	}
-	if ($flightcnt == '') $flightcnt = 0;
-} else $flightcnt = 0;
+	if ($flightcnt == '') {
+		$flightcnt = 0;
+	}
+	} else {
+	$flightcnt = 0;
+}
 
 $sqltime = round(microtime(true)-$begintime,2);
 
@@ -94,8 +119,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.'",';
 
@@ -132,11 +160,16 @@ 
 						//$output .= '"sqt": "'.$sqltime.'",';
 						$output .= '"id": "'.$spotter_item['flightaware_id'].'",';
 						$output .= '"properties": {';
-							if ($compress) $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
-							else $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
+							if ($compress) {
+								$output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
+							} else {
+								$output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
+							}
 							$output .= '"fc": "'.$flightcnt.'",';
 							$output .= '"sqt": "'.$sqltime.'",';
-							if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
+							if (isset($begindate)) {
+								$output .= '"archive_date": "'.$begindate.'",';
+							}
 
 /*
 							if ($min) $output .= '"minimal": "true",';
@@ -144,13 +177,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'])).'",';
@@ -163,20 +204,31 @@ 
 							$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'];
-								elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') $spotter_item['aircraft_shadow'] = 'PA18.png';
-								else $spotter_item['aircraft_shadow'] = '';
+								if (count($aircraft_info) > 0) {
+									$spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
+								} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
+									$spotter_item['aircraft_shadow'] = 'PA18.png';
+								} else {
+									$spotter_item['aircraft_shadow'] = '';
+								}
 							}
 						}
 						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'].'",';
@@ -184,8 +236,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'].'",';
@@ -197,8 +252,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'].'",';
@@ -216,19 +274,30 @@ 
 							$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'].'],';
 						//$output .= '"nextlatlon": ['.$nextcoord['longitude'].','.$nextcoord['latitude'].'],';
 
-						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']))).'",';
 						}
@@ -236,8 +305,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'].'",';
@@ -255,8 +327,11 @@ 
 							$output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",';
 						}
 						// type when not aircraft ?
-						if ($compress) $output .= '"t": "aircraft"';
-						else $output .= '"type": "aircraft"';
+						if ($compress) {
+							$output .= '"t": "aircraft"';
+						} else {
+							$output .= '"type": "aircraft"';
+						}
 						$output .= '},';
 						$output .= '"geometry": {';
 							$output .= '"type": "Point",';
@@ -325,7 +400,9 @@ 
 				//if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) || $globalMapHistory || $allhistory) || (isset($_GET['history']) && $_GET['history'] != '' && $_GET['history'] != 'NA' && ($_GET['history'] == $spotter_item['ident'] || $_GET['history'] == $spotter_item['flightaware_id'])))) {
 				//if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) || $globalMapHistory || $allhistory) || (isset($_GET['history']) && $_GET['history'] != '' && $_GET['history'] != 'NA' && ($_GET['history'] == $spotter_item['ident'] || $_GET['history'] == $spotter_item['flightaware_id']))) || (isset($_GET['history']) && $_GET['history'] == '' && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])) {
 				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
-				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
+				if ($history == '' && isset($_COOKIE['history'])) {
+					$history = $_COOKIE['history'];
+				}
 				if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) || $globalMapHistory || $allhistory) 
 				|| (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))) 
 				|| (isset($history) && $history == '' && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])) {
@@ -350,8 +427,11 @@ 
 						$output_history .= ']}},';
 						$output .= $output_history;
 					    }
-					    if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
-					    else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
+					    if ($compress) {
+					    	$output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
+					    } else {
+					    	$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
+					    }
 					}
 					$output_history .= '[';
 					$output_history .=  $spotter_history['longitude'].', ';
@@ -401,7 +481,9 @@ 
 			$output .= ']';
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
 			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
-			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
+			if (isset($begindate)) {
+				$output .= '"archive_date": "'.$begindate.'",';
+			}
 			$output .= '"fc": "'.$j.'"';
 		} else {
 			$output .= '"features": ';

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": ';

aircraft-data.php

Braces +34 added lines, -12 removed lines

@@ -46,7 +46,9 @@ 
 {
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
 		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-	} else $image = $spotter_item['image_thumbnail'];
+	} else {
+		$image = $spotter_item['image_thumbnail'];
+	}
 
 }
 /* else {
@@ -58,7 +60,9 @@ 
 	print '<div class="left"><img src="'.$image.'" alt="'.$spotter_item['registration'].' '.$spotter_item['aircraft_name'].'" title="'.$spotter_item['registration'].' '.$spotter_item['aircraft_name'].' Image &copy; '.$spotter_item['image_copyright'].'"/><br />Image &copy; '.$spotter_item['image_copyright'].'</div>';
 }
 print '<div class="right"><div class="callsign-details"><div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a></div>';
-if (isset($spotter_item['airline_name'])) print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
+if (isset($spotter_item['airline_name'])) {
+	print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
+}
 print '</div>';
 print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country'];
 if (isset($spotter_item['departure_airport_time'])) {
@@ -86,9 +90,14 @@ 
 print '<span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport'].'</a></span>'.$spotter_item['arrival_airport_city'].' '.$spotter_item['arrival_airport_country'];
 print '</div></div><div>';
 print '<span>'._("Aircraft").'</span>';
-if (isset($spotter_item['aircraft_wiki'])) print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
-if (isset($spotter_item['aircraft_type'])) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
-else print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
+if (isset($spotter_item['aircraft_wiki'])) {
+	print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
+}
+if (isset($spotter_item['aircraft_type'])) {
+	print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
+} else {
+	print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
+}
 print '</div>';
 print '<div><span>'._("Altitude").'</span>';
 if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
@@ -97,7 +106,9 @@ 
 	print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
 }
 print '</div>';
-if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
+if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') {
+	print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
+}
 print '<div><span>'._("Speed").'</span>';
 if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) {
 	print round($spotter_item['ground_speed']*1.15078).' mph';
@@ -111,8 +122,11 @@ 
 print '<div><span>'._("Heading").'</span>'.$spotter_item['heading'].'°</div>';
 if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != '') {
 	print '<div><span>'._("Pilot").'</span>';
-	if (isset($spotter_item['pilot_id'])) print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
-	else print $spotter_item['pilot_name'];
+	if (isset($spotter_item['pilot_id'])) {
+		print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
+	} else {
+		print $spotter_item['pilot_name'];
+	}
 	print '</div>';
 }
 
@@ -133,10 +147,18 @@ 
 }
 print '</div>';
 
-if (isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
-if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
-if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
-if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
+if (isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') {
+	print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
+}
+if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') {
+	print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
+}
+if (isset($spotter_item['acars']['message'])) {
+	print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
+}
+if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) {
+	print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
+}
 print '</div>';
 ?>
 </div>

Spacing +12 added lines, -12 removed lines

@@ -9,14 +9,14 @@ 
 
 $from_archive = false;
 if (isset($_GET['ident'])) {
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident,$currenttime);
+		$spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident, $currenttime);
 		if (empty($spotter_array)) {
 			$from_archive = true;
-			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident,$currenttime);
+			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident, $currenttime);
 		}
 	} else {
 		$spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident);
@@ -27,15 +27,15 @@ 
 	}
 }
 if (isset($_GET['flightaware_id'])) {
-	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+	$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id,$currenttime);
+		$spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id, $currenttime);
 		if (empty($spotter_array)) {
 			$from_archive = true;
 //			$spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
-			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id,$currenttime);
+			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id, $currenttime);
 		}
 	} else {
 		$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
@@ -54,7 +54,7 @@ 
 if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "")
 {
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
-		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+		$image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 	} else $image = $spotter_item['image_thumbnail'];
 
 }
@@ -72,7 +72,7 @@ 
 print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country'];
 if (isset($spotter_item['departure_airport_time'])) {
 	if ($spotter_item['departure_airport_time'] > 2460) {
-		print '<br /><span class="time">'.date('H:m',$spotter_item['departure_airport_time']).'</span>';
+		print '<br /><span class="time">'.date('H:m', $spotter_item['departure_airport_time']).'</span>';
 	} else {
 		print '<br /><span class="time">'.$spotter_item['departure_airport_time'].'</span>';
 	}
@@ -81,7 +81,7 @@ 
 print '<span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport'].'</a></span>'.$spotter_item['arrival_airport_city'].' '.$spotter_item['arrival_airport_country'];
 if (isset($spotter_item['arrival_airport_time'])) {
 	if ($spotter_item['arrival_airport_time'] > 2460) {
-		print '<br /><span class="time">'.date('H:m',$spotter_item['arrival_airport_time']).'</span>';
+		print '<br /><span class="time">'.date('H:m', $spotter_item['arrival_airport_time']).'</span>';
 	} else {
 		print '<br /><span class="time">'.$spotter_item['arrival_airport_time'].'</span>';
 	}
@@ -149,7 +149,7 @@ 
 
 if (isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
 if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
-if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
+if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br/>', $spotter_item['acars']['message'])).'</div>';
 if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
 print '</div>';
 ?>

live-czml.php

Indentation +50 added lines, -50 removed lines

@@ -13,30 +13,30 @@ 
 
 
 function quaternionrotate($heading, $attitude = 0, $bank = 0) {
-    // Assuming the angles are in radians.
-    $c1 = cos($heading/2);
-    $s1 = sin($heading/2);
-    $c2 = cos($attitude/2);
-    $s2 = sin($attitude/2);
-    $c3 = cos($bank/2);
-    $s3 = sin($bank/2);
-    $c1c2 = $c1*$c2;
-    $s1s2 = $s1*$s2;
-    $w =$c1c2*$c3 - $s1s2*$s3;
-    $x =$c1c2*$s3 + $s1s2*$c3;
-    $y =$s1*$c2*$c3 + $c1*$s2*$s3;
-    $z =$c1*$s2*$c3 - $s1*$c2*$s3;
-    return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
+	// Assuming the angles are in radians.
+	$c1 = cos($heading/2);
+	$s1 = sin($heading/2);
+	$c2 = cos($attitude/2);
+	$s2 = sin($attitude/2);
+	$c3 = cos($bank/2);
+	$s3 = sin($bank/2);
+	$c1c2 = $c1*$c2;
+	$s1s2 = $s1*$s2;
+	$w =$c1c2*$c3 - $s1s2*$s3;
+	$x =$c1c2*$s3 + $s1s2*$c3;
+	$y =$s1*$c2*$c3 + $c1*$s2*$s3;
+	$z =$c1*$s2*$c3 - $s1*$c2*$s3;
+	return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
 //    return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365');
 
 }
 
 
 if (isset($_GET['download'])) {
-    if ($_GET['download'] == "true")
-    {
+	if ($_GET['download'] == "true")
+	{
 	header('Content-disposition: attachment; filename="flightairmap.json"');
-    }
+	}
 }
 header('Content-Type: text/javascript');
 
@@ -188,78 +188,78 @@ 
 				$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$aircraft_shadow].'","scale" : 1.0,"minimumPixelSize": 20 },';
 			} elseif ($spotter_item['engine_type'] == 'Jet') {
 				if ($spotter_item['engine_count'] == '1') {
-				    if ($spotter_item['wake_category'] == 'M') {
+					if ($spotter_item['wake_category'] == 'M') {
 					$model = 'J1M';
-				    } elseif ($spotter_item['wake_category'] == 'L') {
+					} elseif ($spotter_item['wake_category'] == 'L') {
 					$model = '';
-				    }
+					}
 				} elseif ($spotter_item['engine_count'] == '2') {
-				    if ($spotter_item['wake_category'] == 'M') {
+					if ($spotter_item['wake_category'] == 'M') {
 					$model = 'J2M';
-				    } elseif ($spotter_item['wake_category'] == 'H') {
+					} elseif ($spotter_item['wake_category'] == 'H') {
 					$model = 'J2H';
-				    } elseif ($spotter_item['wake_category'] == 'L') {
+					} elseif ($spotter_item['wake_category'] == 'L') {
 					$model = 'J2L';
-				    }
+					}
 				} elseif ($spotter_item['engine_count'] == '3') {
-				    if ($spotter_item['wake_category'] == 'M') {
+					if ($spotter_item['wake_category'] == 'M') {
 					$model = 'J3M';
-				    } elseif ($spotter_item['wake_category'] == 'H') {
+					} elseif ($spotter_item['wake_category'] == 'H') {
 					$model = 'J3H';
-				    }
+					}
 				} elseif ($spotter_item['engine_count'] == '4') {
-				    if ($spotter_item['wake_category'] == 'M') {
+					if ($spotter_item['wake_category'] == 'M') {
 					$model = 'J4M';
-				    } elseif ($spotter_item['wake_category'] == 'H') {
+					} elseif ($spotter_item['wake_category'] == 'H') {
 					$model = 'J4H';
-				    }
+					}
 				}
 				if (isset($modelsdb[$model])) {
-				    $output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$model].'","scale" : 1.0,"minimumPixelSize": 20 },';
+					$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$model].'","scale" : 1.0,"minimumPixelSize": 20 },';
 				} else {
-				    $output .= '"model": {"gltf" : "'.$globalURL.'/models/Cesium_Air.glb","scale" : 1.0,"minimumPixelSize": 20 },';
+					$output .= '"model": {"gltf" : "'.$globalURL.'/models/Cesium_Air.glb","scale" : 1.0,"minimumPixelSize": 20 },';
 				}
 			} elseif ($spotter_item['engine_type'] == 'Turboprop') {
 				if ($spotter_item['engine_count'] == '1') {
-				    if ($spotter_item['wake_category'] == 'L') {
+					if ($spotter_item['wake_category'] == 'L') {
 					$model = 'T1L';
-				    }
+					}
 				} elseif ($spotter_item['engine_count'] == '2') {
-				    if ($spotter_item['wake_category'] == 'M') {
+					if ($spotter_item['wake_category'] == 'M') {
 					$model = 'T2M';
-				    } elseif ($spotter_item['wake_category'] == 'L') {
+					} elseif ($spotter_item['wake_category'] == 'L') {
 					$model = 'T2L';
-				    }
+					}
 				} elseif ($spotter_item['engine_count'] == '4') {
-				    if ($spotter_item['wake_category'] == 'M') {
-				    } elseif ($spotter_item['wake_category'] == 'H') {
+					if ($spotter_item['wake_category'] == 'M') {
+					} elseif ($spotter_item['wake_category'] == 'H') {
 					$model = 'T4H';
-				    }
+					}
 				}
 				if (isset($modelsdb[$model])) {
-				    $output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$model].'","scale" : 1.0,"minimumPixelSize": 20 },';
+					$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$model].'","scale" : 1.0,"minimumPixelSize": 20 },';
 				} else {
-				    $output .= '"model": {"gltf" : "'.$globalURL.'/models/Cesium_Air.glb","scale" : 1.0,"minimumPixelSize": 20 },';
+					$output .= '"model": {"gltf" : "'.$globalURL.'/models/Cesium_Air.glb","scale" : 1.0,"minimumPixelSize": 20 },';
 				}
 			} elseif ($spotter_item['engine_type'] == 'Piston') {
 				if ($spotter_item['engine_count'] == '1') {
-				    if ($spotter_item['wake_category'] == 'L') {
+					if ($spotter_item['wake_category'] == 'L') {
 					$model = 'P1L';
-				    } elseif ($spotter_item['wake_category'] == 'M') {
+					} elseif ($spotter_item['wake_category'] == 'M') {
 					$model = 'P1M';
-				    }
+					}
 				} elseif ($spotter_item['engine_count'] == '2') {
-				    if ($spotter_item['wake_category'] == 'M') {
+					if ($spotter_item['wake_category'] == 'M') {
 					$model = 'P2M';
-				    } elseif ($spotter_item['wake_category'] == 'L') {
+					} elseif ($spotter_item['wake_category'] == 'L') {
 					$model = 'P2L';
-				    }
+					}
 				// ju52 = P3M
 				}
 				if (isset($modelsdb[$model])) {
-				    $output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$model].'","scale" : 1.0,"minimumPixelSize": 20 },';
+					$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$model].'","scale" : 1.0,"minimumPixelSize": 20 },';
 				} else {
-				    $output .= '"model": {"gltf" : "'.$globalURL.'/models/Cesium_Air.glb","scale" : 1.0,"minimumPixelSize": 20 },';
+					$output .= '"model": {"gltf" : "'.$globalURL.'/models/Cesium_Air.glb","scale" : 1.0,"minimumPixelSize": 20 },';
 				}
 			} else {
 				$output .= '"model": {"gltf" : "'.$globalURL.'/models/Cesium_Air.glb","scale" : 1.0,"minimumPixelSize": 20 },';

Spacing +34 added lines, -34 removed lines

@@ -22,11 +22,11 @@ 
     $s3 = sin($bank/2);
     $c1c2 = $c1*$c2;
     $s1s2 = $s1*$s2;
-    $w =$c1c2*$c3 - $s1s2*$s3;
-    $x =$c1c2*$s3 + $s1s2*$c3;
-    $y =$s1*$c2*$c3 + $c1*$s2*$s3;
-    $z =$c1*$s2*$c3 - $s1*$c2*$s3;
-    return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
+    $w = $c1c2*$c3 - $s1s2*$s3;
+    $x = $c1c2*$s3 + $s1s2*$c3;
+    $y = $s1*$c2*$c3 + $c1*$s2*$s3;
+    $z = $c1*$s2*$c3 - $s1*$c2*$s3;
+    return array('x' => $x, 'y' => $y, 'z' => $z, 'w' => $w);
 //    return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365');
 
 }
@@ -47,15 +47,15 @@ 
 $min = false;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',', $_COOKIE['filter_Airlines']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',', $_COOKIE['filter_Sources']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'], FILTER_SANITIZE_STRING);
 /*
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
@@ -102,12 +102,12 @@ 
 	$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);
 } elseif (isset($_COOKIE['archive']) && isset($_COOKIE['archive_begin']) && isset($_COOKIE['archive_end']) && isset($_COOKIE['archive_speed'])) {
 	$from_archive = true;
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
@@ -117,34 +117,34 @@ 
 	$begindate = $_COOKIE['archive_begin'];
 	$enddate = $_COOKIE['archive_end'];
 
-	$archivespeed = filter_var($_COOKIE['archive_speed'],FILTER_SANITIZE_NUMBER_INT);
-	$begindate = date('Y-m-d H:i:s',$begindate);
-	$enddate = date('Y-m-d H:i:s',$enddate);
+	$archivespeed = filter_var($_COOKIE['archive_speed'], FILTER_SANITIZE_NUMBER_INT);
+	$begindate = date('Y-m-d H:i:s', $begindate);
+	$enddate = date('Y-m-d H:i:s', $enddate);
 //	echo 'Begin : '.$begindate.' - End : '.$enddate."\n";
-	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
+	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
 } else {
 	$spotter_array = $SpotterLive->getMinLastLiveSpotterData($filter);
 }
 
 if (!empty($spotter_array)) {
 	if (isset($_GET['archive'])) {
-		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
+		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
 	} else {
 		$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
 	}
 	if ($flightcnt == '') $flightcnt = 0;
 } else $flightcnt = 0;
 
-$sqltime = round(microtime(true)-$begintime,2);
+$sqltime = round(microtime(true) - $begintime, 2);
 $minitime = time();
 $maxitime = 0;
 
 
 $modelsdb = array();
 if (file_exists('models/modelsdb')) {
-	if (($handle = fopen('models/modelsdb','r')) !== FALSE) {
-		while (($row = fgetcsv($handle,1000)) !== FALSE) {
-			if (isset($row[1]) ){
+	if (($handle = fopen('models/modelsdb', 'r')) !== FALSE) {
+		while (($row = fgetcsv($handle, 1000)) !== FALSE) {
+			if (isset($row[1])) {
 				$model = $row[0];
 				$modelsdb[$model] = $row[1];
 			}
@@ -172,7 +172,7 @@ 
 $output .= '},';
 if (!empty($spotter_array) && is_array($spotter_array))
 {
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		$j++;
 		date_default_timezone_set('UTC');
@@ -310,7 +310,7 @@ 
 			$output .= '"cartographicDegrees": [';
 			if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
 			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
-			$output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
+			$output .= '"'.date("c", strtotime($spotter_item['date'])).'", ';
 			$output .= $spotter_item['longitude'].', ';
 			$output .= $spotter_item['latitude'].', ';
 			$prevlong = $spotter_item['longitude'];
@@ -322,7 +322,7 @@ 
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
 			//$orientation .= '"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
 		} else {
-			$output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
+			$output .= ',"'.date("c", strtotime($spotter_item['date'])).'", ';
 			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
 			if ($spotter_item['ground_speed'] == 0) {
 				$output .= $prevlong.', ';
@@ -351,7 +351,7 @@ 
 	$output  = substr($output, 0, -1);
 }
 $output .= ']';
-$output = str_replace('%minitime%',date("c",$minitime),$output);
-$output = str_replace('%maxitime%',date("c",$maxitime),$output);
+$output = str_replace('%minitime%', date("c", $minitime), $output);
+$output = str_replace('%maxitime%', date("c", $maxitime), $output);
 print $output;
 ?>

Braces +56 added lines, -19 removed lines

@@ -40,22 +40,43 @@ 
 }
 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['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('sbs'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
+}
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') {
+	$filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') {
+	$filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') {
+	$filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') {
+	$filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
+}
 /*
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
@@ -132,8 +153,12 @@ 
 	} else {
 		$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
 	}
-	if ($flightcnt == '') $flightcnt = 0;
-} else $flightcnt = 0;
+	if ($flightcnt == '') {
+		$flightcnt = 0;
+	}
+	} else {
+	$flightcnt = 0;
+}
 
 $sqltime = round(microtime(true)-$begintime,2);
 $minitime = time();
@@ -155,7 +180,9 @@ 
 $j = 0;
 $prev_flightaware_id = '';
 $speed = 1;
-if (isset($archivespeed)) $speed = $archivespeed;
+if (isset($archivespeed)) {
+	$speed = $archivespeed;
+}
 $output = '[';
 $output .= '{"id" : "document", "name" : "fam","version" : "1.0"';
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "LOOP_STOP","step": "SYSTEM_CLOCK_MULTIPLIER"}';
@@ -296,8 +323,12 @@ 
 				}
 			} else {
 				$output .= '"model": {"gltf" : "'.$globalURL.'/models/Cesium_Air.glb","scale" : 1.0,"minimumPixelSize": 20 },';
-				if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
-				if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
+				if ($spotter_item['aircraft_shadow'] != '') {
+					$output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
+				}
+				if ($spotter_item['aircraft_icao'] != '') {
+					$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
+				}
 			}
 	//		$output .= '"heightReference": "CLAMP_TO_GROUND",';
 			$output .= '"heightReference": "RELATIVE_TO_GROUND",';
@@ -308,8 +339,12 @@ 
 	//		$output .= '"interpolationDegree" : 5,';
 	//		$output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", ';
 			$output .= '"cartographicDegrees": [';
-			if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
+			if ($minitime > strtotime($spotter_item['date'])) {
+				$minitime = strtotime($spotter_item['date']);
+			}
+			if ($maxitime < strtotime($spotter_item['date'])) {
+				$maxitime = strtotime($spotter_item['date']);
+			}
 			$output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
 			$output .= $spotter_item['longitude'].', ';
 			$output .= $spotter_item['latitude'].', ';
@@ -323,7 +358,9 @@ 
 			//$orientation .= '"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
 		} else {
 			$output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
+			if ($maxitime < strtotime($spotter_item['date'])) {
+				$maxitime = strtotime($spotter_item['date']);
+			}
 			if ($spotter_item['ground_speed'] == 0) {
 				$output .= $prevlong.', ';
 				$output .= $prevlat.', ';

install/index.php

Indentation +36 added lines, -36 removed lines

@@ -92,7 +92,7 @@ 
 	}
 	print '</ul>You <strong>must</strong> add these modules/fix errors.</div>';
 	require('../footer.php');
-        exit;
+		exit;
 }
 
 if (!isset($_SESSION['install']) && !isset($_POST['dbtype']) && (count($error) == 0)) {
@@ -301,17 +301,17 @@ 
 				</tr>
 				<!--
 		<?php
-		    require_once(dirname(__FILE__).'/../require/class.Connection.php');
-		    $Connection = new Connection();
+			require_once(dirname(__FILE__).'/../require/class.Connection.php');
+			$Connection = new Connection();
 		?>
 				-->
 		<?php
-		    if ($Connection->db != NULL) {
+			if ($Connection->db != NULL) {
 			if ($Connection->tableExists('source_location')) {
-			    require_once(dirname(__FILE__).'/../require/class.Source.php');
-			    $Source = new Source();
-			    $alllocations = $Source->getAllLocationInfo();
-			    foreach ($alllocations as $location) {
+				require_once(dirname(__FILE__).'/../require/class.Source.php');
+				$Source = new Source();
+				$alllocations = $Source->getAllLocationInfo();
+				foreach ($alllocations as $location) {
 		?>
 				<tr>
 	    				<input type="hidden" name="source_id[]" value="<?php print $location['id']; ?>" />
@@ -325,9 +325,9 @@ 
 				</tr>
 		
 		<?php
-			    }
+				}
+			}
 			}
-		    }
 		?>
 
 				<tr>
@@ -418,12 +418,12 @@ 
 ?>
 							<tr>
 								<?php
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
+									if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
 								?>
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
 								<td><input type="number" name="port[]" id="port" value="<?php print $source['port']; ?>" /></td>
 								<?php
-								    } else {
+									} else {
 									$hostport = explode(':',$source['host']);
 									if (isset($hostport[1])) {
 										$host = $hostport[0];
@@ -436,7 +436,7 @@ 
 								<td><input type="text" name="host[]" id="host" value="<?php print $host; ?>" /></td>
 								<td><input type="number" name="port[]" id="port" value="<?php print $port; ?>" /></td>
 								<?php
-								    }
+									}
 								?>
 								<td>
 									<select name="format[]" id="format">
@@ -727,7 +727,7 @@ 
 			<br />
 			<p>
 			<?php 
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
+				if (extension_loaded('gd') && function_exists('gd_info')) {
 			?>
 				<label for="aircrafticoncolor">Color of aircraft icon on map</label>
 				<input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" />
@@ -737,11 +737,11 @@ 
 				<b>The directory cache is not writable, aircraft icon will not be cached</b>
 			<?php
 				}
-			    } else {
+				} else {
 			?>
 				<b>PHP GD is not installed, you can t change color of aircraft icon on map</b>
 			<?php
-			    }
+				}
 			?>
 			</p>
 			<br />
@@ -760,7 +760,7 @@ 
 	</p>
 <?php
 	require('../footer.php');
-        exit;
+		exit;
 }
 	
 $settings = array();
@@ -850,8 +850,8 @@ 
 	
 	$sources = array();
 	foreach ($source_name as $keys => $name) {
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
+		if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
+		else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
 	}
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
 
@@ -1116,14 +1116,14 @@ 
 
 	// Set some defaults values...
 	if (!isset($globalAircraftImageSources)) {
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
+		$globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		$settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
 	}
 
 	if (!isset($globalSchedulesSources)) {
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
-    	}
+		$globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
+			$settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
+		}
 
 	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
 
@@ -1175,21 +1175,21 @@ 
 	$popi = false;
 	$popw = false;
 	foreach ($_SESSION['done'] as $done) {
-	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
-	    if ($done == 'Create database') $pop = true;
-	    if ($_SESSION['install'] == 'database_create') $pop = true;
-	    if ($_SESSION['install'] == 'database_import') $popi = true;
-	    if ($_SESSION['install'] == 'waypoints') $popw = true;
+		print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
+		if ($done == 'Create database') $pop = true;
+		if ($_SESSION['install'] == 'database_create') $pop = true;
+		if ($_SESSION['install'] == 'database_import') $popi = true;
+		if ($_SESSION['install'] == 'waypoints') $popw = true;
 	}
 	if ($pop) {
-	    sleep(5);
-	    print '<li>Create database....<img src="../images/loading.gif" /></li>';
+		sleep(5);
+		print '<li>Create database....<img src="../images/loading.gif" /></li>';
 	} else if ($popi) {
-	    sleep(5);
-	    print '<li>Create and import tables....<img src="../images/loading.gif" /></li>';
+		sleep(5);
+		print '<li>Create and import tables....<img src="../images/loading.gif" /></li>';
 	} else if ($popw) {
-	    sleep(5);
-	    print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>';
+		sleep(5);
+		print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>';
 	} else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>';
 	print '</div></ul>';
 	print '<div id="error"></div>';
@@ -1252,7 +1252,7 @@ 
 	unset($_COOKIE['install']);
 	print '<div class="info column"><ul>';
 	foreach ($_SESSION['done'] as $done) {
-	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
+		print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
 	}
 	print '<li>Reloading page to check all is now ok....<strong>SUCCESS</strong></li>';
 	print '</ul></div>';

Braces +409 added lines, -106 removed lines

@@ -124,45 +124,72 @@ 
 			</div>
 			<p>
 				<label for="dbhost">Database hostname</label>
-				<input type="text" name="dbhost" id="dbhost" value="<?php if (isset($globalDBhost)) print $globalDBhost; ?>" />
+				<input type="text" name="dbhost" id="dbhost" value="<?php if (isset($globalDBhost)) {
+	print $globalDBhost;
+}
+?>" />
 			</p>
 			<p>
 				<label for="dbport">Database port</label>
-				<input type="text" name="dbport" id="dbport" value="<?php if (isset($globalDBport)) print $globalDBport; ?>" />
+				<input type="text" name="dbport" id="dbport" value="<?php if (isset($globalDBport)) {
+	print $globalDBport;
+}
+?>" />
 				<p class="help-block">Default is 3306 for MariaDB/MySQL, 5432 for PostgreSQL</p>
 			</p>
 			<p>
 				<label for="dbname">Database name</label>
-				<input type="text" name="dbname" id="dbname" value="<?php if (isset($globalDBname)) print $globalDBname; ?>" />
+				<input type="text" name="dbname" id="dbname" value="<?php if (isset($globalDBname)) {
+	print $globalDBname;
+}
+?>" />
 			</p>
 			<p>
 				<label for="dbuser">Database user</label>
-				<input type="text" name="dbuser" id="dbuser" value="<?php if (isset($globalDBuser)) print $globalDBuser; ?>" />
+				<input type="text" name="dbuser" id="dbuser" value="<?php if (isset($globalDBuser)) {
+	print $globalDBuser;
+}
+?>" />
 			</p>
 			<p>
 				<label for="dbuserpass">Database user password</label>
-				<input type="password" name="dbuserpass" id="dbuserpass" value="<?php if (isset($globalDBpass)) print $globalDBpass; ?>" />
+				<input type="password" name="dbuserpass" id="dbuserpass" value="<?php if (isset($globalDBpass)) {
+	print $globalDBpass;
+}
+?>" />
 			</p>
 		</fieldset>
 		<fieldset id="site">
 			<legend>Site configuration</legend>
 			<p>
 				<label for="sitename">Site name</label>
-				<input type="text" name="sitename" id="sitename" value="<?php if (isset($globalName)) print $globalName; ?>" />
+				<input type="text" name="sitename" id="sitename" value="<?php if (isset($globalName)) {
+	print $globalName;
+}
+?>" />
 			</p>
 			<p>
 				<label for="siteurl">Site directory</label>
-				<input type="text" name="siteurl" id="siteurl" value="<?php if (isset($globalURL)) print $globalURL; ?>" />
+				<input type="text" name="siteurl" id="siteurl" value="<?php if (isset($globalURL)) {
+	print $globalURL;
+}
+?>" />
 				<p class="help-block">Can be null. ex : <i>flightairmap</i> if complete URL is <i>http://toto.com/flightairmap</i></p>
 			</p>
 			<p>
 				<label for="timezone">Timezone</label>
-				<input type="text" name="timezone" id="timezone" value="<?php if (isset($globalTimezone)) print $globalTimezone; ?>" />
+				<input type="text" name="timezone" id="timezone" value="<?php if (isset($globalTimezone)) {
+	print $globalTimezone;
+}
+?>" />
 				<p class="help-block">ex : UTC, Europe/Paris,...</p>
 			</p>
 			<p>
 				<label for="language">Language</label>
-				<input type="text" name="language" id="language" value="<?php if (isset($globalLanguage)) print $globalLanguage; ?>" />
+				<input type="text" name="language" id="language" value="<?php if (isset($globalLanguage)) {
+	print $globalLanguage;
+}
+?>" />
 				<p class="help-block">Used only when link to wikipedia for now. Can be EN,DE,FR,...</p>
 			</p>
 		</fieldset>
@@ -183,11 +210,17 @@ 
 			<div id="mapbox_data">
 				<p>
 					<label for="mapboxid">Mapbox id</label>
-					<input type="text" name="mapboxid" id="mapboxid" value="<?php if (isset($globalMapboxId)) print $globalMapboxId; ?>" />
+					<input type="text" name="mapboxid" id="mapboxid" value="<?php if (isset($globalMapboxId)) {
+	print $globalMapboxId;
+}
+?>" />
 				</p>
 				<p>
 					<label for="mapboxtoken">Mapbox token</label>
-					<input type="text" name="mapboxtoken" id="mapboxtoken" value="<?php if (isset($globalMapboxToken)) print $globalMapboxToken; ?>" />
+					<input type="text" name="mapboxtoken" id="mapboxtoken" value="<?php if (isset($globalMapboxToken)) {
+	print $globalMapboxToken;
+}
+?>" />
 				</p>
 				<p class="help-block">Get a key <a href="https://www.mapbox.com/developers/">here</a></p>
 			</div>
@@ -195,7 +228,10 @@ 
 			<div id="google_data">
 				<p>
 					<label for="googlekey">Google API key</label>
-					<input type="text" name="googlekey" id="googlekey" value="<?php if (isset($globalGoogleAPIKey)) print $globalGoogleAPIKey; ?>" />
+					<input type="text" name="googlekey" id="googlekey" value="<?php if (isset($globalGoogleAPIKey)) {
+	print $globalGoogleAPIKey;
+}
+?>" />
 					<p class="help-block">Get a key <a href="https://developers.google.com/maps/documentation/javascript/get-api-key#get-an-api-key">here</a></p>
 				</p>
 			</div>
@@ -203,7 +239,10 @@ 
 			<div id="bing_data">
 				<p>
 					<label for="bingkey">Bing Map key</label>
-					<input type="text" name="bingkey" id="bingkey" value="<?php if (isset($globalBingMapKey)) print $globalBingMapKey; ?>" />
+					<input type="text" name="bingkey" id="bingkey" value="<?php if (isset($globalBingMapKey)) {
+	print $globalBingMapKey;
+}
+?>" />
 					<p class="help-block">Get a key <a href="https://www.bingmapsportal.com/">here</a></p>
 				</p>
 			</div>
@@ -211,7 +250,10 @@ 
 			<div id="mapquest_data">
 				<p>
 					<label for="mapquestkey">MapQuest key</label>
-					<input type="text" name="mapquestkey" id="mapquestkey" value="<?php if (isset($globalMapQuestKey)) print $globalMapQuestKey; ?>" />
+					<input type="text" name="mapquestkey" id="mapquestkey" value="<?php if (isset($globalMapQuestKey)) {
+	print $globalMapQuestKey;
+}
+?>" />
 					<p class="help-block">Get a key <a href="https://developer.mapquest.com/user/me/apps">here</a></p>
 				</p>
 			</div>
@@ -219,11 +261,17 @@ 
 			<div id="here_data">
 				<p>
 					<label for="hereappid">Here App_Id</label>
-					<input type="text" name="hereappid" id="hereappid" value="<?php if (isset($globalHereappId)) print $globalHereappId; ?>" />
+					<input type="text" name="hereappid" id="hereappid" value="<?php if (isset($globalHereappId)) {
+	print $globalHereappId;
+}
+?>" />
 				</p>
 				<p>
 					<label for="hereappcode">Here App_Code</label>
-					<input type="text" name="hereappcode" id="hereappcode" value="<?php if (isset($globalHereappCode)) print $globalHereappCode; ?>" />
+					<input type="text" name="hereappcode" id="hereappcode" value="<?php if (isset($globalHereappCode)) {
+	print $globalHereappCode;
+}
+?>" />
 				</p>
 				<p class="help-block">Get a key <a href="https://developer.here.com/rest-apis/documentation/enterprise-map-tile/topics/quick-start.html">here</a></p>
 			</div>
@@ -232,42 +280,86 @@ 
 			<legend>Coverage area</legend>
 			<p>
 				<label for="latitudemax">The maximum latitude (north)</label>
-				<input type="text" name="latitudemax" id="latitudemax" value="<?php if (isset($globalLatitudeMax)) print $globalLatitudeMax; ?>" />
+				<input type="text" name="latitudemax" id="latitudemax" value="<?php if (isset($globalLatitudeMax)) {
+	print $globalLatitudeMax;
+}
+?>" />
 			</p>
 			<p>
 				<label for="latitudemin">The minimum latitude (south)</label>
-				<input type="text" name="latitudemin" id="latitudemin" value="<?php if (isset($globalLatitudeMin)) print $globalLatitudeMin; ?>" />
+				<input type="text" name="latitudemin" id="latitudemin" value="<?php if (isset($globalLatitudeMin)) {
+	print $globalLatitudeMin;
+}
+?>" />
 			</p>
 			<p>
 				<label for="longitudemax">The maximum longitude (west)</label>
-				<input type="text" name="longitudemax" id="longitudemax" value="<?php if (isset($globalLongitudeMax)) print $globalLongitudeMax; ?>" />
+				<input type="text" name="longitudemax" id="longitudemax" value="<?php if (isset($globalLongitudeMax)) {
+	print $globalLongitudeMax;
+}
+?>" />
 			</p>
 			<p>
 				<label for="longitudemin">The minimum longitude (east)</label>
-				<input type="text" name="longitudemin" id="longitudemin" value="<?php if (isset($globalLongitudeMin)) print $globalLongitudeMin; ?>" />
+				<input type="text" name="longitudemin" id="longitudemin" value="<?php if (isset($globalLongitudeMin)) {
+	print $globalLongitudeMin;
+}
+?>" />
 			</p>
 			<p>
 				<label for="latitudecenter">The latitude center</label>
-				<input type="text" name="latitudecenter" id="latitudecenter" value="<?php if (isset($globalCenterLatitude)) print $globalCenterLatitude; ?>" />
+				<input type="text" name="latitudecenter" id="latitudecenter" value="<?php if (isset($globalCenterLatitude)) {
+	print $globalCenterLatitude;
+}
+?>" />
 			</p>
 			<p>
 				<label for="longitudecenter">The longitude center</label>
-				<input type="text" name="longitudecenter" id="longitudecenter" value="<?php if (isset($globalCenterLongitude)) print $globalCenterLongitude; ?>" />
+				<input type="text" name="longitudecenter" id="longitudecenter" value="<?php if (isset($globalCenterLongitude)) {
+	print $globalCenterLongitude;
+}
+?>" />
 			</p>
 			<p>
 				<label for="livezoom">Default Zoom on live map</label>
-				<input type="number" name="livezoom" id="livezoom" value="<?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>" />
+				<input type="number" name="livezoom" id="livezoom" value="<?php if (isset($globalLiveZoom)) {
+	print $globalLiveZoom;
+} else {
+	print '9';
+}
+?>" />
 			</p>
 			<p>
 				<label for="squawk_country">Country for squawk usage</label>
 				<select name="squawk_country" id="squawk_country">
-					<option value="UK"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'UK') print ' selected '; ?>>UK</option>
-					<option value="NZ"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NZ') print ' selected '; ?>>NZ</option>
-					<option value="US"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'US') print ' selected '; ?>>US</option>
-					<option value="AU"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'AU') print ' selected '; ?>>AU</option>
-					<option value="NL"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NL') print ' selected '; ?>>NL</option>
-					<option value="FR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'FR') print ' selected '; ?>>FR</option>
-					<option value="TR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'TR') print ' selected '; ?>>TR</option>
+					<option value="UK"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'UK') {
+	print ' selected ';
+}
+?>>UK</option>
+					<option value="NZ"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NZ') {
+	print ' selected ';
+}
+?>>NZ</option>
+					<option value="US"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'US') {
+	print ' selected ';
+}
+?>>US</option>
+					<option value="AU"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'AU') {
+	print ' selected ';
+}
+?>>AU</option>
+					<option value="NL"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NL') {
+	print ' selected ';
+}
+?>>NL</option>
+					<option value="FR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'FR') {
+	print ' selected ';
+}
+?>>FR</option>
+					<option value="TR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'TR') {
+	print ' selected ';
+}
+?>>TR</option>
 				</select>
 			</p>
 		</fieldset>
@@ -276,15 +368,24 @@ 
 			<p><i>Only put in DB flights that are inside a circle</i></p>
 			<p>
 				<label for="latitude">Center latitude</label>
-				<input type="text" name="zoilatitude" id="latitude" value="<?php if (isset($globalDistanceIgnore['latitude'])) echo $globalDistanceIgnore['latitude']; ?>" />
+				<input type="text" name="zoilatitude" id="latitude" value="<?php if (isset($globalDistanceIgnore['latitude'])) {
+	echo $globalDistanceIgnore['latitude'];
+}
+?>" />
 			</p>
 			<p>
 				<label for="longitude">Center longitude</label>
-				<input type="text" name="zoilongitude" id="longitude" value="<?php if (isset($globalDistanceIgnore['longitude'])) echo $globalDistanceIgnore['longitude']; ?>" />
+				<input type="text" name="zoilongitude" id="longitude" value="<?php if (isset($globalDistanceIgnore['longitude'])) {
+	echo $globalDistanceIgnore['longitude'];
+}
+?>" />
 			</p>
 			<p>
 				<label for="Distance">Distance (in km)</label>
-				<input type="text" name="zoidistance" id="distance" value="<?php if (isset($globalDistanceIgnore['distance'])) echo $globalDistanceIgnore['distance']; ?>" />
+				<input type="text" name="zoidistance" id="distance" value="<?php if (isset($globalDistanceIgnore['distance'])) {
+	echo $globalDistanceIgnore['distance'];
+}
+?>" />
 			</p>
 		</fieldset>
 		<fieldset id="sourceloc">
@@ -379,11 +480,17 @@ 
 			<div id="flightaware_data">
 				<p>
 					<label for="flightawareusername">FlightAware username</label>
-					<input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) print $globalFlightAwareUsername; ?>" />
+					<input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) {
+	print $globalFlightAwareUsername;
+}
+?>" />
 				</p>
 				<p>
 					<label for="flightawarepassword">FlightAware password/API key</label>
-					<input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) print $globalFlightAwarePassword; ?>" />
+					<input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) {
+	print $globalFlightAwarePassword;
+}
+?>" />
 				</p>
 			</div>
 -->
@@ -442,25 +549,76 @@ 
 								?>
 								<td>
 									<select name="format[]" id="format">
-										<option value="auto" <?php if (!isset($source['format'])) print 'selected'; ?>>Auto</option>
-										<option value="sbs" <?php if (isset($source['format']) && $source['format'] == 'sbs') print 'selected'; ?>>SBS</option>
-										<option value="tsv" <?php if (isset($source['format']) && $source['format'] == 'tsv') print 'selected'; ?>>TSV</option>
-										<option value="raw" <?php if (isset($source['format']) && $source['format'] == 'raw') print 'selected'; ?>>Raw</option>
-										<option value="aprs" <?php if (isset($source['format']) && $source['format'] == 'aprs') print 'selected'; ?>>APRS</option>
-										<option value="deltadbtxt" <?php if (isset($source['format']) && $source['format'] == 'deltadbtxt') print 'selected'; ?>>Radarcape deltadb.txt</option>
-										<option value="vatsimtxt" <?php if (isset($source['format']) && $source['format'] == 'vatsimtxt') print 'selected'; ?>>Vatsim</option>
-										<option value="aircraftlistjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftlistjson') print 'selected'; ?>>Virtual Radar Server</option>
-										<option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') print 'selected'; ?>>phpVMS</option>
-										<option value="vam" <?php if (isset($source['format']) && $source['format'] == 'vam') print 'selected'; ?>>Virtual Airlines Manager</option>
-										<option value="whazzup" <?php if (isset($source['format']) && $source['format'] == 'whazzup') print 'selected'; ?>>IVAO</option>
-										<option value="flightgearmp" <?php if (isset($source['format']) && $source['format'] == 'flightgearmp') print 'selected'; ?>>FlightGear Multiplayer</option>
-										<option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') print 'selected'; ?>>FlightGear Singleplayer</option>
-										<option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') print 'selected'; ?>>ACARS from acarsdec/acarsdeco2 over UDP</option>
-										<option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') print 'selected'; ?>>ACARS over SBS-3 TCP</option>
+										<option value="auto" <?php if (!isset($source['format'])) {
+	print 'selected';
+}
+?>>Auto</option>
+										<option value="sbs" <?php if (isset($source['format']) && $source['format'] == 'sbs') {
+	print 'selected';
+}
+?>>SBS</option>
+										<option value="tsv" <?php if (isset($source['format']) && $source['format'] == 'tsv') {
+	print 'selected';
+}
+?>>TSV</option>
+										<option value="raw" <?php if (isset($source['format']) && $source['format'] == 'raw') {
+	print 'selected';
+}
+?>>Raw</option>
+										<option value="aprs" <?php if (isset($source['format']) && $source['format'] == 'aprs') {
+	print 'selected';
+}
+?>>APRS</option>
+										<option value="deltadbtxt" <?php if (isset($source['format']) && $source['format'] == 'deltadbtxt') {
+	print 'selected';
+}
+?>>Radarcape deltadb.txt</option>
+										<option value="vatsimtxt" <?php if (isset($source['format']) && $source['format'] == 'vatsimtxt') {
+	print 'selected';
+}
+?>>Vatsim</option>
+										<option value="aircraftlistjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftlistjson') {
+	print 'selected';
+}
+?>>Virtual Radar Server</option>
+										<option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') {
+	print 'selected';
+}
+?>>phpVMS</option>
+										<option value="vam" <?php if (isset($source['format']) && $source['format'] == 'vam') {
+	print 'selected';
+}
+?>>Virtual Airlines Manager</option>
+										<option value="whazzup" <?php if (isset($source['format']) && $source['format'] == 'whazzup') {
+	print 'selected';
+}
+?>>IVAO</option>
+										<option value="flightgearmp" <?php if (isset($source['format']) && $source['format'] == 'flightgearmp') {
+	print 'selected';
+}
+?>>FlightGear Multiplayer</option>
+										<option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') {
+	print 'selected';
+}
+?>>FlightGear Singleplayer</option>
+										<option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') {
+	print 'selected';
+}
+?>>ACARS from acarsdec/acarsdeco2 over UDP</option>
+										<option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') {
+	print 'selected';
+}
+?>>ACARS over SBS-3 TCP</option>
 									</select>
 								</td>
-								<td><input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) print $source['name']; ?>" /></td>
-								<td><input type="checkbox" name="sourcestats[]" id="sourcestats" title="Create statistics for the source like number of messages, distance,..." value="1" <?php if (isset($source['sourcestats']) && $source['sourcestats']) print 'checked'; ?> /></td>
+								<td><input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) {
+	print $source['name'];
+}
+?>" /></td>
+								<td><input type="checkbox" name="sourcestats[]" id="sourcestats" title="Create statistics for the source like number of messages, distance,..." value="1" <?php if (isset($source['sourcestats']) && $source['sourcestats']) {
+	print 'checked';
+}
+?> /></td>
 								<td><input type="button" id="delhost" value="Delete" onclick="deleteRow(this)" /> <input type="button" id="addhost" value="Add" onclick="insRow()" /></td>
 							</tr>
 <?php
@@ -506,11 +664,17 @@ 
 					<p>Listen UDP server for acarsdec/acarsdeco2/... with <i>daemon-acars.php</i> script</p>
 					<p>
 						<label for="acarshost">ACARS UDP host</label>
-						<input type="text" name="acarshost" id="acarshost" value="<?php if (isset($globalACARSHost)) print $globalACARSHost; ?>" />
+						<input type="text" name="acarshost" id="acarshost" value="<?php if (isset($globalACARSHost)) {
+	print $globalACARSHost;
+}
+?>" />
 					</p>
 					<p>
 						<label for="acarsport">ACARS UDP port</label>
-						<input type="number" name="acarsport" id="acarsport" value="<?php if (isset($globalACARSPort)) print $globalACARSPort; ?>" />
+						<input type="number" name="acarsport" id="acarsport" value="<?php if (isset($globalACARSPort)) {
+	print $globalACARSPort;
+}
+?>" />
 					</p>
 				</fieldset>
 			</div>
@@ -585,13 +749,19 @@ 
 			<div id="schedules_options">
 				<p>
 					<label for="britishairways">British Airways API Key</label>
-					<input type="text" name="britishairways" id="britishairways" value="<?php if (isset($globalBritishAirwaysKey)) print $globalBritishAirwaysKey; ?>" />
+					<input type="text" name="britishairways" id="britishairways" value="<?php if (isset($globalBritishAirwaysKey)) {
+	print $globalBritishAirwaysKey;
+}
+?>" />
 					<p class="help-block">Register an account on <a href="https://developer.ba.com/">https://developer.ba.com/</a></p>
 				</p>
 				<!--
 				<p>
 					<label for="transavia">Transavia Test API Consumer Key</label>
-					<input type="text" name="transavia" id="transavia" value="<?php if (isset($globalTransaviaKey)) print $globalTransaviaKey; ?>" />
+					<input type="text" name="transavia" id="transavia" value="<?php if (isset($globalTransaviaKey)) {
+	print $globalTransaviaKey;
+}
+?>" />
 					<p class="help-block">Register an account on <a href="https://developer.transavia.com">https://developer.transavia.com</a></p>
 				</p>
 				-->
@@ -600,10 +770,16 @@ 
 						<b>Lufthansa API Key</b>
 						<p>
 							<label for="lufthansakey">Key</label>
-							<input type="text" name="lufthansakey" id="lufthansakey" value="<?php if (isset($globalLufthansaKey['key'])) print $globalLufthansaKey['key']; ?>" />
+							<input type="text" name="lufthansakey" id="lufthansakey" value="<?php if (isset($globalLufthansaKey['key'])) {
+	print $globalLufthansaKey['key'];
+}
+?>" />
 						</p><p>
 							<label for="lufthansasecret">Secret</label>
-							<input type="text" name="lufthansasecret" id="lufthansasecret" value="<?php if (isset($globalLufthansaKey['secret'])) print $globalLufthansaKey['secret']; ?>" />
+							<input type="text" name="lufthansasecret" id="lufthansasecret" value="<?php if (isset($globalLufthansaKey['secret'])) {
+	print $globalLufthansaKey['secret'];
+}
+?>" />
 						</p>
 					</div>
 					<p class="help-block">Register an account on <a href="https://developer.lufthansa.com/page">https://developer.lufthansa.com/page</a></p>
@@ -623,7 +799,10 @@ 
 			</p>
 			<p>
 				<label for="notamsource">URL of your feed from notaminfo.com</label>
-				<input type="text" name="notamsource" id="notamsource" value="<?php if (isset($globalNOTAMSource)) print $globalNOTAMSource; ?>" />
+				<input type="text" name="notamsource" id="notamsource" value="<?php if (isset($globalNOTAMSource)) {
+	print $globalNOTAMSource;
+}
+?>" />
 				<p class="help-block">If you want to use world NOTAM from FlightAirMap website, leave it blank</p>
 			</p>
 			<br />
@@ -639,14 +818,20 @@ 
 			<div id="metarsrc">
 				<p>
 					<label for="metarsource">URL of your METAR source</label>
-					<input type="text" name="metarsource" id="metarsource" value="<?php if (isset($globalMETARurl)) print $globalMETARurl; ?>" />
+					<input type="text" name="metarsource" id="metarsource" value="<?php if (isset($globalMETARurl)) {
+	print $globalMETARurl;
+}
+?>" />
 					<p class="help-block">Use {icao} to specify where we replace by airport icao. ex : http://metar.vatsim.net/metar.php?id={icao}</p>
 				</p>
 			</div>
 			<br />
 			<p>
 				<label for="bitly">Bit.ly access token api (used in search page)</label>
-				<input type="text" name="bitly" id="bitly" value="<?php if (isset($globalBitlyAccessToken)) print $globalBitlyAccessToken; ?>" />
+				<input type="text" name="bitly" id="bitly" value="<?php if (isset($globalBitlyAccessToken)) {
+	print $globalBitlyAccessToken;
+}
+?>" />
 			</p>
 			<br />
 			<p>
@@ -660,7 +845,12 @@ 
 			</p>
 			<p>
 				<label for="archivemonths">Generate statistics, delete or put in archive flights older than xx months</label>
-				<input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) print $globalArchiveMonths; else echo '0'; ?>" />
+				<input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) {
+	print $globalArchiveMonths;
+} else {
+	echo '0';
+}
+?>" />
 				<p class="help-block">0 to disable, delete old flight if <i>Archive all flights data</i> is disabled</p>
 			</p>
 			<p>
@@ -670,12 +860,22 @@ 
 			</p>
 			<p>
 				<label for="archivekeepmonths">Keep flights data for xx months in archive</label>
-				<input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) print $globalArchiveKeepMonths; else echo '0'; ?>" />
+				<input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) {
+	print $globalArchiveKeepMonths;
+} else {
+	echo '0';
+}
+?>" />
 				<p class="help-block">0 to disable</p>
 			</p>
 			<p>
 				<label for="archivekeeptrackmonths">Keep flights track data for xx months in archive</label>
-				<input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) print $globalArchiveKeepTrackMonths; else echo '0'; ?>" />
+				<input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) {
+	print $globalArchiveKeepTrackMonths;
+} else {
+	echo '0';
+}
+?>" />
 				<p class="help-block">0 to disable, should be less or egal to <i>Keep flights data</i> value</p>
 			</p>
 			<br />
@@ -685,7 +885,12 @@ 
 				<p class="help-block">Uncheck if the script is running as cron job</p>
 				<div id="cronends"> 
 					<label for="cronend">Run script for xx seconds</label>
-					<input type="number" name="cronend" id="cronend" value="<?php if (isset($globalCronEnd)) print $globalCronEnd; else print '0'; ?>" />
+					<input type="number" name="cronend" id="cronend" value="<?php if (isset($globalCronEnd)) {
+	print $globalCronEnd;
+} else {
+	print '0';
+}
+?>" />
 					<p class="help-block">Set to 0 to disable. Should be disabled if source is URL.</p>
 				</div>
 			</p>
@@ -725,26 +930,49 @@ 
 			<br />
 			<p>
 				<label for="refresh">Show flights detected since xxx seconds</label>
-				<input type="number" name="refresh" id="refresh" value="<?php if (isset($globalLiveInterval)) echo $globalLiveInterval; else echo '200'; ?>" />
+				<input type="number" name="refresh" id="refresh" value="<?php if (isset($globalLiveInterval)) {
+	echo $globalLiveInterval;
+} else {
+	echo '200';
+}
+?>" />
 			</p>
 			<p>
 				<label for="maprefresh">Live map refresh (in seconds)</label>
-				<input type="number" name="maprefresh" id="maprefresh" value="<?php if (isset($globalMapRefresh)) echo $globalMapRefresh; else echo '30'; ?>" />
+				<input type="number" name="maprefresh" id="maprefresh" value="<?php if (isset($globalMapRefresh)) {
+	echo $globalMapRefresh;
+} else {
+	echo '30';
+}
+?>" />
 			</p>
 			<p>
 				<label for="mapidle">Map idle timeout (in minutes)</label>
-				<input type="number" name="mapidle" id="mapidle" value="<?php if (isset($globalMapIdleTimeout)) echo $globalMapIdleTimeout; else echo '30'; ?>" />
+				<input type="number" name="mapidle" id="mapidle" value="<?php if (isset($globalMapIdleTimeout)) {
+	echo $globalMapIdleTimeout;
+} else {
+	echo '30';
+}
+?>" />
 				<p class="help-block">0 to disable</p>
 			</p>
 			<br />
 			<p>
 				<label for="closestmindist">Distance to airport set as arrival (in km)</label>
-				<input type="number" name="closestmindist" id="closestmindist" value="<?php if (isset($globalClosestMinDist)) echo $globalClosestMinDist; else echo '50'; ?>" />
+				<input type="number" name="closestmindist" id="closestmindist" value="<?php if (isset($globalClosestMinDist)) {
+	echo $globalClosestMinDist;
+} else {
+	echo '50';
+}
+?>" />
 			</p>
 			<br />
 			<p>
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) {
+	echo $globalAircraftSize;
+}
+?>" />
 			</p>
 			<br />
 			<p>
@@ -752,7 +980,12 @@ 
 			    if (extension_loaded('gd') && function_exists('gd_info')) {
 			?>
 				<label for="aircrafticoncolor">Color of aircraft icon on map</label>
-				<input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" />
+				<input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) {
+	echo $globalAircraftIconColor;
+} else {
+	echo '1a3151';
+}
+?>" />
 			<?php
 				if (!is_writable('../cache')) {
 			?>
@@ -770,8 +1003,18 @@ 
 			<p>
 				<label for="airportzoom">Zoom level minimum to see airports icons</label>
 				<div class="range">
-					<input type="range" name="airportzoom" id="airportzoom" value="<?php if (isset($globalAirportZoom)) echo $globalAirportZoom; else echo '7'; ?>" />
-					<output id="range"><?php if (isset($globalAirportZoom)) echo $globalAirportZoom; else echo '7'; ?></output>
+					<input type="range" name="airportzoom" id="airportzoom" value="<?php if (isset($globalAirportZoom)) {
+	echo $globalAirportZoom;
+} else {
+	echo '7';
+}
+?>" />
+					<output id="range"><?php if (isset($globalAirportZoom)) {
+	echo $globalAirportZoom;
+} else {
+	echo '7';
+}
+?></output>
 				</div>
 			</p>
 		</fieldset>
@@ -799,8 +1042,12 @@ 
 	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
 	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
 
-	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
-	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
+	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) {
+		$error .= 'Mysql driver for PDO must be loaded';
+	}
+	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) {
+		$error .= 'PosgreSQL driver for PDO must be loaded';
+	}
 	
 	$_SESSION['database_root'] = $dbroot;
 	$_SESSION['database_rootpass'] = $dbrootpass;
@@ -867,15 +1114,23 @@ 
 	$source_city = $_POST['source_city'];
 	$source_country = $_POST['source_country'];
 	$source_ref = $_POST['source_ref'];
-	if (isset($source_id)) $source_id = $_POST['source_id'];
-	else $source_id = array();
+	if (isset($source_id)) {
+		$source_id = $_POST['source_id'];
+	} else {
+		$source_id = array();
+	}
 	
 	$sources = array();
 	foreach ($source_name as $keys => $name) {
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
+	    if (isset($source_id[$keys])) {
+	    	$sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
+	    } else {
+	    	$sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
+	    }
+	}
+	if (count($sources) > 0) {
+		$_SESSION['sources'] = $sources;
 	}
-	if (count($sources) > 0) $_SESSION['sources'] = $sources;
 
 	//$sbshost = filter_input(INPUT_POST,'sbshost',FILTER_SANITIZE_STRING);
 	//$sbsport = filter_input(INPUT_POST,'sbsport',FILTER_SANITIZE_NUMBER_INT);
@@ -913,13 +1168,21 @@ 
 	$port = $_POST['port'];
 	$name = $_POST['name'];
 	$format = $_POST['format'];
-	if (isset($_POST['sourcestats'])) $sourcestats = $_POST['sourcestats'];
-	else $sourcestats = array();
+	if (isset($_POST['sourcestats'])) {
+		$sourcestats = $_POST['sourcestats'];
+	} else {
+		$sourcestats = array();
+	}
 	$gSources = array();
 	foreach ($host as $key => $h) {
-		if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) $cov = 'TRUE';
-		else $cov = 'FALSE';
-		if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov);
+		if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) {
+			$cov = 'TRUE';
+		} else {
+			$cov = 'FALSE';
+		}
+		if ($h != '') {
+			$gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov);
+		}
 	}
 	$settings = array_merge($settings,array('globalSources' => $gSources));
 
@@ -943,7 +1206,9 @@ 
 	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
 		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
+	} else {
+		$settings = array_merge($settings,array('globalDistanceIgnore' => array()));
+	}
 
 	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
 	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
@@ -982,7 +1247,9 @@ 
 
 	// Create in settings.php keys not yet configurable if not already here
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
+	if (!isset($globalDebug)) {
+		$settings = array_merge($settings,array('globalDebug' => 'TRUE'));
+	}
 
 	$archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING);
 	if ($archive == 'archive') {
@@ -1012,27 +1279,43 @@ 
 	}
 */
 	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
+	if ($globalsbs == 'sbs') {
+		$settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
+	}
+	if ($globalaprs == 'aprs') {
+		$settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
+	}
 	if ($globalivao == 'ivao') {
 		//$settings = array_merge($settings,array('globalIVAO' => 'TRUE','globalVATSIM' => 'FALSE'));
 		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
+	} else {
+		$settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
+	}
 	if ($globalvatsim == 'vatsim') {
 		//$settings = array_merge($settings,array('globalVATSIM' => 'TRUE','globalIVAO' => 'FALSE'));
 		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
+	} else {
+		$settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
+	}
 	if ($globalphpvms == 'phpvms') {
 		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
+	} else {
+		$settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
+	}
 	if ($globalvam == 'vam') {
 		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
+	} else {
+		$settings = array_merge($settings,array('globalVAM' => 'FALSE'));
+	}
 	if ($globalvatsim == 'vatsim' || $globalivao == 'ivao' || $globalphpvms == 'phpvms') {
 		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
+	}
 	
 
 
@@ -1156,7 +1439,9 @@ 
 		$settings = array_merge($settings,array('globalWaypoints' => 'FALSE'));
 	}
 
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
+	if (!isset($globalTransaction)) {
+		$settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
+	}
 
 	// Set some defaults values...
 	if (!isset($globalAircraftImageSources)) {
@@ -1171,15 +1456,23 @@ 
 
 	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
 
-	if ($error == '') settings::modify_settings($settings);
-	if ($error == '') settings::comment_settings($settings_comment);
+	if ($error == '') {
+		settings::modify_settings($settings);
+	}
+	if ($error == '') {
+		settings::comment_settings($settings_comment);
+	}
 	if ($error != '') {
 		print '<div class="info column">'.$error.'</div>';
 		require('../footer.php');
 		exit;
 	} else {
-		if (isset($_POST['waypoints']) && $_POST['waypoints'] == 'waypoints') $_SESSION['waypoints'] = 1;
-		if (isset($_POST['owner']) && $_POST['owner'] == 'owner') $_SESSION['owner'] = 1;
+		if (isset($_POST['waypoints']) && $_POST['waypoints'] == 'waypoints') {
+			$_SESSION['waypoints'] = 1;
+		}
+		if (isset($_POST['owner']) && $_POST['owner'] == 'owner') {
+			$_SESSION['owner'] = 1;
+		}
 		if (isset($_POST['createdb'])) {
 			$_SESSION['install'] = 'database_create';
 		} else {
@@ -1220,10 +1513,18 @@ 
 	$popw = false;
 	foreach ($_SESSION['done'] as $done) {
 	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
-	    if ($done == 'Create database') $pop = true;
-	    if ($_SESSION['install'] == 'database_create') $pop = true;
-	    if ($_SESSION['install'] == 'database_import') $popi = true;
-	    if ($_SESSION['install'] == 'waypoints') $popw = true;
+	    if ($done == 'Create database') {
+	    	$pop = true;
+	    }
+	    if ($_SESSION['install'] == 'database_create') {
+	    	$pop = true;
+	    }
+	    if ($_SESSION['install'] == 'database_import') {
+	    	$popi = true;
+	    }
+	    if ($_SESSION['install'] == 'waypoints') {
+	    	$popw = true;
+	    }
 	}
 	if ($pop) {
 	    sleep(5);
@@ -1234,7 +1535,9 @@ 
 	} else if ($popw) {
 	    sleep(5);
 	    print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>';
-	} else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>';
+	} else {
+		print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>';
+	}
 	print '</div></ul>';
 	print '<div id="error"></div>';
 /*	foreach ($_SESSION['done'] as $done) {

Spacing +192 added lines, -192 removed lines

@@ -9,7 +9,7 @@ 
 require_once(dirname(__FILE__).'/class.create_db.php');
 require_once(dirname(__FILE__).'/class.update_schema.php');
 require_once(dirname(__FILE__).'/class.settings.php');
-$title="Install";
+$title = "Install";
 require(dirname(__FILE__).'/../require/settings.php');
 require(dirname(__FILE__).'/header.php');
 
@@ -63,8 +63,8 @@ 
 if (!extension_loaded('curl')) {
 	$error[] = "Curl is not loaded.";
 }
-if(function_exists('apache_get_modules') ){
-	if(!in_array('mod_rewrite',apache_get_modules())) {
+if (function_exists('apache_get_modules')) {
+	if (!in_array('mod_rewrite', apache_get_modules())) {
 		$error[] = "mod_rewrite is not available.";
 	}
 /*
@@ -79,8 +79,8 @@ 
 }
 if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) {
 	if (function_exists('get_headers')) {
-		$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/','search',str_replace('index.php',$_SERVER["REQUEST_URI"])));
-		if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) {
+		$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/', 'search', str_replace('index.php', $_SERVER["REQUEST_URI"])));
+		if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
 			print '<div class="info column"><p><strong>Check your configuration, rewrite don\'t seems to work.</strong></p></div>';
 		}
 	}
@@ -420,13 +420,13 @@ 
 ?>
 							<tr>
 								<?php
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
+								    if (filter_var($source['host'], FILTER_VALIDATE_URL)) {
 								?>
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
 								<td><input type="number" name="port[]" id="port" value="<?php print $source['port']; ?>" /></td>
 								<?php
 								    } else {
-									$hostport = explode(':',$source['host']);
+									$hostport = explode(':', $source['host']);
 									if (isset($hostport[1])) {
 										$host = $hostport[0];
 										$port = $hostport[1];
@@ -744,7 +744,7 @@ 
 			<br />
 			<p>
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" />
 			</p>
 			<br />
 			<p>
@@ -790,14 +790,14 @@ 
 $error = '';
 
 if (isset($_POST['dbtype'])) {
-	$dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING);
-	$dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING);
-	$dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING);
-	$dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING);
-	$dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING);
-	$dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING);
-	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
-	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
+	$dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING);
+	$dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING);
+	$dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING);
+	$dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING);
+	$dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING);
+	$dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING);
+	$dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING);
+	$dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING);
 
 	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
 	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
@@ -817,48 +817,48 @@ 
 	} else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
 	*/
 	
-	$settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
+	$settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname));
 
-	$sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING);
-	$siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING);
-	$timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING);
-	$language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language));
+	$sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING);
+	$siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING);
+	$timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING);
+	$language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language));
 
-	$mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING);
-	$mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING);
-	$mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING);
-	$googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING);
-	$bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING);
-	$mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING);
-	$hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING);
-	$hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey));
+	$mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING);
+	$mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING);
+	$mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING);
+	$googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING);
+	$bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING);
+	$mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING);
+	$hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING);
+	$hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey));
 	
-	$latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING);
-	$latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING);
-	$longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING);
-	$longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING);
-	$livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom));
+	$latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING);
+	$latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING);
+	$longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING);
+	$longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING);
+	$livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom));
 
-	$squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country));
+	$squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country));
 
-	$latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING);
-	$longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter));
+	$latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING);
+	$longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter));
 
-	$acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING);
+	$acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING);
 	if ($acars == 'acars') {
-		$settings = array_merge($settings,array('globalACARS' => 'TRUE'));
+		$settings = array_merge($settings, array('globalACARS' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalACARS' => 'FALSE'));
+		$settings = array_merge($settings, array('globalACARS' => 'FALSE'));
 	}
 
-	$flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING);
-	$flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword));
+	$flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING);
+	$flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword));
 	
 	$source_name = $_POST['source_name'];
 	$source_latitude = $_POST['source_latitude'];
@@ -872,8 +872,8 @@ 
 	
 	$sources = array();
 	foreach ($source_name as $keys => $name) {
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
+	    if (isset($source_id[$keys])) $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'id' => $source_id[$keys], 'source' => $source_ref[$keys]);
+	    else $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'source' => $source_ref[$keys]);
 	}
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
 
@@ -886,13 +886,13 @@ 
 	$sbsurl = $_POST['sbsurl'];
 	*/
 
-	$globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING);
-	$globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING);
-	$globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING);
-	$globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING);
-	$globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING);
-	$globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING);
-	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
+	$globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING);
+	$globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING);
+	$globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING);
+	$globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING);
+	$globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING);
+	$globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING);
+	$datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING);
 
 /*	
 	$globalSBS1Hosts = array();
@@ -908,7 +908,7 @@ 
 	}
 	$settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts));
 */
-	$settings_comment = array_merge($settings_comment,array('globalSBS1Hosts'));
+	$settings_comment = array_merge($settings_comment, array('globalSBS1Hosts'));
 	$host = $_POST['host'];
 	$port = $_POST['port'];
 	$name = $_POST['name'];
@@ -919,89 +919,89 @@ 
 	foreach ($host as $key => $h) {
 		if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) $cov = 'TRUE';
 		else $cov = 'FALSE';
-		if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov);
+		if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov);
 	}
-	$settings = array_merge($settings,array('globalSources' => $gSources));
+	$settings = array_merge($settings, array('globalSources' => $gSources));
 
 /*
 	$sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT);
 	$settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout));
 */
-	$acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING);
-	$acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport));
+	$acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING);
+	$acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport));
 
-	$bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly));
+	$bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly));
 
-	$notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalNOTAMSource' => $notamsource));
-	$metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalMETARurl' => $metarsource));
+	$notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalNOTAMSource' => $notamsource));
+	$metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalMETARurl' => $metarsource));
 
-	$zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING);
-	$zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING);
-	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
+	$zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING);
+	$zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING);
+	$zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT);
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
-		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
+		$settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance)));
+	} else $settings = array_merge($settings, array('globalDistanceIgnore' => array()));
 
-	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
-	$maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalMapRefresh' => $maprefresh));
-	$mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle));
-	$closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist));
+	$refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalLiveInterval' => $refresh));
+	$maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalMapRefresh' => $maprefresh));
+	$mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle));
+	$closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist));
 
-	$aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize));
+	$aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize));
 
-	$archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths));
+	$archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths));
 	
-	$archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING);
+	$archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING);
 	if ($archiveyear == "archiveyear") {
-		$settings = array_merge($settings,array('globalArchiveYear' => 'TRUE'));
+		$settings = array_merge($settings, array('globalArchiveYear' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalArchiveYear' => 'FALSE'));
+		$settings = array_merge($settings, array('globalArchiveYear' => 'FALSE'));
 	}
-	$archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths));
-	$archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
+	$archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths));
+	$archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
 
-	$britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways));
-	$transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalTransaviaKey' => $transavia));
+	$britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways));
+	$transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalTransaviaKey' => $transavia));
 
-	$lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING);
-	$lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret)));
+	$lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING);
+	$lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret)));
 
 	// Create in settings.php keys not yet configurable if not already here
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
+	if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE'));
 
-	$archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING);
+	$archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING);
 	if ($archive == 'archive') {
-		$settings = array_merge($settings,array('globalArchive' => 'TRUE'));
+		$settings = array_merge($settings, array('globalArchive' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalArchive' => 'FALSE'));
+		$settings = array_merge($settings, array('globalArchive' => 'FALSE'));
 	}
-	$daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING);
+	$daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING);
 	if ($daemon == 'daemon') {
-		$settings = array_merge($settings,array('globalDaemon' => 'TRUE'));
+		$settings = array_merge($settings, array('globalDaemon' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalDaemon' => 'FALSE'));
+		$settings = array_merge($settings, array('globalDaemon' => 'FALSE'));
 	}
-	$schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING);
+	$schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING);
 	if ($schedules == 'schedules') {
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE'));
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE'));
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE'));
 	}
 
 /*
@@ -1012,165 +1012,165 @@ 
 		$settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE'));
 	}
 */
-	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
+	$settings = array_merge($settings, array('globalFlightAware' => 'FALSE'));
+	if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalSBS1' => 'FALSE'));
+	if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalAPRS' => 'FALSE'));
 	if ($globalivao == 'ivao') {
 		//$settings = array_merge($settings,array('globalIVAO' => 'TRUE','globalVATSIM' => 'FALSE'));
-		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
+		$settings = array_merge($settings, array('globalIVAO' => 'TRUE'));
+	} else $settings = array_merge($settings, array('globalIVAO' => 'FALSE'));
 	if ($globalvatsim == 'vatsim') {
 		//$settings = array_merge($settings,array('globalVATSIM' => 'TRUE','globalIVAO' => 'FALSE'));
-		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
+		$settings = array_merge($settings, array('globalVATSIM' => 'TRUE'));
+	} else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE'));
 	if ($globalphpvms == 'phpvms') {
-		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
+		$settings = array_merge($settings, array('globalphpVMS' => 'TRUE'));
+	} else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE'));
 	if ($globalvam == 'vam') {
-		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
+		$settings = array_merge($settings, array('globalVAM' => 'TRUE'));
+	} else $settings = array_merge($settings, array('globalVAM' => 'FALSE'));
 	if ($globalvatsim == 'vatsim' || $globalivao == 'ivao' || $globalphpvms == 'phpvms') {
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE'));
 	
 
 
-	$notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING);
+	$notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING);
 	if ($notam == 'notam') {
-		$settings = array_merge($settings,array('globalNOTAM' => 'TRUE'));
+		$settings = array_merge($settings, array('globalNOTAM' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalNOTAM' => 'FALSE'));
+		$settings = array_merge($settings, array('globalNOTAM' => 'FALSE'));
 	}
-	$owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING);
+	$owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING);
 	if ($owner == 'owner') {
-		$settings = array_merge($settings,array('globalOwner' => 'TRUE'));
+		$settings = array_merge($settings, array('globalOwner' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalOwner' => 'FALSE'));
+		$settings = array_merge($settings, array('globalOwner' => 'FALSE'));
 	}
-	$map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING);
+	$map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING);
 	if ($map3d == 'map3d') {
-		$settings = array_merge($settings,array('globalMap3D' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMap3D' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMap3D' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMap3D' => 'FALSE'));
 	}
-	$mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING);
+	$mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING);
 	if ($mapsatellites == 'mapsatellites') {
-		$settings = array_merge($settings,array('globalMapSatellites' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapSatellites' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapSatellites' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapSatellites' => 'FALSE'));
 	}
-	$map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING);
+	$map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING);
 	if ($map3ddefault == 'map3ddefault') {
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE'));
 	}
-	$translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING);
+	$translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING);
 	if ($translate == 'translate') {
-		$settings = array_merge($settings,array('globalTranslate' => 'TRUE'));
+		$settings = array_merge($settings, array('globalTranslate' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalTranslate' => 'FALSE'));
+		$settings = array_merge($settings, array('globalTranslate' => 'FALSE'));
 	}
-	$realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING);
+	$realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING);
 	if ($realairlines == 'realairlines') {
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE'));
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE'));
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE'));
 	}
-	$estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING);
+	$estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING);
 	if ($estimation == 'estimation') {
-		$settings = array_merge($settings,array('globalMapEstimation' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapEstimation' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapEstimation' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapEstimation' => 'FALSE'));
 	}
-	$metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING);
+	$metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING);
 	if ($metar == 'metar') {
-		$settings = array_merge($settings,array('globalMETAR' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMETAR' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMETAR' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMETAR' => 'FALSE'));
 	}
-	$metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING);
+	$metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING);
 	if ($metarcycle == 'metarcycle') {
-		$settings = array_merge($settings,array('globalMETARcycle' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMETARcycle' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMETARcycle' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMETARcycle' => 'FALSE'));
 	}
-	$fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING);
+	$fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING);
 	if ($fork == 'fork') {
-		$settings = array_merge($settings,array('globalFork' => 'TRUE'));
+		$settings = array_merge($settings, array('globalFork' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalFork' => 'FALSE'));
+		$settings = array_merge($settings, array('globalFork' => 'FALSE'));
 	}
 
-	$colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING);
+	$colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING);
 	if ($colormap == 'colormap') {
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE'));
 	}
 	
 	if (isset($_POST['aircrafticoncolor'])) {
-		$aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING);
-		$settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1)));
+		$aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING);
+		$settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1)));
 	}
 
-	$airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalAirportZoom' => $airportzoom));
+	$airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalAirportZoom' => $airportzoom));
 
-	$unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalUnitDistance' => $unitdistance));
-	$unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude));
-	$unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed));
+	$unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalUnitDistance' => $unitdistance));
+	$unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude));
+	$unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed));
 
-	$mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING);
+	$mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING);
 	if ($mappopup == 'mappopup') {
-		$settings = array_merge($settings,array('globalMapPopup' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapPopup' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapPopup' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapPopup' => 'FALSE'));
 	}
-	$airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING);
+	$airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING);
 	if ($airportpopup == 'airportpopup') {
-		$settings = array_merge($settings,array('globalAirportPopup' => 'TRUE'));
+		$settings = array_merge($settings, array('globalAirportPopup' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalAirportPopup' => 'FALSE'));
+		$settings = array_merge($settings, array('globalAirportPopup' => 'FALSE'));
 	}
-	$maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING);
+	$maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING);
 	if ($maphistory == 'maphistory') {
-		$settings = array_merge($settings,array('globalMapHistory' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapHistory' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapHistory' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapHistory' => 'FALSE'));
 	}
-	$flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING);
+	$flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING);
 	if ($flightroute == 'flightroute') {
-		$settings = array_merge($settings,array('globalMapRoute' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapRoute' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapRoute' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapRoute' => 'FALSE'));
 	}
-	$waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING);
+	$waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING);
 	if ($waypoints == 'waypoints') {
-		$settings = array_merge($settings,array('globalWaypoints' => 'TRUE'));
+		$settings = array_merge($settings, array('globalWaypoints' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalWaypoints' => 'FALSE'));
+		$settings = array_merge($settings, array('globalWaypoints' => 'FALSE'));
 	}
 
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
+	if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE'));
 
 	// Set some defaults values...
 	if (!isset($globalAircraftImageSources)) {
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
+	    $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
+	    $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources));
 	}
 
 	if (!isset($globalSchedulesSources)) {
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
+	    $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
+    	    $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources));
     	}
 
-	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
+	$settings = array_merge($settings, array('globalInstalled' => 'TRUE'));
 
 	if ($error == '') settings::modify_settings($settings);
 	if ($error == '') settings::comment_settings($settings_comment);

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";
 	}
 }
 ?>

require/class.Image.php

Doc Comments +3 added lines

@@ -319,6 +319,9 @@
 		return false;
 	}
 
+	/**
+	 * @param string $aircraft_icao
+	 */
 	public function fromIvaoMtl($aircraft_icao,$airline_icao) {
 		$Common = new Common();
 		//echo "\n".'SEARCH IMAGE : http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg';

Indentation +85 added lines, -85 removed lines

@@ -12,11 +12,11 @@ 
 	}
 
 	/**
-	* Gets the images based on the aircraft registration
-	*
-	* @return Array the images list
-	*
-	*/
+	 * Gets the images based on the aircraft registration
+	 *
+	 * @return Array the images list
+	 *
+	 */
 	public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -29,7 +29,7 @@ 
 			WHERE spotter_image.registration = :registration";
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':registration' => $registration));
-          /*
+		  /*
         $images_array = array();
 	$temp_array = array();
 
@@ -52,11 +52,11 @@ 
 	}
 
 	/**
-	* Gets the image copyright based on the Exif data
-	*
-	* @return String image copyright
-	*
-	*/
+	 * Gets the image copyright based on the Exif data
+	 *
+	 * @return String image copyright
+	 *
+	 */
 	public function getExifCopyright($url) {
 		$exif = exif_read_data($url);
 		$copyright = '';
@@ -71,11 +71,11 @@ 
 	}
 
 	/**
-	* Adds the images based on the aircraft registration
-	*
-	* @return String either success or error
-	*
-	*/
+	 * Adds the images based on the aircraft registration
+	 *
+	 * @return String either success or error
+	 *
+	 */
 	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
 	{
 		global $globalDebug,$globalAircraftImageFetch;
@@ -104,12 +104,12 @@ 
 	}
 
 	/**
-	* Gets the aircraft image
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function findAircraftImage($aircraft_registration, $aircraft_icao = '', $airline_icao = '')
 	{
 		global $globalAircraftImageSources, $globalIVAO;
@@ -149,13 +149,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from Planespotters
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Planespotters
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromPlanespotters($aircraft_registration, $aircraft_name='') {
 		$Common = new Common();
 		// If aircraft registration is only number, also check with aircraft model
@@ -182,13 +182,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from Deviantart
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Deviantart
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromDeviantart($aircraft_registration, $aircraft_name='') {
 		$Common = new Common();
 		// If aircraft registration is only number, also check with aircraft model
@@ -216,13 +216,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from JetPhotos
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from JetPhotos
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromJetPhotos($aircraft_registration, $aircraft_name='') {
 		$Common = new Common();
 		$url= 'http://jetphotos.net/showphotos.php?displaymode=2&regsearch='.$aircraft_registration;
@@ -258,13 +258,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from PlanePictures
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from PlanePictures
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromPlanePictures($aircraft_registration, $aircraft_name='') {
 		$Common = new Common();
 		$url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2';
@@ -292,13 +292,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from Flickr
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Flickr
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromFlickr($aircraft_registration,$aircraft_name='') {
 		$Common = new Common();
 		if ($aircraft_name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.','.urlencode($aircraft_name);
@@ -336,13 +336,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from Bing
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Bing
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromBing($aircraft_registration,$aircraft_name='') {
 		global $globalImageBingKey;
 		$Common = new Common();
@@ -368,13 +368,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from airport-data
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from airport-data
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromAirportData($aircraft_registration,$aircraft_name='') {
 		$Common = new Common();
 		$url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration;
@@ -393,13 +393,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from WikiMedia
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from WikiMedia
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromWikimedia($aircraft_registration,$aircraft_name='') {
 		$Common = new Common();
 		if ($aircraft_name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20'.urlencode($aircraft_name);
@@ -449,13 +449,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from custom url
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from custom url
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromCustomSource($aircraft_registration,$aircraft_name='') {
 		global $globalAircraftCustomSources;
 		//$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true);

Braces +126 added lines, -46 removed lines

@@ -22,7 +22,9 @@ 
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
 		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
 		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
-		if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
+		if ($registration == '' && $aircraft_icao != '') {
+			$registration = $aircraft_icao.$airline_icao;
+		}
 		$registration = trim($registration);
 		$query  = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright
 			FROM spotter_image 
@@ -60,8 +62,11 @@ 
 	public function getExifCopyright($url) {
 		$exif = exif_read_data($url);
 		$copyright = '';
-		if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright'];
-		elseif (isset($exif['copyright'])) $copyright = $exif['copyright'];
+		if (isset($exif['COMPUTED']['copyright'])) {
+			$copyright = $exif['COMPUTED']['copyright'];
+		} elseif (isset($exif['copyright'])) {
+			$copyright = $exif['copyright'];
+		}
 		if ($copyright != '') {
 			$copyright = str_replace('Copyright ','',$copyright);
 			$copyright = str_replace('© ','',$copyright);
@@ -79,18 +84,29 @@ 
 	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
 	{
 		global $globalDebug,$globalAircraftImageFetch;
-		if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) return '';
+		if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) {
+			return '';
+		}
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
 		$registration = trim($registration);
 		//getting the aircraft image
-		if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...';
-		elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
-		elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...';
-		else return "success";
+		if ($globalDebug && $registration != '') {
+			echo 'Try to find an aircraft image for '.$registration.'...';
+		} elseif ($globalDebug && $aircraft_icao != '') {
+			echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
+		} elseif ($globalDebug && $airline_icao != '') {
+			echo 'Try to find an aircraft image for '.$airline_icao.'...';
+		} else {
+			return "success";
+		}
 		$image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao);
-		if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
+		if ($registration == '' && $aircraft_icao != '') {
+			$registration = $aircraft_icao.$airline_icao;
+		}
 		if ($image_url['original'] != '') {
-			if ($globalDebug) echo 'Found !'."\n";
+			if ($globalDebug) {
+				echo 'Found !'."\n";
+			}
 			$query  = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)";
 			try {
 				$sth = $this->db->prepare($query);
@@ -99,7 +115,9 @@ 
 				echo $e->getMessage()."\n";
 				return "error";
 			}
-		} elseif ($globalDebug) echo "Not found :'(\n";
+		} elseif ($globalDebug) {
+			echo "Not found :'(\n";
+		}
 		return "success";
 	}
 
@@ -114,36 +132,75 @@ 
 	{
 		global $globalAircraftImageSources, $globalIVAO;
 		$Spotter = new Spotter($this->db);
-		if (!isset($globalIVAO)) $globalIVAO = FALSE;
+		if (!isset($globalIVAO)) {
+			$globalIVAO = FALSE;
+		}
 		$aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING);
 		if ($aircraft_registration != '') {
-			if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			if (strpos($aircraft_registration,'/') !== false) {
+				return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			}
 			$aircraft_registration = urlencode(trim($aircraft_registration));
 			$aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration);
-			if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name'];
-			else $aircraft_name = '';
-			if (isset($aircraft_info[0]['aircraft_icao'])) $aircraft_name = $aircraft_info[0]['aircraft_icao'];
-			else $aircraft_icao = '';
-			if (isset($aircraft_info[0]['airline_icao'])) $airline_icao = $aircraft_info[0]['airline_icao'];
-			else $airline_icao = '';
+			if (isset($aircraft_info[0]['aircraft_name'])) {
+				$aircraft_name = $aircraft_info[0]['aircraft_name'];
+			} else {
+				$aircraft_name = '';
+			}
+			if (isset($aircraft_info[0]['aircraft_icao'])) {
+				$aircraft_name = $aircraft_info[0]['aircraft_icao'];
+			} else {
+				$aircraft_icao = '';
+			}
+			if (isset($aircraft_info[0]['airline_icao'])) {
+				$airline_icao = $aircraft_info[0]['airline_icao'];
+			} else {
+				$airline_icao = '';
+			}
 		} elseif ($aircraft_icao != '') {
 			$aircraft_registration = $aircraft_icao;
 			$aircraft_name = '';
-		} else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
-		if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		} else {
+			return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		}
+		if (!isset($globalAircraftImageSources)) {
+			$globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		}
 		foreach ($globalAircraftImageSources as $source) {
 			$source = strtolower($source);
-			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl($aircraft_icao,$airline_icao);
-			if ($source == 'planespotters' && !$globalIVAO) $images_array = $this->fromPlanespotters($aircraft_registration,$aircraft_name);
-			if ($source == 'flickr') $images_array = $this->fromFlickr($aircraft_registration,$aircraft_name);
-			if ($source == 'bing') $images_array = $this->fromBing($aircraft_registration,$aircraft_name);
-			if ($source == 'deviantart') $images_array = $this->fromDeviantart($aircraft_registration,$aircraft_name);
-			if ($source == 'wikimedia') $images_array = $this->fromWikimedia($aircraft_registration,$aircraft_name);
-			if ($source == 'jetphotos' && !$globalIVAO) $images_array = $this->fromJetPhotos($aircraft_registration,$aircraft_name);
-			if ($source == 'planepictures' && !$globalIVAO) $images_array = $this->fromPlanePictures($aircraft_registration,$aircraft_name);
-			if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData($aircraft_registration,$aircraft_name);
-			if ($source == 'customsources') $images_array = $this->fromCustomSource($aircraft_registration,$aircraft_name);
-			if (isset($images_array) && $images_array['original'] != '') return $images_array;
+			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') {
+				$images_array = $this->fromIvaoMtl($aircraft_icao,$airline_icao);
+			}
+			if ($source == 'planespotters' && !$globalIVAO) {
+				$images_array = $this->fromPlanespotters($aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'flickr') {
+				$images_array = $this->fromFlickr($aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'bing') {
+				$images_array = $this->fromBing($aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'deviantart') {
+				$images_array = $this->fromDeviantart($aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'wikimedia') {
+				$images_array = $this->fromWikimedia($aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'jetphotos' && !$globalIVAO) {
+				$images_array = $this->fromJetPhotos($aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'planepictures' && !$globalIVAO) {
+				$images_array = $this->fromPlanePictures($aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'airportdata' && !$globalIVAO) {
+				$images_array = $this->fromAirportData($aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'customsources') {
+				$images_array = $this->fromCustomSource($aircraft_registration,$aircraft_name);
+			}
+			if (isset($images_array) && $images_array['original'] != '') {
+				return $images_array;
+			}
 		}
 		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
 	}
@@ -301,8 +358,11 @@ 
 	*/
 	public function fromFlickr($aircraft_registration,$aircraft_name='') {
 		$Common = new Common();
-		if ($aircraft_name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.','.urlencode($aircraft_name);
-		else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.',aircraft';
+		if ($aircraft_name != '') {
+			$url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.','.urlencode($aircraft_name);
+		} else {
+			$url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.',aircraft';
+		}
 		$data = $Common->getData($url);
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item)) {
@@ -346,9 +406,14 @@ 
 	public function fromBing($aircraft_registration,$aircraft_name='') {
 		global $globalImageBingKey;
 		$Common = new Common();
-		if (!isset($globalImageBingKey) || $globalImageBingKey == '') return false;
-		if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27';
-		else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27';
+		if (!isset($globalImageBingKey) || $globalImageBingKey == '') {
+			return false;
+		}
+		if ($aircraft_name != '') {
+			$url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27';
+		} else {
+			$url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27';
+		}
 		$headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey));
 		$data = $Common->getData($url,'get','',$headers);
 		$result = json_decode($data);
@@ -402,13 +467,18 @@ 
 	*/
 	public function fromWikimedia($aircraft_registration,$aircraft_name='') {
 		$Common = new Common();
-		if ($aircraft_name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20'.urlencode($aircraft_name);
-		else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20aircraft';
+		if ($aircraft_name != '') {
+			$url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20'.urlencode($aircraft_name);
+		} else {
+			$url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20aircraft';
+		}
 		$data = $Common->getData($url);
 		$result = json_decode($data);
 		if (isset($result->query->search[0]->title)) {
 			$fileo = $result->query->search[0]->title;
-			if (substr($fileo,-3) == 'pdf') return false;
+			if (substr($fileo,-3) == 'pdf') {
+				return false;
+			}
 			$file = urlencode($fileo);
 			$url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file;
 			$data2 = $Common->getData($url2);
@@ -460,7 +530,9 @@ 
 		global $globalAircraftCustomSources;
 		//$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true);
 		if (!empty($globalAircraftImageCustomSources)) {
-			if (!isset($globalAircraftImageCustomSources[0])) $globalAircraftImageCustomSources[] = $globalAircraftImageCustomSources;
+			if (!isset($globalAircraftImageCustomSources[0])) {
+				$globalAircraftImageCustomSources[] = $globalAircraftImageCustomSources;
+			}
 			foreach ($globalAircraftImageCustomSources as $source) {
 				$Common = new Common();
 				$url = str_replace('{registration}',$aircraft_registration,$source['original']);
@@ -469,17 +541,25 @@ 
 					$image_url = array();
 					$image_url['thumbnail'] = $url_thumbnail;
 					$image_url['original'] = $url;
-					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
-					else $exifCopyright = '';
-					if ($exifCopyright  != '') $image_url['copyright'] = $exifCopyright;
-					else $image_url['copyright'] = $source['copyright'];
+					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) {
+						$exifCopyright = $this->getExifCopyright($url);
+					} else {
+						$exifCopyright = '';
+					}
+					if ($exifCopyright  != '') {
+						$image_url['copyright'] = $exifCopyright;
+					} else {
+						$image_url['copyright'] = $source['copyright'];
+					}
 					$image_url['source_website'] = $source['source_website'];
 					$image_url['source'] = $source['source'];
 					return $image_url;
 				}
 			}
 			return false;
-		} else return false;
+		} else {
+			return false;
+		}
 	}
 }
 

Spacing +77 added lines, -77 removed lines

@@ -17,14 +17,14 @@ 
 	* @return Array the images list
 	*
 	*/
-	public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
+	public function getSpotterImage($registration, $aircraft_icao = '', $airline_icao = '')
 	{
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
 		if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
 		$registration = trim($registration);
-		$query  = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration 
+		$query = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration 
 			FROM spotter_image 
 			WHERE spotter_image.registration = :registration";
 		$sth = $this->db->prepare($query);
@@ -63,9 +63,9 @@ 
 		if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright'];
 		elseif (isset($exif['copyright'])) $copyright = $exif['copyright'];
 		if ($copyright != '') {
-			$copyright = str_replace('Copyright ','',$copyright);
-			$copyright = str_replace('© ','',$copyright);
-			$copyright = str_replace('(c) ','',$copyright);
+			$copyright = str_replace('Copyright ', '', $copyright);
+			$copyright = str_replace('© ', '', $copyright);
+			$copyright = str_replace('(c) ', '', $copyright);
 		}
 		return $copyright;
 	}
@@ -76,26 +76,26 @@ 
 	* @return String either success or error
 	*
 	*/
-	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
+	public function addSpotterImage($registration, $aircraft_icao = '', $airline_icao = '')
 	{
-		global $globalDebug,$globalAircraftImageFetch;
+		global $globalDebug, $globalAircraftImageFetch;
 		if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) return '';
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 		$registration = trim($registration);
 		//getting the aircraft image
 		if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...';
 		elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
 		elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...';
 		else return "success";
-		$image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao);
+		$image_url = $this->findAircraftImage($registration, $aircraft_icao, $airline_icao);
 		if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
 		if ($image_url['original'] != '') {
 			if ($globalDebug) echo 'Found !'."\n";
-			$query  = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)";
+			$query = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':registration' => $registration,':image' => $image_url['original'],':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'],':source' => $image_url['source'],':source_website' => $image_url['source_website']));
-			} catch(PDOException $e) {
+				$sth->execute(array(':registration' => $registration, ':image' => $image_url['original'], ':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'], ':source' => $image_url['source'], ':source_website' => $image_url['source_website']));
+			} catch (PDOException $e) {
 				echo $e->getMessage()."\n";
 				return "error";
 			}
@@ -115,9 +115,9 @@ 
 		global $globalAircraftImageSources, $globalIVAO;
 		$Spotter = new Spotter($this->db);
 		if (!isset($globalIVAO)) $globalIVAO = FALSE;
-		$aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING);
+		$aircraft_registration = filter_var($aircraft_registration, FILTER_SANITIZE_STRING);
 		if ($aircraft_registration != '') {
-			if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			if (strpos($aircraft_registration, '/') !== false) return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 			$aircraft_registration = urlencode(trim($aircraft_registration));
 			$aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration);
 			if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name'];
@@ -129,23 +129,23 @@ 
 		} elseif ($aircraft_icao != '') {
 			$aircraft_registration = $aircraft_icao;
 			$aircraft_name = '';
-		} else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
-		if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		} else return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
+		if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
 		foreach ($globalAircraftImageSources as $source) {
 			$source = strtolower($source);
-			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl($aircraft_icao,$airline_icao);
-			if ($source == 'planespotters' && !$globalIVAO) $images_array = $this->fromPlanespotters($aircraft_registration,$aircraft_name);
-			if ($source == 'flickr') $images_array = $this->fromFlickr($aircraft_registration,$aircraft_name);
-			if ($source == 'bing') $images_array = $this->fromBing($aircraft_registration,$aircraft_name);
-			if ($source == 'deviantart') $images_array = $this->fromDeviantart($aircraft_registration,$aircraft_name);
-			if ($source == 'wikimedia') $images_array = $this->fromWikimedia($aircraft_registration,$aircraft_name);
-			if ($source == 'jetphotos' && !$globalIVAO) $images_array = $this->fromJetPhotos($aircraft_registration,$aircraft_name);
-			if ($source == 'planepictures' && !$globalIVAO) $images_array = $this->fromPlanePictures($aircraft_registration,$aircraft_name);
-			if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData($aircraft_registration,$aircraft_name);
-			if ($source == 'customsources') $images_array = $this->fromCustomSource($aircraft_registration,$aircraft_name);
+			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl($aircraft_icao, $airline_icao);
+			if ($source == 'planespotters' && !$globalIVAO) $images_array = $this->fromPlanespotters($aircraft_registration, $aircraft_name);
+			if ($source == 'flickr') $images_array = $this->fromFlickr($aircraft_registration, $aircraft_name);
+			if ($source == 'bing') $images_array = $this->fromBing($aircraft_registration, $aircraft_name);
+			if ($source == 'deviantart') $images_array = $this->fromDeviantart($aircraft_registration, $aircraft_name);
+			if ($source == 'wikimedia') $images_array = $this->fromWikimedia($aircraft_registration, $aircraft_name);
+			if ($source == 'jetphotos' && !$globalIVAO) $images_array = $this->fromJetPhotos($aircraft_registration, $aircraft_name);
+			if ($source == 'planepictures' && !$globalIVAO) $images_array = $this->fromPlanePictures($aircraft_registration, $aircraft_name);
+			if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData($aircraft_registration, $aircraft_name);
+			if ($source == 'customsources') $images_array = $this->fromCustomSource($aircraft_registration, $aircraft_name);
 			if (isset($images_array) && $images_array['original'] != '') return $images_array;
 		}
-		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+		return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
 	}
 
 	/**
@@ -156,24 +156,24 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromPlanespotters($aircraft_registration, $aircraft_name='') {
+	public function fromPlanespotters($aircraft_registration, $aircraft_name = '') {
 		$Common = new Common();
 		// If aircraft registration is only number, also check with aircraft model
-		if (preg_match('/^[[:digit]]+$/',$aircraft_registration) && $aircraft_name != '') {
-			$url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss';
+		if (preg_match('/^[[:digit]]+$/', $aircraft_registration) && $aircraft_name != '') {
+			$url = 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss';
 		} else {
 			//$url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$airline_aircraft_type.'&output=rss';
-			$url= 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss';
+			$url = 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss';
 		}
 		$data = $Common->getData($url);
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item)) {
 				$image_url = array();
-				$thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
+				$thumbnail_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
 				$image_url['thumbnail'] = $thumbnail_url;
-				$image_url['original'] = str_replace('thumbnail','original',$thumbnail_url);
-				$image_url['copyright'] = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright);
-				$image_url['source_website'] = trim((string)$xml->channel->item->link);
+				$image_url['original'] = str_replace('thumbnail', 'original', $thumbnail_url);
+				$image_url['copyright'] = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright);
+				$image_url['source_website'] = trim((string) $xml->channel->item->link);
 				$image_url['source'] = 'planespotters';
 				return $image_url;
 			}
@@ -189,25 +189,25 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromDeviantart($aircraft_registration, $aircraft_name='') {
+	public function fromDeviantart($aircraft_registration, $aircraft_name = '') {
 		$Common = new Common();
 		// If aircraft registration is only number, also check with aircraft model
-		if (preg_match('/^[[:digit]]+$/',$aircraft_registration) && $aircraft_name != '') {
-			$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$aircraft_registration.'%20'.urlencode($aircraft_name);
+		if (preg_match('/^[[:digit]]+$/', $aircraft_registration) && $aircraft_name != '') {
+			$url = 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$aircraft_registration.'%20'.urlencode($aircraft_name);
 		} else {
-			$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$aircraft_registration;
+			$url = 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$aircraft_registration;
 		}
 
 		$data = $Common->getData($url);
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item->link)) {
 				$image_url = array();
-				$thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
+				$thumbnail_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
 				$image_url['thumbnail'] = $thumbnail_url;
-				$original_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url);
+				$original_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url);
 				$image_url['original'] = $original_url;
-				$image_url['copyright'] = str_replace('Copyright ','',trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright));
-				$image_url['source_website'] = trim((string)$xml->channel->item->link);
+				$image_url['copyright'] = str_replace('Copyright ', '', trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright));
+				$image_url['source_website'] = trim((string) $xml->channel->item->link);
 				$image_url['source'] = 'deviantart';
 				return $image_url;
 			}
@@ -223,32 +223,32 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromJetPhotos($aircraft_registration, $aircraft_name='') {
+	public function fromJetPhotos($aircraft_registration, $aircraft_name = '') {
 		$Common = new Common();
-		$url= 'http://jetphotos.net/showphotos.php?displaymode=2&regsearch='.$aircraft_registration;
+		$url = 'http://jetphotos.net/showphotos.php?displaymode=2&regsearch='.$aircraft_registration;
 		$data = $Common->getData($url);
 		$dom = new DOMDocument();
 		@$dom->loadHTML($data);
 		$all_pics = array();
-		foreach($dom->getElementsByTagName('img') as $image) {
+		foreach ($dom->getElementsByTagName('img') as $image) {
 			if ($image->getAttribute('itemprop') == "http://schema.org/image") {
 				$all_pics[] = $image->getAttribute('src');
 			}
 		}
 		$all_authors = array();
-		foreach($dom->getElementsByTagName('meta') as $author) {
+		foreach ($dom->getElementsByTagName('meta') as $author) {
 			if ($author->getAttribute('itemprop') == "http://schema.org/author") {
 				$all_authors[] = $author->getAttribute('content');
 			}
 		}
 		$all_ref = array();
-		foreach($dom->getElementsByTagName('a') as $link) {
+		foreach ($dom->getElementsByTagName('a') as $link) {
 			$all_ref[] = $link->getAttribute('href');
 		}
 		if (isset($all_pics[0])) {
 			$image_url = array();
 			$image_url['thumbnail'] = $all_pics[0];
-			$image_url['original'] = str_replace('_tb','',$all_pics[0]);
+			$image_url['original'] = str_replace('_tb', '', $all_pics[0]);
 			$image_url['copyright'] = $all_authors[0];
 			$image_url['source_website'] = 'http://jetphotos.net'.$all_ref[8];
 			$image_url['source'] = 'JetPhotos';
@@ -265,24 +265,24 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromPlanePictures($aircraft_registration, $aircraft_name='') {
+	public function fromPlanePictures($aircraft_registration, $aircraft_name = '') {
 		$Common = new Common();
-		$url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2';
+		$url = 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2';
 		$data = $Common->getData($url);
 		$dom = new DOMDocument();
 		@$dom->loadHTML($data);
 		$all_pics = array();
-		foreach($dom->getElementsByTagName('img') as $image) {
+		foreach ($dom->getElementsByTagName('img') as $image) {
 			$all_pics[] = $image->getAttribute('src');
 		}
 		$all_links = array();
-		foreach($dom->getElementsByTagName('a') as $link) {
-			$all_links[] = array('text' => $link->textContent,'href' => $link->getAttribute('href'));
+		foreach ($dom->getElementsByTagName('a') as $link) {
+			$all_links[] = array('text' => $link->textContent, 'href' => $link->getAttribute('href'));
 		}
-		if (isset($all_pics[1]) && !preg_match('/bit.ly/',$all_pics[1])) {
+		if (isset($all_pics[1]) && !preg_match('/bit.ly/', $all_pics[1])) {
 			$image_url = array();
 			$image_url['thumbnail'] = 'http://www.planepictures.net'.$all_pics[1];
-			$image_url['original'] = 'http://www.planepictures.net'.str_replace('_TN','',$all_pics[1]);
+			$image_url['original'] = 'http://www.planepictures.net'.str_replace('_TN', '', $all_pics[1]);
 			$image_url['copyright'] = $all_links[6]['text'];
 			$image_url['source_website'] = 'http://www.planepictures.net/'.$all_links[2]['href'];
 			$image_url['source'] = 'PlanePictures';
@@ -299,19 +299,19 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromFlickr($aircraft_registration,$aircraft_name='') {
+	public function fromFlickr($aircraft_registration, $aircraft_name = '') {
 		$Common = new Common();
 		if ($aircraft_name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.','.urlencode($aircraft_name);
 		else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.',aircraft';
 		$data = $Common->getData($url);
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item)) {
-				$original_url = trim((string)$xml->channel->item->enclosure->attributes()->url);
+				$original_url = trim((string) $xml->channel->item->enclosure->attributes()->url);
 				$image_url = array();
 				$image_url['thumbnail'] = $original_url;
 				$image_url['original'] = $original_url;
-				$image_url['copyright'] = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->credit);
-				$image_url['source_website'] = trim((string)$xml->channel->item->link);
+				$image_url['copyright'] = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->credit);
+				$image_url['source_website'] = trim((string) $xml->channel->item->link);
 				$image_url['source'] = 'flickr';
 				return $image_url;
 			}
@@ -319,7 +319,7 @@ 
 		return false;
 	}
 
-	public function fromIvaoMtl($aircraft_icao,$airline_icao) {
+	public function fromIvaoMtl($aircraft_icao, $airline_icao) {
 		$Common = new Common();
 		//echo "\n".'SEARCH IMAGE : http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg';
 		if ($Common->urlexist('http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg')) {
@@ -343,14 +343,14 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromBing($aircraft_registration,$aircraft_name='') {
+	public function fromBing($aircraft_registration, $aircraft_name = '') {
 		global $globalImageBingKey;
 		$Common = new Common();
 		if (!isset($globalImageBingKey) || $globalImageBingKey == '') return false;
 		if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27';
 		else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27';
-		$headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey));
-		$data = $Common->getData($url,'get','',$headers);
+		$headers = array("Authorization: Basic ".base64_encode("ignored:".$globalImageBingKey));
+		$data = $Common->getData($url, 'get', '', $headers);
 		$result = json_decode($data);
 		if (isset($result->d->results[0]->MediaUrl)) {
 			$image_url = array();
@@ -375,14 +375,14 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromAirportData($aircraft_registration,$aircraft_name='') {
+	public function fromAirportData($aircraft_registration, $aircraft_name = '') {
 		$Common = new Common();
 		$url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration;
 		$data = $Common->getData($url);
 		$result = json_decode($data);
 		if (isset($result->count) && $result->count > 0) {
 			$image_url = array();
-			$image_url['original'] = str_replace('thumbnails','large',$result->data[0]->image);
+			$image_url['original'] = str_replace('thumbnails', 'large', $result->data[0]->image);
 			$image_url['source_website'] = $result->data[0]->link;
 			$image_url['thumbnail'] = $result->data[0]->image;
 			$image_url['copyright'] = $result->data[0]->photographer;
@@ -400,7 +400,7 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromWikimedia($aircraft_registration,$aircraft_name='') {
+	public function fromWikimedia($aircraft_registration, $aircraft_name = '') {
 		$Common = new Common();
 		if ($aircraft_name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20'.urlencode($aircraft_name);
 		else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20aircraft';
@@ -408,7 +408,7 @@ 
 		$result = json_decode($data);
 		if (isset($result->query->search[0]->title)) {
 			$fileo = $result->query->search[0]->title;
-			if (substr($fileo,-3) == 'pdf') return false;
+			if (substr($fileo, -3) == 'pdf') return false;
 			$file = urlencode($fileo);
 			$url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file;
 			$data2 = $Common->getData($url2);
@@ -433,11 +433,11 @@ 
 				if (isset($result2->query->pages)) {
 					foreach ($result2->query->pages as $page) {
 						if (isset($page->imageinfo[0]->extmetadata->Artist)) {
-							$image_url['copyright'] = preg_replace('/ from(.*)/','',strip_tags($page->imageinfo[0]->extmetadata->Artist->value));
+							$image_url['copyright'] = preg_replace('/ from(.*)/', '', strip_tags($page->imageinfo[0]->extmetadata->Artist->value));
 							if (isset($page->imageinfo[0]->extmetadata->License->value)) {
 								$image_url['copyright'] = $image_url['copyright'].' (under '.$page->imageinfo[0]->extmetadata->License->value.')';
 							}
-							$image_url['copyright'] = trim(str_replace('\n','',$image_url['copyright']));
+							$image_url['copyright'] = trim(str_replace('\n', '', $image_url['copyright']));
 							return $image_url;
 						}
 					}
@@ -456,22 +456,22 @@ 
 	* @return Array the aircraft thumbnail, orignal url and copyright
 	*
 	*/
-	public function fromCustomSource($aircraft_registration,$aircraft_name='') {
+	public function fromCustomSource($aircraft_registration, $aircraft_name = '') {
 		global $globalAircraftImageCustomSources;
 		//$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true);
 		if (!empty($globalAircraftImageCustomSources)) {
 			if (!isset($globalAircraftImageCustomSources[0])) $globalAircraftImageCustomSources[] = $globalAircraftImageCustomSources;
 			foreach ($globalAircraftImageCustomSources as $source) {
 				$Common = new Common();
-				$url = str_replace('{registration}',$aircraft_registration,$source['original']);
-				$url_thumbnail = str_replace('{registration}',$aircraft_registration,$source['original']);
+				$url = str_replace('{registration}', $aircraft_registration, $source['original']);
+				$url_thumbnail = str_replace('{registration}', $aircraft_registration, $source['original']);
 				if ($Common->urlexist($url)) {
 					$image_url = array();
 					$image_url['thumbnail'] = $url_thumbnail;
 					$image_url['original'] = $url;
 					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
 					else $exifCopyright = '';
-					if ($exifCopyright  != '') $image_url['copyright'] = $exifCopyright;
+					if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright;
 					else $image_url['copyright'] = $source['copyright'];
 					$image_url['source_website'] = $source['source_website'];
 					$image_url['source'] = $source['source'];

require/class.METAR.php

Braces +94 added lines, -36 removed lines

@@ -58,8 +58,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
         }
 
         public static function insert_last_update() {
@@ -83,9 +86,14 @@ 
     		//$pieces = explode(' ',$data);
     		$pieces = preg_split('/\s/',$data);
     		$pos = 0;
-    		if ($pieces[0] == 'METAR') $pos++;
-    		elseif ($pieces[0] == 'SPECI') $pos++;
-    		if (strlen($pieces[$pos]) != 4) $pos++;
+    		if ($pieces[0] == 'METAR') {
+    			$pos++;
+    		} elseif ($pieces[0] == 'SPECI') {
+    			$pos++;
+    		}
+    		if (strlen($pieces[$pos]) != 4) {
+    			$pos++;
+    		}
     		$result = array();
     		$result['location'] = $pieces[$pos];
     		$pos++;
@@ -94,16 +102,26 @@ 
     		$c = count($pieces);
     		for($pos++; $pos < $c; $pos++) {
     			$piece = $pieces[$pos];
-    			if ($piece == 'RMK') break;
-    			if ($piece == 'AUTO') $result['auto'] = true;
-    			if ($piece == 'COR') $result['correction'] = true;
+    			if ($piece == 'RMK') {
+    				break;
+    			}
+    			if ($piece == 'AUTO') {
+    				$result['auto'] = true;
+    			}
+    			if ($piece == 'COR') {
+    				$result['correction'] = true;
+    			}
     			// Wind Speed
     			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
     				$result['wind']['direction'] = (float)$matches[1];
 				$result['wind']['unit'] = $matches[4];
-    				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-    				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-    				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
+    				if ($result['wind']['unit'] == 'KT') {
+    					$result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
+    				} elseif ($result['wind']['unit'] == 'KPH') {
+    					$result['wind']['speed'] = round(((float)$matches[2])*1000,2);
+    				} elseif ($result['wind']['unit'] == 'MPS') {
+    					$result['wind']['speed'] = round(((float)$matches[2]),2);
+    				}
 				$result['wind']['gust'] = (float)$matches[3];
 				$result['wind']['unit'] = $matches[4];
 				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
@@ -185,14 +203,23 @@ 
     				//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
     				$type = $matches[1];
     				$cloud = array();
-    				if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
-    				elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
-    				elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
-    				elseif ($type == 'FEW') $cloud['type'] = 'Few';
-    				elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
-    				elseif ($type == 'BKN') $cloud['type'] = 'Broken';
-    				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
-    				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
+    				if ($type == 'SKC') {
+    					$cloud['type'] = 'No cloud/Sky clear';
+    				} elseif ($type == 'CLR') {
+    					$cloud['type'] = 'No cloud below 12,000ft (3700m)';
+    				} elseif ($type == 'NSC') {
+    					$cloud['type'] = 'No significant cloud';
+    				} elseif ($type == 'FEW') {
+    					$cloud['type'] = 'Few';
+    				} elseif ($type == 'SCT') {
+    					$cloud['type'] = 'Scattered';
+    				} elseif ($type == 'BKN') {
+    					$cloud['type'] = 'Broken';
+    				} elseif ($type == 'OVC') {
+    					$cloud['type'] = 'Overcast/Full cloud coverage';
+    				} elseif ($type == 'VV') {
+    					$cloud['type'] = 'Vertical visibility';
+    				}
     				$cloud['type_code'] = $type;
     				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
     				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
@@ -222,8 +249,11 @@ 
     			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
     				//echo $piece;
     				//print_r($matches);
-    				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-    				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+    				if (isset($matches[5])) {
+    					$range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+    				} else {
+    					$range = array('exact' => (float)$matches[2], 'unit' => 'M');
+    				}
 				if (isset($matches[3])) {
 					$range = Array(
 					    'from' => (float)$matches[2],
@@ -256,8 +286,11 @@ 
 				if (isset($matches[3])) {
 					$text[] = $this->texts[$matches[3]];
 				}
-				if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
-				else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
+				if (!isset($result['weather'])) {
+					$result['weather'] = implode(' ', $text);
+				} else {
+					$result['weather'] = $result['weather'].' / '.implode(' ', $text);
+				}
     			}
     		}
     		return $result;
@@ -269,8 +302,11 @@ 
     		if (isset($globalMETARcycle) && $globalMETARcycle) {
             		$query = "SELECT * FROM metar WHERE metar_location = :icao";
                 } else {
-            		if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
-            		else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+            		if ($globalDBdriver == 'mysql') {
+            			$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
+            		} else {
+            			$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+            		}
                 }
                 $query_values = array(':icao' => $icao);
                  try {
@@ -325,7 +361,9 @@ 
         
         public function addMETARCycle() {
     		global $globalDebug, $globalIVAO;
-    		if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
+    		if (isset($globalDebug) && $globalDebug) {
+    			echo "Downloading METAR cycle...";
+    		}
     		date_default_timezone_set("UTC");
     		$Common = new Common();
     		if (isset($globalIVAO) && $globalIVAO) {
@@ -333,7 +371,9 @@ 
     		} else {
 			$cycle = $Common->getData('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT');
     		}
-    		if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
+    		if (isset($globalDebug) && $globalDebug) {
+    			echo "Done - Updating DB...";
+    		}
     		$date = '';
     		foreach(explode("\n",$cycle) as $line) {
     			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
@@ -342,22 +382,32 @@ 
     			} elseif ($line != '') {
     			    //$this->parse($line);
     			    //echo $line;
-    			    if ($date == '') $date = date('Y/m/d H:m');
+    			    if ($date == '') {
+    			    	$date = date('Y/m/d H:m');
+    			    }
     			    $pos = 0;
     			    $pieces = preg_split('/\s/',$line);
-    			    if ($pieces[0] == 'METAR') $pos++;
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
+    			    if ($pieces[0] == 'METAR') {
+    			    	$pos++;
+    			    }
+    			    if (strlen($pieces[$pos]) != 4) {
+    			    	$pos++;
+    			    }
 	        	    $location = $pieces[$pos];
 	        	    echo $this->addMETAR($location,$line,$date);
     			}
     			//echo $line."\n";
     		}
-    		if (isset($globalDebug) && $globalDebug) echo "Done\n";
+    		if (isset($globalDebug) && $globalDebug) {
+    			echo "Done\n";
+    		}
         
         }
         public function downloadMETAR($icao) {
     		global $globalMETARurl;
-    		if ($globalMETARurl == '') return array();
+    		if ($globalMETARurl == '') {
+    			return array();
+    		}
     		date_default_timezone_set("UTC");
     		$Common = new Common();
     		$url = str_replace('{icao}',$icao,$globalMETARurl);
@@ -370,16 +420,24 @@ 
     			} elseif ($line != '') {
     			    //$this->parse($line);
     			    //echo $line;
-    			    if ($date == '') $date = date('Y/m/d H:m');
+    			    if ($date == '') {
+    			    	$date = date('Y/m/d H:m');
+    			    }
     			    $pos = 0;
     			    $pieces = preg_split('/\s/',$line);
-    			    if ($pieces[0] == 'METAR') $pos++;
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
+    			    if ($pieces[0] == 'METAR') {
+    			    	$pos++;
+    			    }
+    			    if (strlen($pieces[$pos]) != 4) {
+    			    	$pos++;
+    			    }
 	        	    $location = $pieces[$pos];
 	        	    if (strlen($location == 4)) {
 	        		$this->addMETAR($location,$line,$date);
 	        		return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
-	        	    } else return array();
+	        	    } else {
+	        	    	return array();
+	        	    }
     			}
     			//echo $line."\n";
     		}

Indentation +263 added lines, -263 removed lines

@@ -7,109 +7,109 @@ 
 	public $db;
 	
 	protected $texts = Array(
-	    'MI' => 'Shallow',
-	    'PR' => 'Partial',
-	    'BC' => 'Low drifting',
-	    'BL' => 'Blowing',
-	    'SH' => 'Showers',
-	    'TS' => 'Thunderstorm',
-	    'FZ' => 'Freezing',
-	    'DZ' => 'Drizzle',
-	    'RA' => 'Rain',
-	    'SN' => 'Snow',
-	    'SG' => 'Snow Grains',
-	    'IC' => 'Ice crystals',
-	    'PL' => 'Ice pellets',
-	    'GR' => 'Hail',
-	    'GS' => 'Small hail',
-	    'UP' => 'Unknown',
-	    'BR' => 'Mist',
-	    'FG' => 'Fog',
-	    'FU' => 'Smoke',
-	    'VA' => 'Volcanic ash',
-	    'DU' => 'Widespread dust',
-	    'SA' => 'Sand',
-	    'HZ' => 'Haze',
-	    'PY' => 'Spray',
-	    'PO' => 'Well developed dust / sand whirls',
-	    'SQ' => 'Squalls',
-	    'FC' => 'Funnel clouds inc tornadoes or waterspouts',
-	    'SS' => 'Sandstorm',
-	    'DS' => 'Duststorm'
+		'MI' => 'Shallow',
+		'PR' => 'Partial',
+		'BC' => 'Low drifting',
+		'BL' => 'Blowing',
+		'SH' => 'Showers',
+		'TS' => 'Thunderstorm',
+		'FZ' => 'Freezing',
+		'DZ' => 'Drizzle',
+		'RA' => 'Rain',
+		'SN' => 'Snow',
+		'SG' => 'Snow Grains',
+		'IC' => 'Ice crystals',
+		'PL' => 'Ice pellets',
+		'GR' => 'Hail',
+		'GS' => 'Small hail',
+		'UP' => 'Unknown',
+		'BR' => 'Mist',
+		'FG' => 'Fog',
+		'FU' => 'Smoke',
+		'VA' => 'Volcanic ash',
+		'DU' => 'Widespread dust',
+		'SA' => 'Sand',
+		'HZ' => 'Haze',
+		'PY' => 'Spray',
+		'PO' => 'Well developed dust / sand whirls',
+		'SQ' => 'Squalls',
+		'FC' => 'Funnel clouds inc tornadoes or waterspouts',
+		'SS' => 'Sandstorm',
+		'DS' => 'Duststorm'
 	);
 	
 	public function __construct($dbc = null) {
-                $Connection = new Connection($dbc);
-                $this->db = $Connection->db;
-        }
+				$Connection = new Connection($dbc);
+				$this->db = $Connection->db;
+		}
 
-       public static function check_last_update() {
-    		global $globalDBdriver;
-    		if ($globalDBdriver == 'mysql') {
+	   public static function check_last_update() {
+			global $globalDBdriver;
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT COUNT(*) as nb FROM config WHERE name = 'last_update_metar' AND value > DATE_SUB(NOW(), INTERVAL 20 MINUTE)";
 		} else {
 			$query = "SELECT COUNT(*) as nb FROM config WHERE name = 'last_update_metar' AND value::timestamp > CURRENT_TIMESTAMP - INTERVAL '20 MINUTES'";
 		}
-                try {
-                        $Connection = new Connection();
-                        $sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                $sth->closeCursor();
-                if ($row['nb'] > 0) return false;
-                else return true;
-        }
+				try {
+						$Connection = new Connection();
+						$sth = $Connection->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				$sth->closeCursor();
+				if ($row['nb'] > 0) return false;
+				else return true;
+		}
 
-        public static function insert_last_update() {
-                $query = "DELETE FROM config WHERE name = 'last_update_metar';
+		public static function insert_last_update() {
+				$query = "DELETE FROM config WHERE name = 'last_update_metar';
                         INSERT INTO config (name,value) VALUES ('last_update_metar',NOW());";
-                try {
-                        $Connection = new Connection();
-                        $sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				try {
+						$Connection = new Connection();
+						$sth = $Connection->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
 
         
-        public function parse($data) {
-    		//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
-    		$codes = implode('|', array_keys($this->texts));
-    		$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
-    		//$pieces = explode(' ',$data);
-    		$pieces = preg_split('/\s/',$data);
-    		$pos = 0;
-    		if ($pieces[0] == 'METAR') $pos++;
-    		elseif ($pieces[0] == 'SPECI') $pos++;
-    		if (strlen($pieces[$pos]) != 4) $pos++;
-    		$result = array();
-    		$result['location'] = $pieces[$pos];
-    		$pos++;
-    		$result['dayofmonth'] = substr($pieces[$pos],0,2);
-    		$result['time'] = substr($pieces[$pos],2,4);
-    		$c = count($pieces);
-    		for($pos++; $pos < $c; $pos++) {
-    			$piece = $pieces[$pos];
-    			if ($piece == 'RMK') break;
-    			if ($piece == 'AUTO') $result['auto'] = true;
-    			if ($piece == 'COR') $result['correction'] = true;
-    			// Wind Speed
-    			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
-    				$result['wind']['direction'] = (float)$matches[1];
+		public function parse($data) {
+			//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
+			$codes = implode('|', array_keys($this->texts));
+			$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
+			//$pieces = explode(' ',$data);
+			$pieces = preg_split('/\s/',$data);
+			$pos = 0;
+			if ($pieces[0] == 'METAR') $pos++;
+			elseif ($pieces[0] == 'SPECI') $pos++;
+			if (strlen($pieces[$pos]) != 4) $pos++;
+			$result = array();
+			$result['location'] = $pieces[$pos];
+			$pos++;
+			$result['dayofmonth'] = substr($pieces[$pos],0,2);
+			$result['time'] = substr($pieces[$pos],2,4);
+			$c = count($pieces);
+			for($pos++; $pos < $c; $pos++) {
+				$piece = $pieces[$pos];
+				if ($piece == 'RMK') break;
+				if ($piece == 'AUTO') $result['auto'] = true;
+				if ($piece == 'COR') $result['correction'] = true;
+				// Wind Speed
+				if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
+					$result['wind']['direction'] = (float)$matches[1];
 				$result['wind']['unit'] = $matches[4];
-    				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-    				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-    				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
+					if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
+					elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
+					elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
 				$result['wind']['gust'] = (float)$matches[3];
 				$result['wind']['unit'] = $matches[4];
 				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
 				$result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0;
-    			}
+				}
 
 /*    			if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) {
     				$result['wind_direction'] = (float)$matches[1];
@@ -126,35 +126,35 @@ 
     				}
     			}
     			*/
-    			// Temperature
-    			if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
-    				$temp = (float)$matches[1];
+				// Temperature
+				if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
+					$temp = (float)$matches[1];
 				if ($matches[1]{0} == 'M') {
 					$temp = ((float)substr($matches[1], 1)) * -1;
 				}
-    				$result['temperature'] = $temp;
-    				$dew = (float)$matches[2];
+					$result['temperature'] = $temp;
+					$dew = (float)$matches[2];
 				if ($matches[2]{0} == 'M') {
 					$dew = ((float)substr($matches[2], 1)) * -1;
 				}
 				$result['dew'] = $dew;
-    			}
-    			// QNH
-    			if (preg_match('#^(A|Q)([0-9]{4})$#', $piece, $matches)) {
-    			// #^(Q|A)(////|[0-9]{4})( )#
-    				if ($matches[1] == 'Q') {
-    					// hPa
-    					$result['QNH'] = $matches[2];
-    				} else {
-    					// inHg
-    					$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
 				}
-    				/*
+				// QNH
+				if (preg_match('#^(A|Q)([0-9]{4})$#', $piece, $matches)) {
+				// #^(Q|A)(////|[0-9]{4})( )#
+					if ($matches[1] == 'Q') {
+						// hPa
+						$result['QNH'] = $matches[2];
+					} else {
+						// inHg
+						$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
+				}
+					/*
     				$result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100);
     				$result['QNH_format'] = $matches[1] == 'Q' ? 'hPa' : 'inHg';
     				*/
-    			}
-                     /*
+				}
+					 /*
     			// Wind Direction
     			if (preg_match('#^([0-9]{3})V([0-9]{3})$#', $piece, $matches)) {
     				$result['wind_direction'] = $matches[1];
@@ -165,9 +165,9 @@ 
     				$result['speed_variable'] = $matches[1];
     			}
     			*/
-    			// Visibility
-    			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
-    				if (isset($matches[3]) && strlen($matches[3]) > 0) {
+				// Visibility
+				if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
+					if (isset($matches[3]) && strlen($matches[3]) > 0) {
 					$result['visibility'] = (float)$matches[3] * 1609.34;
 				} else {
 					if ($matches[1] == '9999') {
@@ -180,28 +180,28 @@ 
 					$result['visibility'] = '> 10000';
 					$result['weather'] = "CAVOK";
 				}
-    			}
-    			// Cloud Coverage
-    			if (preg_match('#^(SKC|CLR|FEW|SCT|BKN|OVC|VV)([0-9]{3})(CB|TCU|CU|CI)?$#', $piece, $matches)) {
-    				//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
-    				$type = $matches[1];
-    				$cloud = array();
-    				if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
-    				elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
-    				elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
-    				elseif ($type == 'FEW') $cloud['type'] = 'Few';
-    				elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
-    				elseif ($type == 'BKN') $cloud['type'] = 'Broken';
-    				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
-    				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
-    				$cloud['type_code'] = $type;
-    				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
-    				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
-    				$result['cloud'][] = $cloud;
-    			}
-    			// RVR
-    			 if (preg_match('#^(R.+)/([M|P])?(\d{4})(?:V(\d+)|[UDN])?(FT)?$#', $piece, $matches)) {
-    				$rvr = array();
+				}
+				// Cloud Coverage
+				if (preg_match('#^(SKC|CLR|FEW|SCT|BKN|OVC|VV)([0-9]{3})(CB|TCU|CU|CI)?$#', $piece, $matches)) {
+					//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
+					$type = $matches[1];
+					$cloud = array();
+					if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
+					elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
+					elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
+					elseif ($type == 'FEW') $cloud['type'] = 'Few';
+					elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
+					elseif ($type == 'BKN') $cloud['type'] = 'Broken';
+					elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
+					elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
+					$cloud['type_code'] = $type;
+					$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
+					$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
+					$result['cloud'][] = $cloud;
+				}
+				// RVR
+				 if (preg_match('#^(R.+)/([M|P])?(\d{4})(?:V(\d+)|[UDN])?(FT)?$#', $piece, $matches)) {
+					$rvr = array();
 				$rvr['runway'] = $matches[1];
 				$rvr['assessment'] = $matches[2];
 				$rvr['rvr'] = $matches[3];
@@ -210,33 +210,33 @@ 
 				$result['RVR'] = $rvr;
 			}
     			
-    			//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
-    			if (preg_match('#^R(\d{2}[LRC]?)/([\d/])([\d/])([\d/]{2})([\d/]{2})$#', $piece, $matches)) {
-    				//print_r($matches);
-    				// https://github.com/davidmegginson/metar-taf/blob/master/Metar.php
-    				$result['RVR']['runway'] = $matches[1];
-        			$result['RVR']['deposits'] = $matches[2];
-        			$result['RVR']['extent'] = $matches[3];
-        			$result['RVR']['depth'] = $matches[4];
-        			$result['RVR']['friction'] = $matches[5];
-    			}
-    			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
-    				//echo $piece;
-    				//print_r($matches);
-    				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-    				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+				//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
+				if (preg_match('#^R(\d{2}[LRC]?)/([\d/])([\d/])([\d/]{2})([\d/]{2})$#', $piece, $matches)) {
+					//print_r($matches);
+					// https://github.com/davidmegginson/metar-taf/blob/master/Metar.php
+					$result['RVR']['runway'] = $matches[1];
+					$result['RVR']['deposits'] = $matches[2];
+					$result['RVR']['extent'] = $matches[3];
+					$result['RVR']['depth'] = $matches[4];
+					$result['RVR']['friction'] = $matches[5];
+				}
+				if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
+					//echo $piece;
+					//print_r($matches);
+					if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+					else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
 				if (isset($matches[3])) {
 					$range = Array(
-					    'from' => (float)$matches[2],
-					    'to'   => (float)$matches[4],
-					    'unit' => $matches[5] ? 'FT' : 'M'
+						'from' => (float)$matches[2],
+						'to'   => (float)$matches[4],
+						'unit' => $matches[5] ? 'FT' : 'M'
 					);
 				}
 				$result['RVR'] = $matches[1];
 				$result['RVR_range'] = $range;
-    			}
-    			// Weather
-    			if (preg_match($regWeather, $piece, $matches)) {
+				}
+				// Weather
+				if (preg_match($regWeather, $piece, $matches)) {
 				$text = Array();
 				switch ($matches[1]) {
 					case '+':
@@ -259,35 +259,35 @@ 
 				}
 				if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
 				else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
-    			}
-    		}
-    		return $result;
+				}
+			}
+			return $result;
         
-        }
+		}
         
 	public function getMETAR($icao) {
-    		global $globalMETARcycle, $globalDBdriver;
-    		if (isset($globalMETARcycle) && $globalMETARcycle) {
-            		$query = "SELECT * FROM metar WHERE metar_location = :icao";
-                } else {
-            		if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
-            		else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
-                }
-                $query_values = array(':icao' => $icao);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if ((!isset($globalMETARcycle) || $globalMETARcycle === false) && count($all) == 0) {
-            		$all = $this->downloadMETAR($icao);
-                }
-                return $all;
-        }
+			global $globalMETARcycle, $globalDBdriver;
+			if (isset($globalMETARcycle) && $globalMETARcycle) {
+					$query = "SELECT * FROM metar WHERE metar_location = :icao";
+				} else {
+					if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
+					else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+				}
+				$query_values = array(':icao' => $icao);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if ((!isset($globalMETARcycle) || $globalMETARcycle === false) && count($all) == 0) {
+					$all = $this->downloadMETAR($icao);
+				}
+				return $all;
+		}
 
-       public function addMETAR($location,$metar,$date) {
+	   public function addMETAR($location,$metar,$date) {
 		global $globalDBdriver;
 		$date = date('Y-m-d H:i:s',strtotime($date));
 		if ($globalDBdriver == 'mysql') {
@@ -295,100 +295,100 @@ 
 		} else {
 			$query = "UPDATE metar SET metar_date = :date, metar = metar WHERE metar_location = :location;INSERT INTO metar (metar_location,metar_date,metar) SELECT :location,:date,:metar WHERE NOT EXISTS (SELECT 1 FROM metar WHERE metar_location = :location);";
 		}
-                $query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar));
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar));
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
-       public function deleteMETAR($id) {
-                $query = "DELETE FROM metar WHERE id = :id";
-                $query_values = array(':id' => $id);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
-       public function deleteAllMETARLocation() {
-                $query = "DELETE FROM metar";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function deleteMETAR($id) {
+				$query = "DELETE FROM metar WHERE id = :id";
+				$query_values = array(':id' => $id);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
+	   public function deleteAllMETARLocation() {
+				$query = "DELETE FROM metar";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
         
-        public function addMETARCycle() {
-    		global $globalDebug, $globalIVAO;
-    		if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
-    		date_default_timezone_set("UTC");
-    		$Common = new Common();
-    		if (isset($globalIVAO) && $globalIVAO) {
-        		$cycle = $Common->getData('http://wx.ivao.aero/metar.php');
-    		} else {
+		public function addMETARCycle() {
+			global $globalDebug, $globalIVAO;
+			if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
+			date_default_timezone_set("UTC");
+			$Common = new Common();
+			if (isset($globalIVAO) && $globalIVAO) {
+				$cycle = $Common->getData('http://wx.ivao.aero/metar.php');
+			} else {
 			$cycle = $Common->getData('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT');
-    		}
-    		if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
-    		$date = '';
-    		foreach(explode("\n",$cycle) as $line) {
-    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
-    				//echo "date : ".$line."\n";
-    				$date = $line;
-    			} 
-    			if ($line != '') {
-    			    //$this->parse($line);
-    			    //echo $line;
-    			    if ($date == '') $date = date('Y/m/d H:m');
-    			    $pos = 0;
-    			    $pieces = preg_split('/\s/',$line);
-    			    if ($pieces[0] == 'METAR') $pos++;
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
-	        	    $location = $pieces[$pos];
-	        	    echo $this->addMETAR($location,$line,$date);
-    			}
-    			//echo $line."\n";
-    		}
-    		if (isset($globalDebug) && $globalDebug) echo "Done\n";
+			}
+			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
+			$date = '';
+			foreach(explode("\n",$cycle) as $line) {
+				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+					//echo "date : ".$line."\n";
+					$date = $line;
+				} 
+				if ($line != '') {
+					//$this->parse($line);
+					//echo $line;
+					if ($date == '') $date = date('Y/m/d H:m');
+					$pos = 0;
+					$pieces = preg_split('/\s/',$line);
+					if ($pieces[0] == 'METAR') $pos++;
+					if (strlen($pieces[$pos]) != 4) $pos++;
+					$location = $pieces[$pos];
+					echo $this->addMETAR($location,$line,$date);
+				}
+				//echo $line."\n";
+			}
+			if (isset($globalDebug) && $globalDebug) echo "Done\n";
         
-        }
-        public function downloadMETAR($icao) {
-    		global $globalMETARurl;
-    		if ($globalMETARurl == '') return array();
-    		date_default_timezone_set("UTC");
-    		$Common = new Common();
-    		$url = str_replace('{icao}',$icao,$globalMETARurl);
-    		$cycle = $Common->getData($url);
-    		$date = '';
-    		foreach(explode("\n",$cycle) as $line) {
-    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
-    				//echo "date : ".$line."\n";
-    				$date = $line;
-    			} 
-    			if ($line != '') {
-    			    //$this->parse($line);
-    			    //echo $line;
-    			    if ($date == '') $date = date('Y/m/d H:m');
-    			    $pos = 0;
-    			    $pieces = preg_split('/\s/',$line);
-    			    if ($pieces[0] == 'METAR') $pos++;
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
-	        	    $location = $pieces[$pos];
-	        	    if (strlen($location == 4)) {
-	        		$this->addMETAR($location,$line,$date);
-	        		return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
-	        	    } else return array();
-    			}
-    			//echo $line."\n";
-    		}
-    		return array();
+		}
+		public function downloadMETAR($icao) {
+			global $globalMETARurl;
+			if ($globalMETARurl == '') return array();
+			date_default_timezone_set("UTC");
+			$Common = new Common();
+			$url = str_replace('{icao}',$icao,$globalMETARurl);
+			$cycle = $Common->getData($url);
+			$date = '';
+			foreach(explode("\n",$cycle) as $line) {
+				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+					//echo "date : ".$line."\n";
+					$date = $line;
+				} 
+				if ($line != '') {
+					//$this->parse($line);
+					//echo $line;
+					if ($date == '') $date = date('Y/m/d H:m');
+					$pos = 0;
+					$pieces = preg_split('/\s/',$line);
+					if ($pieces[0] == 'METAR') $pos++;
+					if (strlen($pieces[$pos]) != 4) $pos++;
+					$location = $pieces[$pos];
+					if (strlen($location == 4)) {
+					$this->addMETAR($location,$line,$date);
+					return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
+					} else return array();
+				}
+				//echo $line."\n";
+			}
+			return array();
         
-        }
+		}
 }
 /*
 $METAR = new METAR();

Spacing +44 added lines, -44 removed lines

@@ -54,7 +54,7 @@ 
                         $Connection = new Connection();
                         $sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -70,7 +70,7 @@ 
                         $Connection = new Connection();
                         $sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -80,9 +80,9 @@ 
         public function parse($data) {
     		//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
     		$codes = implode('|', array_keys($this->texts));
-    		$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
+    		$regWeather = '#^(\+|\-|VC)?('.$codes.')('.$codes.')?$#';
     		//$pieces = explode(' ',$data);
-    		$pieces = preg_split('/\s/',$data);
+    		$pieces = preg_split('/\s/', $data);
     		$pos = 0;
     		if ($pieces[0] == 'METAR') $pos++;
     		elseif ($pieces[0] == 'SPECI') $pos++;
@@ -90,25 +90,25 @@ 
     		$result = array();
     		$result['location'] = $pieces[$pos];
     		$pos++;
-    		$result['dayofmonth'] = substr($pieces[$pos],0,2);
-    		$result['time'] = substr($pieces[$pos],2,4);
+    		$result['dayofmonth'] = substr($pieces[$pos], 0, 2);
+    		$result['time'] = substr($pieces[$pos], 2, 4);
     		$c = count($pieces);
-    		for($pos++; $pos < $c; $pos++) {
+    		for ($pos++; $pos < $c; $pos++) {
     			$piece = $pieces[$pos];
     			if ($piece == 'RMK') break;
     			if ($piece == 'AUTO') $result['auto'] = true;
     			if ($piece == 'COR') $result['correction'] = true;
     			// Wind Speed
     			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
-    				$result['wind']['direction'] = (float)$matches[1];
+    				$result['wind']['direction'] = (float) $matches[1];
 				$result['wind']['unit'] = $matches[4];
-    				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-    				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-    				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
-				$result['wind']['gust'] = (float)$matches[3];
+    				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float) $matches[2])*0.51444444444, 2);
+    				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float) $matches[2])*1000, 2);
+    				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float) $matches[2]), 2);
+				$result['wind']['gust'] = (float) $matches[3];
 				$result['wind']['unit'] = $matches[4];
-				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
-				$result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0;
+				$result['wind']['min_variation'] = array_key_exists(5, $matches) ? $matches[5] : 0;
+				$result['wind']['max_variation'] = array_key_exists(6, $matches) ? $matches[6] : 0;
     			}
 
 /*    			if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) {
@@ -128,14 +128,14 @@ 
     			*/
     			// Temperature
     			if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
-    				$temp = (float)$matches[1];
+    				$temp = (float) $matches[1];
 				if ($matches[1]{0} == 'M') {
-					$temp = ((float)substr($matches[1], 1)) * -1;
+					$temp = ((float) substr($matches[1], 1))*-1;
 				}
     				$result['temperature'] = $temp;
-    				$dew = (float)$matches[2];
+    				$dew = (float) $matches[2];
 				if ($matches[2]{0} == 'M') {
-					$dew = ((float)substr($matches[2], 1)) * -1;
+					$dew = ((float) substr($matches[2], 1))*-1;
 				}
 				$result['dew'] = $dew;
     			}
@@ -147,7 +147,7 @@ 
     					$result['QNH'] = $matches[2];
     				} else {
     					// inHg
-    					$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
+    					$result['QNH'] = round(($matches[2]/100)*33.86389, 2);
 				}
     				/*
     				$result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100);
@@ -168,12 +168,12 @@ 
     			// Visibility
     			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
     				if (isset($matches[3]) && strlen($matches[3]) > 0) {
-					$result['visibility'] = (float)$matches[3] * 1609.34;
+					$result['visibility'] = (float) $matches[3]*1609.34;
 				} else {
 					if ($matches[1] == '9999') {
 						$result['visibility'] = '> 10000';
 					} else {
-						$result['visibility'] = (float)$matches[1];
+						$result['visibility'] = (float) $matches[1];
 					}
 				}
 				if (preg_match('#^CAVOK$#', $piece, $matches)) {
@@ -195,7 +195,7 @@ 
     				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
     				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
     				$cloud['type_code'] = $type;
-    				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
+    				$cloud['level'] = round(((float) $matches[2])*100*0.3048);
     				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
     				$result['cloud'][] = $cloud;
     			}
@@ -205,8 +205,8 @@ 
 				$rvr['runway'] = $matches[1];
 				$rvr['assessment'] = $matches[2];
 				$rvr['rvr'] = $matches[3];
-				$rvr['rvr_max'] = array_key_exists(4,$matches) ? $matches[4] : 0;
-				$rvr['unit'] = array_key_exists(5,$matches) ? $matches[5] : '';
+				$rvr['rvr_max'] = array_key_exists(4, $matches) ? $matches[4] : 0;
+				$rvr['unit'] = array_key_exists(5, $matches) ? $matches[5] : '';
 				$result['RVR'] = $rvr;
 			}
     			
@@ -223,12 +223,12 @@ 
     			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
     				//echo $piece;
     				//print_r($matches);
-    				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-    				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+    				if (isset($matches[5])) $range = array('exact' => (float) $matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+    				else $range = array('exact' => (float) $matches[2], 'unit' => 'M');
 				if (isset($matches[3])) {
 					$range = Array(
-					    'from' => (float)$matches[2],
-					    'to'   => (float)$matches[4],
+					    'from' => (float) $matches[2],
+					    'to'   => (float) $matches[4],
 					    'unit' => $matches[5] ? 'FT' : 'M'
 					);
 				}
@@ -277,7 +277,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -287,19 +287,19 @@ 
                 return $all;
         }
 
-       public function addMETAR($location,$metar,$date) {
+       public function addMETAR($location, $metar, $date) {
 		global $globalDBdriver;
-		$date = date('Y-m-d H:i:s',strtotime($date));
+		$date = date('Y-m-d H:i:s', strtotime($date));
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO metar (metar_location,metar_date,metar) VALUES (:location,:date,:metar) ON DUPLICATE KEY UPDATE metar_date = :date, metar = :metar";
 		} else {
 			$query = "UPDATE metar SET metar_date = :date, metar = metar WHERE metar_location = :location;INSERT INTO metar (metar_location,metar_date,metar) SELECT :location,:date,:metar WHERE NOT EXISTS (SELECT 1 FROM metar WHERE metar_location = :location);";
 		}
-                $query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar));
+                $query_values = array(':location' => $location, ':date' => $date, ':metar' => utf8_encode($metar));
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -310,7 +310,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -319,7 +319,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -336,8 +336,8 @@ 
     		}
     		if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
     		$date = '';
-    		foreach(explode("\n",$cycle) as $line) {
-    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+    		foreach (explode("\n", $cycle) as $line) {
+    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) {
     				//echo "date : ".$line."\n";
     				$date = $line;
     			} 
@@ -346,11 +346,11 @@ 
     			    //echo $line;
     			    if ($date == '') $date = date('Y/m/d H:m');
     			    $pos = 0;
-    			    $pieces = preg_split('/\s/',$line);
+    			    $pieces = preg_split('/\s/', $line);
     			    if ($pieces[0] == 'METAR') $pos++;
     			    if (strlen($pieces[$pos]) != 4) $pos++;
 	        	    $location = $pieces[$pos];
-	        	    echo $this->addMETAR($location,$line,$date);
+	        	    echo $this->addMETAR($location, $line, $date);
     			}
     			//echo $line."\n";
     		}
@@ -362,11 +362,11 @@ 
     		if ($globalMETARurl == '') return array();
     		date_default_timezone_set("UTC");
     		$Common = new Common();
-    		$url = str_replace('{icao}',$icao,$globalMETARurl);
+    		$url = str_replace('{icao}', $icao, $globalMETARurl);
     		$cycle = $Common->getData($url);
     		$date = '';
-    		foreach(explode("\n",$cycle) as $line) {
-    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+    		foreach (explode("\n", $cycle) as $line) {
+    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) {
     				//echo "date : ".$line."\n";
     				$date = $line;
     			} 
@@ -375,12 +375,12 @@ 
     			    //echo $line;
     			    if ($date == '') $date = date('Y/m/d H:m');
     			    $pos = 0;
-    			    $pieces = preg_split('/\s/',$line);
+    			    $pieces = preg_split('/\s/', $line);
     			    if ($pieces[0] == 'METAR') $pos++;
     			    if (strlen($pieces[$pos]) != 4) $pos++;
 	        	    $location = $pieces[$pos];
 	        	    if (strlen($location == 4)) {
-	        		$this->addMETAR($location,$line,$date);
+	        		$this->addMETAR($location, $line, $date);
 	        		return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
 	        	    } else return array();
     			}

require/class.Scheduler.php

Indentation +160 added lines, -160 removed lines

@@ -8,29 +8,29 @@ 
 
 class Schedule {
 	protected $cookies = array();
-        public $db;
+		public $db;
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-        }
+		}
 	
 	/**
-	* Add schedule data to database
-	* @param String $ident aircraft ident
-	* @param String $departure_airport_icao departure airport icao
-	* @param String $departure_airport_time departure airport time
-	* @param String $arrival_airport_icao arrival airport icao
-	* @param String $arrival_airport_time arrival airport time
+	 * Add schedule data to database
+	 * @param String $ident aircraft ident
+	 * @param String $departure_airport_icao departure airport icao
+	 * @param String $departure_airport_time departure airport time
+	 * @param String $arrival_airport_icao arrival airport icao
+	 * @param String $arrival_airport_time arrival airport time
 	/ @param String $source source of data
-	*/
+	 */
 	
 	public function addSchedule($ident,$departure_airport_icao,$departure_airport_time,$arrival_airport_icao,$arrival_airport_time,$source = 'website') {
 		date_default_timezone_set('UTC');
 		$date = date("Y-m-d H:i:s",time());
-	        //if ($departure_airport_time == '' && $arrival_airport_time == '') exit;
-	        //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident";
-	        $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident";
-	        $query_values = array(':ident' => $ident);
+			//if ($departure_airport_time == '' && $arrival_airport_time == '') exit;
+			//$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident";
+			$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident";
+			$query_values = array(':ident' => $ident);
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
@@ -39,18 +39,18 @@ 
 		}
 		if ($sth->fetchColumn() > 0) {
 			if ($departure_airport_time == '' && $arrival_airport_time == '') {
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao);
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao";
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao);
 			} elseif ($arrival_airport_time == '') {
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao);
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao";
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao);
 			} elseif ($departure_airport_time == '') {
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
 			} else {
-			    //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident AND departure_airport_icao = :departure_airport_icao AND departure_airport_time = :departure_airport_time AND arrival_airport_icao = :arrival_airport_icao AND arrival_airport_time = :arrival_airport_time";
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
+				//$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident AND departure_airport_icao = :departure_airport_icao AND departure_airport_time = :departure_airport_time AND arrival_airport_icao = :arrival_airport_icao AND arrival_airport_time = :arrival_airport_time";
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
 			}
 			try {
 				$sth = $this->db->prepare($query);
@@ -61,17 +61,17 @@ 
 			if ($sth->fetchColumn() == 0) {
 				//$query = 'UPDATE schedule SET departure_airport_icao = :departure_airport_icao, departure_airport_time = :departure_airport_time, arrival_airport_icao = :arrival_airport_icao, arrival_airport_time = :arrival_airport_time, date_modified = :date, source = :source WHERE ident = :ident';
 				if ($departure_airport_time == '' && $arrival_airport_time == '') {
-                            	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
+									$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
+					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
 				} elseif ($arrival_airport_time == '') {
-                            	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
+									$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
+					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
 				} elseif ($departure_airport_time == '') {
-                            	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
+									$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
+					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
 				} else {
-                            	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
+									$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
+					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
 				}
 				 try {
 					$sth = $this->db->prepare($query);
@@ -104,15 +104,15 @@ 
 	}
 
 	public function getSchedule($ident) {
-	        $Translation = new Translation($this->db);
-	        $operator = $Translation->checkTranslation($ident,false);
-	        if ($ident != $operator) {
-	    		$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE CallSign = :operator OR CallSign = :ident LIMIT 1";
-	    		$query_values = array(':ident' => $ident,'operator' => $operator);
-	    	} else {
-		        $query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE CallSign = :ident LIMIT 1";
-	    		$query_values = array(':ident' => $ident);
-	    	}
+			$Translation = new Translation($this->db);
+			$operator = $Translation->checkTranslation($ident,false);
+			if ($ident != $operator) {
+				$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE CallSign = :operator OR CallSign = :ident LIMIT 1";
+				$query_values = array(':ident' => $ident,'operator' => $operator);
+			} else {
+				$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE CallSign = :ident LIMIT 1";
+				$query_values = array(':ident' => $ident);
+			}
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
@@ -127,15 +127,15 @@ 
 
 	public function checkSchedule($ident) {
 		global $globalDBdriver;
-	        //$query = "SELECT COUNT(*) as nb FROM schedule WHERE ident = :ident AND date_added > DATE_SUB(CURDATE(), INTERVAL 8 DAY) - 8 LIMIT 1";
-	        if ($globalDBdriver == 'mysql') {
+			//$query = "SELECT COUNT(*) as nb FROM schedule WHERE ident = :ident AND date_added > DATE_SUB(CURDATE(), INTERVAL 8 DAY) - 8 LIMIT 1";
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT COUNT(*) as nb FROM routes WHERE CallSign = :ident AND ((date_added BETWEEN DATE(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) AND DATE(NOW()) and date_modified IS NULL) OR (date_modified BETWEEN DATE(DATE_SUB(CURDATE(), INTERVAL 15 DAY)) AND DATE(NOW()))) LIMIT 1";
 		} else {
 			$query = "SELECT COUNT(*) as nb FROM routes WHERE CallSign = :ident 
 			AND ((date_added::timestamp BETWEEN CURRENT_TIMESTAMP - INTERVAL '1 MONTH' AND CURRENT_TIMESTAMP) and date_modified::timestamp IS NULL)
 			     OR (date_modified::timestamp BETWEEN CURRENT_TIMESTAMP - INTERVAL '1 MONTH' AND CURRENT_TIMESTAMP) LIMIT 1";
 		}
-	        $query_values = array(':ident' => $ident);
+			$query_values = array(':ident' => $ident);
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
@@ -147,12 +147,12 @@ 
 	}
 
 	/**
-	* Get flight info from Air France
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @param String $carrier IATA code
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Air France
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @param String $carrier IATA code
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getAirFrance($callsign, $date = 'NOW',$carrier = 'AF') {
 		$Common = new Common();
 		$check_date = new Datetime($date);
@@ -188,11 +188,11 @@ 
 	}
 
 	/**
-	* Get flight info from EasyJet
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from EasyJet
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getEasyJet($callsign, $date = 'NOW') {
 		global $globalTimezone;
 		$Common = new Common();
@@ -216,10 +216,10 @@ 
 	}
 
 	/**
-	* Get flight info from Ryanair
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Ryanair
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getRyanair($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -242,10 +242,10 @@ 
 	}
 
 	/**
-	* Get flight info from Swiss
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Swiss
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getSwiss($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -274,11 +274,11 @@ 
 	}
 	
 	/**
-	* Get flight info from British Airways API
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from British Airways API
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getBritishAirways($callsign, $date = 'NOW') {
 		global $globalBritishAirwaysKey;
 		$Common = new Common();
@@ -302,11 +302,11 @@ 
 	}
 
 	/**
-	* Get flight info from Lutfhansa API
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Lutfhansa API
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getLufthansa($callsign, $date = 'NOW') {
 		global $globalLufthansaKey;
 		$Common = new Common();
@@ -336,11 +336,11 @@ 
 	}
 
 	/**
-	* Get flight info from Transavia API
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Transavia API
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getTransavia($callsign, $date = 'NOW') {
 		global $globalTransaviaKey;
 		$Common = new Common();
@@ -366,10 +366,10 @@ 
 	}
 
 	/**
-	* Get flight info from Tunisair
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Tunisair
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getTunisair($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -386,10 +386,10 @@ 
 	}
 
 	/**
-	* Get flight info from Vueling
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Vueling
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getVueling($callsign,$date = 'NOW') {
 		$Common = new Common();
 		$check_date = new Datetime($date);
@@ -411,11 +411,11 @@ 
 	}
 
 	/**
-	* Get flight info from Iberia
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Iberia
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getIberia($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -445,11 +445,11 @@ 
 	}
 
 	/**
-	* Get flight info from Star Alliance
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Star Alliance
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 
 	private function getStarAlliance($callsign, $date = 'NOW',$carrier = '') {
 		$Common = new Common();
@@ -481,11 +481,11 @@ 
 
 
 	/**
-	* Get flight info from Alitalia
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Alitalia
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getAlitalia($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -504,11 +504,11 @@ 
 	}
 
 	/**
-	* Get flight info from Brussels airlines
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Brussels airlines
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getBrussels($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -518,24 +518,24 @@ 
 		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		if ($data != '') {
-		    //echo $data;
-		    $parsed_json = json_decode($data);
-		    if (isset($parsed_json[0]->FromAirportCode)) {
+			//echo $data;
+			$parsed_json = json_decode($data);
+			if (isset($parsed_json[0]->FromAirportCode)) {
 			$DepartureAirportIata = $parsed_json[0]->FromAirportCode;
 			$ArrivalAirportIata = $parsed_json[0]->ToAirportCode;
 			$departureTime = date('H:i',strtotime($parsed_json[0]->ScheduledDepatureDate));
 			$arrivalTime = date('H:i',strtotime($parsed_json[0]->ScheduledArrivalDate));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_brussels');
-		    }
+			}
 		}
 	}
 
 	/**
-	* Get flight info from FlightRadar24
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from FlightRadar24
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 /*
 	public function getFlightRadar24($callsign, $date = 'NOW') {
 		$Common = new Common();
@@ -564,11 +564,11 @@ 
 	}
   */
 	/**
-	* Get flight info from Lufthansa
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Lufthansa
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 
 /*	private function getLufthansa($callsign, $date = 'NOW') {
 		$Common = new Common();
@@ -596,10 +596,10 @@ 
 	}
   */
 	/**
-	* Get flight info from flytap
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from flytap
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getFlyTap($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -622,10 +622,10 @@ 
 	}
 
 	/**
-	* Get flight info from flightmapper
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from flightmapper
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getFlightMapper($callsign) {
 		$Common = new Common();
 		$airline_icao = '';
@@ -653,11 +653,11 @@ 
 				$aarr = '';
 				$n = sscanf($sched,'%*s %5[0-9:] %*[^()] (%3[A-Z]) %5[0-9:] %*[^()] (%3[A-Z])',$dhour,$darr,$ahour,$aarr);
 				if ($n == 7) {
-				    $departureTime = $dhour;
-				    $arrivalTime = $ahour;
-				    $DepartureAirportIata = str_replace(array('(',')'),'',$darr);
-				    $ArrivalAirportIata = str_replace(array('(',')'),'',$aarr);
-				    return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightmapper');
+					$departureTime = $dhour;
+					$arrivalTime = $ahour;
+					$DepartureAirportIata = str_replace(array('(',')'),'',$darr);
+					$ArrivalAirportIata = str_replace(array('(',')'),'',$aarr);
+					return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightmapper');
 				}
 			}
 		}
@@ -665,10 +665,10 @@ 
 	}
 
 	/**
-	* Get flight info from flightaware
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from flightaware
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getFlightAware($callsign) {
 		$Common = new Common();
 		/*
@@ -701,10 +701,10 @@ 
 	}
 
 	/**
-	* Get flight info from CostToTravel
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from CostToTravel
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getCostToTravel($callsign) {
 		$Common = new Common();
 		$url= "http://www.costtotravel.com/flight-number/".$callsign;
@@ -726,11 +726,11 @@ 
 	}
 
 	/**
-	* Get flight info from Air Canada
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Air Canada
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getAirCanada($callsign,$date = 'NOW') {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
@@ -754,11 +754,11 @@ 
 	}
 
 	/**
-	* Get flight info from Vietnam Airlines
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Vietnam Airlines
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getVietnamAirlines($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -780,12 +780,12 @@ 
 	}
 
 	/**
-	* Get flight info from Air Berlin
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @param String $carrier airline code
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Air Berlin
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @param String $carrier airline code
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getAirBerlin($callsign, $date = 'NOW',$carrier = 'AB') {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
@@ -814,11 +814,11 @@ 
 			$table = $Common->table2array($data);
 			$flight = $table;
 			if (isset($flight[5][4])) {
-			    $arrivalTime = $flight[5][4];
-			    $arrivalAirport = $flight[5][3];
+				$arrivalTime = $flight[5][4];
+				$arrivalAirport = $flight[5][3];
 			} else {
-			    $arrivalTime = '';
-			    $arrivalAirport = '';
+				$arrivalTime = '';
+				$arrivalAirport = '';
 			}
 		} else return array();
 		$url = 'http://www.airberlin.com/en-US/site/json/suggestAirport.php?searchfor=departures&searchflightid=0&departures%5B%5D=&suggestsource%5B0%5D=activeairports&withcountries=0&withoutroutings=0&promotion%5Bid%5D=&promotion%5Btype%5D=&routesource%5B0%5D=airberlin&routesource%5B1%5D=partner';
@@ -1086,7 +1086,7 @@ 
 					}
 			}
 		}
-	        return array();
+			return array();
 	}
 }
 

Spacing +169 added lines, -169 removed lines

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

Braces +164 added lines, -56 removed lines

@@ -122,7 +122,9 @@ 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 		if (count($row) > 0) {
 			return $row;
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	public function checkSchedule($ident) {
@@ -157,7 +159,9 @@ 
 		$Common = new Common();
 		$check_date = new Datetime($date);
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.airfrance.fr/cgi-bin/AF/FR/fr/local/resainfovol/infovols/detailsVolJson.do?codeCompagnie[0]=".$carrier."&numeroVol[0]=".$numvol."&dayFlightDate=".$check_date->format('d')."&yearMonthFlightDate=".$check_date->format('Ym');
 		$json = $Common->getData($url);
 	
@@ -184,7 +188,9 @@ 
 			*/
 		
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airfrance');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -199,7 +205,9 @@ 
 		date_default_timezone_set($globalTimezone);
 		$check_date = new Datetime($date);
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.easyjet.com/ft/api/flights?date=".$check_date->format('Y-m-d')."&fn=".$callsign;
 		$json = $Common->getData($url);
 		$parsed_json = json_decode($json);
@@ -212,7 +220,9 @@ 
 			$arrivalTime = $parsed_json->{'flights'}[0]->{'dates'}->{'fsta'};
 
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_easyjet');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -223,7 +233,9 @@ 
 	private function getRyanair($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.ryanair.com/fr/api/2/flight-info/0/50/";
 		$post = '{"flight":"'.$numvol.'","minDepartureTime":"00:00","maxDepartureTime":"23:59"}';
 		$headers = array('Content-Type: application/json','Content-Length: ' . strlen($post));
@@ -237,8 +249,12 @@ 
 				$departureTime = $parsed_json->{'flightInfo'}[0]->{'departureTime'};
 				$arrivalTime = $parsed_json->{'flightInfo'}[0]->{'arrivalTime'};
 				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime, 'Source' => 'website_ryanair');
-			} else return array();
-		} else return array();
+			} else {
+				return array();
+			}
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -249,7 +265,9 @@ 
 	private function getSwiss($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.world-of-swiss.com/fr/routenetwork.json";
 		$json = $Common->getData($url);
 		$parsed_json = json_decode($json);
@@ -269,8 +287,12 @@ 
 			}
 			if (isset($DepartureAirportIata) && isset($ArrivalAirportIata)) {
 				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_swiss');
-			} else return array();
-		} else return array();
+			} else {
+				return array();
+			}
+		} else {
+			return array();
+		}
 	}
 	
 	/**
@@ -284,12 +306,18 @@ 
 		$Common = new Common();
 		$check_date = new Datetime($date);
 		$numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign));
-		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array();
-		if ($globalBritishAirwaysKey == '') return array();
+		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) {
+			return array();
+		}
+		if ($globalBritishAirwaysKey == '') {
+			return array();
+		}
 		$url = "https://api.ba.com/rest-v1/v1/flights;flightNumber=".$numvol.";scheduledDepartureDate=".$check_date->format('Y-m-d').".json";
 		$headers = array('Client-Key: '.$globalBritishAirwaysKey);
 		$json = $Common->getData($url,'get','',$headers);
-		if ($json == '') return array();
+		if ($json == '') {
+			return array();
+		}
 		$parsed_json = json_decode($json);
 		$flights = $parsed_json->{'FlightsResponse'};
 		if (count($flights) > 0) {
@@ -298,7 +326,9 @@ 
 			$departureTime = date('H:i',strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledDepartureDateTime'}));
 			$arrivalTime = date('H:i',strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledArrivalDateTime'}));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_britishairways');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -312,19 +342,27 @@ 
 		$Common = new Common();
 		$check_date = new Datetime($date);
 		$numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign));
-		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array();
-		if (!isset($globalLufthansaKey) || $globalLufthansaKey == '' || !isset($globalLufthansaKey['key']) || $globalLufthansaKey['key'] == '') return array();
+		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) {
+			return array();
+		}
+		if (!isset($globalLufthansaKey) || $globalLufthansaKey == '' || !isset($globalLufthansaKey['key']) || $globalLufthansaKey['key'] == '') {
+			return array();
+		}
 		$url = "https://api.lufthansa.com/v1/oauth/token";
 		$post = array('client_id' => $globalLufthansaKey['key'],'client_secret' => $globalLufthansaKey['secret'],'grant_type' => 'client_credentials');
 		$data = $Common->getData($url,'post',$post);
 		$parsed_data = json_decode($data);
-		if (!isset($parsed_data->{'access_token'})) return array();
+		if (!isset($parsed_data->{'access_token'})) {
+			return array();
+		}
 		$token = $parsed_data->{'access_token'};
 		
 		$url = "https://api.lufthansa.com/v1/operations/flightstatus/LH".$numvol."/".$check_date->format('Y-m-d');
 		$headers = array('Authorization: Bearer '.$token,'Accept: application/json');
 		$json = $Common->getData($url,'get','',$headers);
-		if ($json == '') return array();
+		if ($json == '') {
+			return array();
+		}
 		$parsed_json = json_decode($json);
 		if (isset($parsed_json->{'FlightStatusResource'}) && count($parsed_json->{'FlightStatusResource'}) > 0) {
 			$DepartureAirportIata = $parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Departure'}->{'AirportCode'};
@@ -332,7 +370,9 @@ 
 			$ArrivalAirportIata = $parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'AirportCode'};
 			$arrivalTime = date('H:i',strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'ScheduledTimeLocal'}->{'DateTime'}));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_lufthansa');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -346,14 +386,20 @@ 
 		$Common = new Common();
 		$check_date = new Datetime($date);
 		$numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign));
-		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array();
-		if ($globalTransaviaKey == '') return array();
+		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) {
+			return array();
+		}
+		if ($globalTransaviaKey == '') {
+			return array();
+		}
 		$url = "https://tst.api.transavia.com/v1/flightstatus/departuredate/".$check_date->format('Ymd').'/flightnumber/HV'.$numvol;
 		//$url = "https://api.transavia.com/v1/flightstatus/departuredate/".$check_date->format('Ymd').'/flightnumber/HV'.$numvol;
 		$headers = array('apikey: '.$globalTransaviaKey);
 		$json = $Common->getData($url,'get','',$headers);
 		//echo 'result : '.$json;
-		if ($json == '') return array();
+		if ($json == '') {
+			return array();
+		}
 		$parsed_json = json_decode($json);
 		
 		if (isset($parsed_json->{'data'}[0])) {
@@ -362,7 +408,9 @@ 
 			$ArrivalAirportIata = $parsed_json->{'data'}[0]->{'flight'}->{'arrivalAirport'}->{'locationCode'};
 			$arrivalTime = date('H:i',strtotime($parsed_json->{'data'}[0]->{'flight'}->{'arrivalDateTime'}));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_transavia');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -373,7 +421,9 @@ 
 	public function getTunisair($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.tunisair.com/site/publish/module/Volj/fr/Flight_List.asp";
 		$data = $Common->getData($url);
 		$table = $Common->table2array($data);
@@ -394,7 +444,9 @@ 
 		$Common = new Common();
 		$check_date = new Datetime($date);
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$final_date = str_replace('/','%2F',$check_date->format('d/m/Y'));
 		$url = "http://www.vueling.com/Base/BaseProxy/RenderMacro/?macroalias=FlightStatusResult&searchBy=bycode&date=".$final_date."&flightNumber=".$numvol."&idioma=en-GB";
 		$data = $Common->getData($url);
@@ -404,8 +456,11 @@ 
 			$DepartureAirportIata = str_replace('flightOri=','',$result[0]);
 			preg_match('/flightDest=[A-Z]{3}/',$data,$result);
 			$ArrivalAirportIata = str_replace('flightDest=','',$result[0]);
-			if ($DepartureAirportIata != '' && $ArrivalAirportIata != '') return array('DepartureAirportIATA' => $DepartureAirportIata,'ArrivalAirportIATA' => $ArrivalAirportIata,'Source' => 'website_vueling');
-			else return array();
+			if ($DepartureAirportIata != '' && $ArrivalAirportIata != '') {
+				return array('DepartureAirportIATA' => $DepartureAirportIata,'ArrivalAirportIATA' => $ArrivalAirportIata,'Source' => 'website_vueling');
+			} else {
+				return array();
+			}
 		}
 		return array();
 	}
@@ -420,7 +475,9 @@ 
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "https://www.iberia.com/web/flightDetail.do";
 		$post = array('numvuelo' => $numvol,'fecha' => $check_date->format('Ymd'),'airlineID' => 'IB');
 		$data = $Common->getData($url,'post',$post);
@@ -437,7 +494,9 @@ 
 				$arrivalTime = trim(str_replace(' lunes','',str_replace(' ','',$flight[5][1])));
 				if ($arrivalTime == 'Hora estimada de llegada') {
 					$arrivalTime = substr(trim(str_replace(' lunes','',str_replace(' ','',$flight[5][2]))),0,5);
-				} else $arrivalTime = substr($arrivalTime,0,5);
+				} else {
+					$arrivalTime = substr($arrivalTime,0,5);
+				}
 				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_iberia');
 			}
 		}
@@ -455,7 +514,9 @@ 
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.staralliance.com/flifoQueryAction.do?myAirline=&airlineCode=".$carrier."&flightNo=".$numvol."&day=".$check_date->format('d')."&month=".$check_date->format('m')."&year=".$check_date->format('Y')."&departuredate=".$check_date->format('d-M-Y');
 		$data = $Common->getData($url);
 		if ($data != '') {
@@ -471,7 +532,9 @@ 
 					$departureTime = substr(trim(str_replace('Scheduled: ','',$flight[29][0])),0,5);
 					$arrivalTime = substr(trim(str_replace('Scheduled: ','',$flight[29][1])),0,5);
 					return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_staralliance');
-				} else return array();
+				} else {
+					return array();
+				}
 			}
 			
 
@@ -491,7 +554,9 @@ 
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$check_date = new Datetime($date);
 		$url= "http://booking.alitalia.com/FlightStatus/fr_fr/FlightInfo?Brand=az&NumeroVolo=".$numvol."&DataCompleta=".$check_date->format('d/m/Y');
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->text2array($data);
@@ -515,7 +580,9 @@ 
 		$check_date = new Datetime($date);
 		$url= "http://www.brusselsairlines.com/api/flightstatus/getresults?from=NA&to=NA&date=".$check_date->format('d/m/Y')."&hour=NA&lookup=flightnumber&flightnumber=".$numvol."&publicationID=302";
 		//http://www.brusselsairlines.com/fr-fr/informations-pratiques/statut-de-votre-vol/resultat.aspx?flightnumber=".$numvol."&date=".$check_date->format('d/m/Y')."&lookup=flightnumber";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		if ($data != '') {
 		    //echo $data;
@@ -605,7 +672,9 @@ 
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$url= "http://www.flytap.com/France/fr/PlanifierEtReserver/Outils/DepartsEtArrivees";
 		//$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$post = array('arrivalsdepartures_content' => 'number','arrivalsdepartures_tp' => $numvol,'arrivalsdepartures_trk' => 'ARR','arrivalsdepartures_date_trk' => '1','aptCode' => '','arrivalsdepartures' => 'DEP','arrivalsdepartures_date' => '1','aptCodeFrom' => '','aptCodeTo' => '','arrivalsdepartures2' => 'DEP','arrivalsdepartures_date2' => '1');
 		$data = $Common->getData($url,'post',$post);
 		if ($data != '') {
@@ -637,11 +706,15 @@ 
 				$airline_icao = substr($callsign, 0, 3);
 			} 
 		}
-		if ($airline_icao == '') return array();
+		if ($airline_icao == '') {
+			return array();
+		}
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$url= "http://info.flightmapper.net/flight/".$airline_icao.'_'.$numvol;
 		//$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->table2array($data);
@@ -684,7 +757,9 @@ 
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$url= "http://fr.flightaware.com/live/flight/".$callsign;
 		//$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->table2array($data);
@@ -737,11 +812,15 @@ 
 		$check_date = new Datetime($date);
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$url= "http://services.aircanada.com/portal/rest/getFlightsByFlightNumber?forceTimetable=true&flightNumber=".$numvol."&carrierCode=AC&date=".$check_date->format('m-d-Y')."&app_key=AE919FDCC80311DF9BABC975DFD72085&cache=74249";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		$dom = new DomDocument();
 		$dom->loadXML($data);
-		if ($dom->getElementsByTagName('DepartureStationInfo')->length == 0) return array();
+		if ($dom->getElementsByTagName('DepartureStationInfo')->length == 0) {
+			return array();
+		}
 		$departure = $dom->getElementsByTagName('DepartureStationInfo')->item(0);
 		if (isset($departure->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue)) {
 			$DepartureAirportIata = $departure->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue;
@@ -750,7 +829,9 @@ 
 			$ArrivalAirportIata = $arrival->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue;
 			$arrivalTime = date('H:i',strtotime($arrival->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_aircanada');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -764,7 +845,9 @@ 
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$check_date = new Datetime($date);
 		$url= "https://cat.sabresonicweb.com/SSWVN/meridia?posid=VNVN&page=flifoFlightInfoDetailsMessage_learn&action=flightInfoDetails&airline=VN&language=fr&depDay=".$check_date->format('j')."&depMonth=".strtoupper($check_date->format('M'))."&=&flight=".$numvol."&";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->table2array($data);
@@ -793,7 +876,9 @@ 
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$check_date = new Datetime($date);
 		$url= "http://www.airberlin.com/en-US/site/aims.php";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$post = array('type' => 'departure','searchFlightNo' => '1','requestsent' => 'true', 'flightno' => $numvol,'date' => $check_date->format('Y-m-d'),'carrier' => $carrier);
 		$data = $Common->getData($url,'post',$post);
 		//echo $data;
@@ -803,11 +888,19 @@ 
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			$flight = $table;
-			if (isset($flight[5][4])) $departureTime = $flight[5][4];
-			else $departureTime = '';
-			if (isset($flight[5][2])) $departureAirport = $flight[5][2];
-			else $departureAirport = '';
-		} else return array();
+			if (isset($flight[5][4])) {
+				$departureTime = $flight[5][4];
+			} else {
+				$departureTime = '';
+			}
+			if (isset($flight[5][2])) {
+				$departureAirport = $flight[5][2];
+			} else {
+				$departureAirport = '';
+			}
+		} else {
+			return array();
+		}
 		$post = array('type' => 'arrival','searchFlightNo' => '1','requestsent' => 'true', 'flightno' => $numvol,'date' => $check_date->format('Y-m-d'),'carrier' => 'AB');
 		$data = $Common->getData($url,'post',$post);
 		if ($data != '') {
@@ -820,10 +913,14 @@ 
 			    $arrivalTime = '';
 			    $arrivalAirport = '';
 			}
-		} else return array();
+		} else {
+			return array();
+		}
 		$url = 'http://www.airberlin.com/en-US/site/json/suggestAirport.php?searchfor=departures&searchflightid=0&departures%5B%5D=&suggestsource%5B0%5D=activeairports&withcountries=0&withoutroutings=0&promotion%5Bid%5D=&promotion%5Btype%5D=&routesource%5B0%5D=airberlin&routesource%5B1%5D=partner';
 		$json = $Common->getData($url);
-		if ($json == '') return array();
+		if ($json == '') {
+			return array();
+		}
 		$parsed_json = json_decode($json);
 		$airports = $parsed_json->{'suggestList'};
 		if (count($airports) > 0) {
@@ -838,7 +935,9 @@ 
 		}
 		if (isset($DepartureAirportIata)) {
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airberlin');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 
@@ -846,7 +945,9 @@ 
 	public function fetchSchedule($ident,$date = 'NOW') {
 		global $globalSchedulesSources, $globalSchedulesFetch;
 		//$Common = new Common();
-		if (!$globalSchedulesFetch) return array();
+		if (!$globalSchedulesFetch) {
+			return array();
+		}
 		$airline_icao = '';
 		if (!is_numeric(substr($ident, 0, 3)))
 		{
@@ -1074,14 +1175,21 @@ 
 				default:
 					// Randomly use a generic function to get hours
 					if (strlen($airline_icao) == 2) {
-						if (!isset($globalSchedulesSources)) $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
+						if (!isset($globalSchedulesSources)) {
+							$globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
+						}
 						if (count($globalSchedulesSources) > 0) {
 							$rand = mt_rand(0,count($globalSchedulesSources)-1);
 							$source = $globalSchedulesSources[$rand];
-							if ($source == 'flightmapper') return $this->getFlightMapper($ident);
-							elseif ($source == 'costtotravel') return $this->getCostToTravel($ident);
+							if ($source == 'flightmapper') {
+								return $this->getFlightMapper($ident);
+							} elseif ($source == 'costtotravel') {
+								return $this->getCostToTravel($ident);
+							}
 							//elseif ($source == 'flightradar24') return $this->getFlightRadar24($ident,$date);
-							elseif ($source == 'flightaware') return $this->getFlightAware($ident);
+							elseif ($source == 'flightaware') {
+								return $this->getFlightAware($ident);
+							}
 						}
 					}
 			}