Ysurac / FlightAirMap

require/class.TSK.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 	*/
 	public function parse_xml($url) {
 		$Common = new Common();
-		$filedata = $Common->getData($url,'get','','','','','','',true);
+		$filedata = $Common->getData($url, 'get', '', '', '', '', '', '', true);
 		if ($filedata != '' && $filedata !== false) {
 			$xml = simplexml_load_string($filedata);
 			if ($xml !== false) {

require/class.Scheduler.php

Indentation +146 added lines, -146 removed lines

@@ -27,14 +27,14 @@ 
 	}
 
 	/**
-	* 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());
@@ -50,18 +50,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);
@@ -148,15 +148,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 FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND 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 FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND 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);
@@ -169,12 +169,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);
@@ -210,11 +210,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();
@@ -238,10 +238,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);
@@ -264,10 +264,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);
@@ -296,11 +296,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();
@@ -324,11 +324,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();
@@ -358,11 +358,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();
@@ -388,10 +388,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);
@@ -408,10 +408,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);
@@ -433,11 +433,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);
@@ -467,11 +467,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();
@@ -503,11 +503,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);
@@ -526,11 +526,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);
@@ -540,24 +540,24 @@ 
 		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		if ($data != '') {
-		    //echo $data;
-		    $parsed_json = json_decode($data,true);
-		    if (isset($parsed_json[0]['FromAirportCode'])) {
+			//echo $data;
+			$parsed_json = json_decode($data,true);
+			if (isset($parsed_json[0]['FromAirportCode'])) {
 			$DepartureAirportIata = $parsed_json[0]['FromAirportCode'];
 			$ArrivalAirportIata = $parsed_json[0]['ToAirportCode'];
 			$departureTime = date('H:i',strtotime($parsed_json[0]['ScheduledDepatureDate']));
 			$arrivalTime = date('H:i',strtotime($parsed_json[0]['ScheduledArrivalDate']));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_brussels');
-		    }
+			}
 		}
 	}
 
 	/**
-	* 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();
@@ -586,11 +586,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();
@@ -618,10 +618,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);
@@ -644,10 +644,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 = '';
@@ -675,11 +675,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');
 				}
 			}
 		}
@@ -687,10 +687,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) {
 		global $globalFlightAwareUsername, $globalFlightAwarePassword;
 		date_default_timezone_set('UTC');
@@ -715,11 +715,11 @@ 
 				$flight = $result['FlightInfoStatusResult']['flights'][0];
 				if (isset($flight['origin'])) {
 					return array(
-					    'DepartureAirportIATA' => $flight['origin']['alternate_ident'],
-					    'DepartureTime' => $flight['filed_departure_time']['time'],
-					    'ArrivalAirportIATA' => $flight['destination']['alternate_ident'],
-					    'ArrivalTime' => $flight['filed_arrival_time']['time'],
-					    'Source' => 'website_flightaware');
+						'DepartureAirportIATA' => $flight['origin']['alternate_ident'],
+						'DepartureTime' => $flight['filed_departure_time']['time'],
+						'ArrivalAirportIATA' => $flight['destination']['alternate_ident'],
+						'ArrivalTime' => $flight['filed_arrival_time']['time'],
+						'Source' => 'website_flightaware');
 				}
 			}
 		}
@@ -732,21 +732,21 @@ 
 			$flight = reset($flights['flights']);
 			if (isset($flight['activityLog']['flights'][0]['origin'])) {
 				return array(
-				    'DepartureAirportIATA' => $flight['activityLog']['flights'][0]['origin']['iata'],
-				    'DepartureTime' => date('H:i',$flight['activityLog']['flights'][0]['takeoffTimes']['scheduled']),
-				    'ArrivalAirportIATA' => $flight['activityLog']['flights'][0]['destination']['iata'],
-				    'ArrivalTime' => date('H:i',$flight['activityLog']['flights'][0]['landingTimes']['scheduled']),
-				    'Source' => 'website_flightaware');
+					'DepartureAirportIATA' => $flight['activityLog']['flights'][0]['origin']['iata'],
+					'DepartureTime' => date('H:i',$flight['activityLog']['flights'][0]['takeoffTimes']['scheduled']),
+					'ArrivalAirportIATA' => $flight['activityLog']['flights'][0]['destination']['iata'],
+					'ArrivalTime' => date('H:i',$flight['activityLog']['flights'][0]['landingTimes']['scheduled']),
+					'Source' => 'website_flightaware');
 			}
 		}
 		return array();
 	}
 
 	/**
-	* 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;
@@ -769,11 +769,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();
 		if (class_exists("DomDocument") === FALSE) return array();
@@ -798,11 +798,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);
@@ -824,12 +824,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');
@@ -858,11 +858,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';

Spacing +168 added lines, -168 removed lines

@@ -35,9 +35,9 @@ 
 	* @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') {
+	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";
@@ -45,69 +45,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();
 			}
 		}
@@ -120,10 +120,10 @@ 
 	*/
 	public function getSchedule($ident) {
 		$Translation = new Translation($this->db);
-		$operator = $Translation->checkTranslation($ident,false);
+		$operator = $Translation->checkTranslation($ident, false);
 		if ($ident != $operator) {
 			$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :operator OR CallSign = :ident LIMIT 1";
-			$query_values = array(':ident' => $ident,'operator' => $operator);
+			$query_values = array(':ident' => $ident, 'operator' => $operator);
 		} else {
 			$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident LIMIT 1";
 			$query_values = array(':ident' => $ident);
@@ -131,7 +131,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);
@@ -160,7 +160,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);
@@ -175,16 +175,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'};
@@ -194,9 +194,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];
 
 			/*
@@ -205,7 +205,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();
 	}
 
@@ -220,8 +220,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);
@@ -233,7 +233,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();
 	}
 
@@ -244,12 +244,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'};
@@ -258,7 +258,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();
 	}
@@ -270,8 +270,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);
@@ -285,12 +285,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();
 	}
@@ -305,21 +305,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();
 	}
 
@@ -333,27 +333,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();
 	}
 
@@ -367,23 +367,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();
 	}
 
@@ -394,14 +394,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();
@@ -412,21 +412,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();
@@ -440,27 +440,27 @@ 
 	*/
 	public function getIberia($callsign, $date = 'NOW') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
 		$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$url = "https://www.iberia.com/web/flightDetail.do";
-		$post = array('numvuelo' => $numvol,'fecha' => $check_date->format('Ymd'),'airlineID' => 'IB');
-		$data = $Common->getData($url,'post',$post);
+		$post = array('numvuelo' => $numvol, 'fecha' => $check_date->format('Ymd'), 'airlineID' => 'IB');
+		$data = $Common->getData($url, 'post', $post);
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			//print_r($table);
 			if (count($table) > 0) {
 				$flight = $table;
-				preg_match('/([A-Z]{3})/',$flight[3][0],$DepartureAirportIataMatch);
-				preg_match('/([A-Z]{3})/',$flight[5][0],$ArrivalAirportIataMatch);
+				preg_match('/([A-Z]{3})/', $flight[3][0], $DepartureAirportIataMatch);
+				preg_match('/([A-Z]{3})/', $flight[5][0], $ArrivalAirportIataMatch);
 				$DepartureAirportIata = $DepartureAirportIataMatch[0];
 				$ArrivalAirportIata = $ArrivalAirportIataMatch[0];
-				$departureTime = substr(trim(str_replace(' lunes','',str_replace('&nbsp;','',$flight[3][2]))),0,5);
-				$arrivalTime = trim(str_replace(' lunes','',str_replace('&nbsp;','',$flight[5][1])));
+				$departureTime = substr(trim(str_replace(' lunes', '', str_replace('&nbsp;', '', $flight[3][2]))), 0, 5);
+				$arrivalTime = trim(str_replace(' lunes', '', str_replace('&nbsp;', '', $flight[5][1])));
 				if ($arrivalTime == 'Hora estimada de llegada') {
-					$arrivalTime = substr(trim(str_replace(' lunes','',str_replace('&nbsp;','',$flight[5][2]))),0,5);
-				} else $arrivalTime = substr($arrivalTime,0,5);
-				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_iberia');
+					$arrivalTime = substr(trim(str_replace(' lunes', '', str_replace('&nbsp;', '', $flight[5][2]))), 0, 5);
+				} else $arrivalTime = substr($arrivalTime, 0, 5);
+				return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_iberia');
 			}
 		}
 		return array();
@@ -473,11 +473,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 != '') {
@@ -486,13 +486,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();
 			}
 			
@@ -510,10 +510,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);
@@ -521,7 +521,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');
 		}
 	}
 
@@ -533,21 +533,21 @@ 
 	*/
 	private function getBrussels($callsign, $date = 'NOW') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
 		$check_date = new Datetime($date);
-		$url= "http://www.brusselsairlines.com/api/flightstatus/getresults?from=NA&to=NA&date=".$check_date->format('d/m/Y')."&hour=NA&lookup=flightnumber&flightnumber=".$numvol."&publicationID=302";
+		$url = "http://www.brusselsairlines.com/api/flightstatus/getresults?from=NA&to=NA&date=".$check_date->format('d/m/Y')."&hour=NA&lookup=flightnumber&flightnumber=".$numvol."&publicationID=302";
 		//http://www.brusselsairlines.com/fr-fr/informations-pratiques/statut-de-votre-vol/resultat.aspx?flightnumber=".$numvol."&date=".$check_date->format('d/m/Y')."&lookup=flightnumber";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		if ($data != '') {
 		    //echo $data;
-		    $parsed_json = json_decode($data,true);
+		    $parsed_json = json_decode($data, true);
 		    if (isset($parsed_json[0]['FromAirportCode'])) {
 			$DepartureAirportIata = $parsed_json[0]['FromAirportCode'];
 			$ArrivalAirportIata = $parsed_json[0]['ToAirportCode'];
-			$departureTime = date('H:i',strtotime($parsed_json[0]['ScheduledDepatureDate']));
-			$arrivalTime = date('H:i',strtotime($parsed_json[0]['ScheduledArrivalDate']));
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_brussels');
+			$departureTime = date('H:i', strtotime($parsed_json[0]['ScheduledDepatureDate']));
+			$arrivalTime = date('H:i', strtotime($parsed_json[0]['ScheduledArrivalDate']));
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_brussels');
 		    }
 		}
 	}
@@ -624,21 +624,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();
 	}
@@ -660,10 +660,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);
@@ -673,13 +673,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');
 				}
 			}
 		}
@@ -711,7 +711,7 @@ 
 			$url = 'http://'.$globalFlightAwareUsername.':'.$globalFlightAwarePassword.'@flightxml.flightaware.com/json/FlightXML3/FlightInfoStatus?ident='.$callsign;
 			$data = $Common->getData($url);
 			if ($data != '') {
-				$result = json_decode($data,true);
+				$result = json_decode($data, true);
 				$flight = $result['FlightInfoStatusResult']['flights'][0];
 				if (isset($flight['origin'])) {
 					return array(
@@ -724,18 +724,18 @@ 
 			}
 		}
 		
-		$url= "http://flightaware.com/live/flight/".$callsign;
+		$url = "http://flightaware.com/live/flight/".$callsign;
 		$data = $Common->getData($url);
 		if ($data != '') {
-			preg_match(':<script>var trackpollBootstrap = (.*?);</script>:',$data,$result);
-			$flights = json_decode($result[1],true);
+			preg_match(':<script>var trackpollBootstrap = (.*?);</script>:', $data, $result);
+			$flights = json_decode($result[1], true);
 			$flight = reset($flights['flights']);
 			if (isset($flight['activityLog']['flights'][0]['origin'])) {
 				return array(
 				    'DepartureAirportIATA' => $flight['activityLog']['flights'][0]['origin']['iata'],
-				    'DepartureTime' => date('H:i',$flight['activityLog']['flights'][0]['takeoffTimes']['scheduled']),
+				    'DepartureTime' => date('H:i', $flight['activityLog']['flights'][0]['takeoffTimes']['scheduled']),
 				    'ArrivalAirportIATA' => $flight['activityLog']['flights'][0]['destination']['iata'],
-				    'ArrivalTime' => date('H:i',$flight['activityLog']['flights'][0]['landingTimes']['scheduled']),
+				    'ArrivalTime' => date('H:i', $flight['activityLog']['flights'][0]['landingTimes']['scheduled']),
 				    'Source' => 'website_flightaware');
 			}
 		}
@@ -749,20 +749,20 @@ 
 	*/
 	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);
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			if (isset($table[11][1])) {
-				if (is_numeric(substr($table[11][1],0,1))) $departureTime = substr($table[11][1],0,5);
+				if (is_numeric(substr($table[11][1], 0, 1))) $departureTime = substr($table[11][1], 0, 5);
 				else $departureTime = '';
-				if (is_numeric(substr($table[17][1],0,1))) $arrivalTime = substr($table[17][1],0,5);
+				if (is_numeric(substr($table[17][1], 0, 1))) $arrivalTime = substr($table[17][1], 0, 5);
 				else $arrivalTime = '';
-				$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');
+				$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();
@@ -774,14 +774,14 @@ 
 	* @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();
 		if (class_exists("DomDocument") === FALSE) return array();
 		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);
@@ -789,11 +789,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();
 	}
 
@@ -805,21 +805,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');
 		}
 	}
 
@@ -830,16 +830,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 = '';
@@ -852,8 +852,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;
@@ -881,7 +881,7 @@ 
 			}
 		}
 		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();
 	}
 
@@ -891,7 +891,7 @@ 
 	 * @param String $date Date
 	 * @return Array Schedules info
 	*/
-	public function fetchSchedule($ident,$date = 'NOW') {
+	public function fetchSchedule($ident, $date = 'NOW') {
 		global $globalSchedulesSources, $globalSchedulesFetch, $globalOffline;
 		//$Common = new Common();
 		if ($globalSchedulesFetch === FALSE || (isset($globalOffline) && $globalOffline === TRUE)) return array();
@@ -961,7 +961,7 @@ 
 				// Brussels Airlines
 				case "BEL":
 				case "SN":
-					return $this->getBrussels($ident,$date);
+					return $this->getBrussels($ident, $date);
 /*
 				// Copa Airlines
 				case "CMP":
@@ -1046,17 +1046,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":
@@ -1106,25 +1106,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 +177 added lines, -61 removed lines

@@ -23,7 +23,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection.');
+		if ($this->db === null) {
+			die('Error: No DB connection.');
+		}
 	}
 
 	/**
@@ -138,7 +140,9 @@ 
 		$sth->closeCursor();
 		if (count($row) > 0) {
 			return $row;
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/*
@@ -179,7 +183,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);
 	
@@ -206,7 +212,9 @@ 
 			*/
 		
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airfrance');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -221,7 +229,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);
@@ -234,7 +244,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();
+		}
 	}
 
 	/**
@@ -245,7 +257,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));
@@ -259,8 +273,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();
+		}
 	}
 
 	/**
@@ -271,7 +289,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);
@@ -291,8 +311,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();
+		}
 	}
 	
 	/**
@@ -306,12 +330,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) {
@@ -320,7 +350,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();
+		}
 	}
 
 	/**
@@ -334,19 +366,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'};
@@ -354,7 +394,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();
+		}
 	}
 
 	/**
@@ -368,14 +410,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])) {
@@ -384,7 +432,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();
+		}
 	}
 
 	/**
@@ -395,7 +445,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);
@@ -416,7 +468,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);
@@ -426,8 +480,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();
 	}
@@ -442,7 +499,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);
@@ -459,7 +518,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');
 			}
 		}
@@ -477,7 +538,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 != '') {
@@ -493,7 +556,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();
+				}
 			}
 			
 
@@ -513,7 +578,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);
@@ -537,7 +604,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;
@@ -627,7 +696,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 != '') {
@@ -659,11 +730,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);
@@ -756,10 +831,16 @@ 
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			if (isset($table[11][1])) {
-				if (is_numeric(substr($table[11][1],0,1))) $departureTime = substr($table[11][1],0,5);
-				else $departureTime = '';
-				if (is_numeric(substr($table[17][1],0,1))) $arrivalTime = substr($table[17][1],0,5);
-				else $arrivalTime = '';
+				if (is_numeric(substr($table[11][1],0,1))) {
+					$departureTime = substr($table[11][1],0,5);
+				} else {
+					$departureTime = '';
+				}
+				if (is_numeric(substr($table[17][1],0,1))) {
+					$arrivalTime = substr($table[17][1],0,5);
+				} else {
+					$arrivalTime = '';
+				}
 				$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');
@@ -776,16 +857,22 @@ 
 	*/
 	private function getAirCanada($callsign,$date = 'NOW') {
 		$Common = new Common();
-		if (class_exists("DomDocument") === FALSE) return array();
+		if (class_exists("DomDocument") === FALSE) {
+			return array();
+		}
 		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();
+		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;
@@ -794,7 +881,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();
+		}
 	}
 
 	/**
@@ -808,7 +897,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);
@@ -837,7 +928,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;
@@ -847,11 +940,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 != '') {
@@ -864,10 +965,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) {
@@ -882,7 +987,9 @@ 
 		}
 		if (isset($DepartureAirportIata)) {
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airberlin');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/*
@@ -894,7 +1001,9 @@ 
 	public function fetchSchedule($ident,$date = 'NOW') {
 		global $globalSchedulesSources, $globalSchedulesFetch, $globalOffline;
 		//$Common = new Common();
-		if ($globalSchedulesFetch === FALSE || (isset($globalOffline) && $globalOffline === TRUE)) return array();
+		if ($globalSchedulesFetch === FALSE || (isset($globalOffline) && $globalOffline === TRUE)) {
+			return array();
+		}
 		$airline_icao = '';
 		if (!is_numeric(substr($ident, 0, 3)))
 		{
@@ -1122,14 +1231,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);
+							}
 						}
 					}
 			}

header.php

Indentation +82 added lines, -82 removed lines

@@ -38,7 +38,7 @@ 
 // When button "Remove all filters" is clicked
 if (isset($_POST['removefilters'])) {
 	$allfilters = array_filter(array_keys($_COOKIE),function($key) {
-	    return strpos($key,'filter_') === 0;
+		return strpos($key,'filter_') === 0;
 	});
 	foreach ($allfilters as $filt) {
 		unset($_COOKIE[$filt]);
@@ -188,17 +188,17 @@ 
 	}
 ?>
 <?php 
-    if (isset($_POST['archive'])) {
+	if (isset($_POST['archive'])) {
 ?>
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
 <?php 
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 
 <script src="<?php print $globalURL; ?>/js/map.js.php?<?php print time(); ?>&archive&begindate=<?php print strtotime($_POST['start_date']); ?>&enddate=<?php print strtotime($_POST['end_date']); ?>&archivespeed=<?php print $_POST['archivespeed']; ?>"></script>
 <?php    
-	    }
-    } else {
+		}
+	} else {
 ?>
 <?php
 /*	if (isset($globalBeta) && $globalBeta) {
@@ -210,7 +210,7 @@ 
 */
 ?>
 <?php 
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 <?php
 //		if (isset($globalBeta) && $globalBeta) {
@@ -241,13 +241,13 @@ 
 <script src="<?php print $globalURL; ?>/js/map-satellite.2d.js.php?<?php print time(); ?>"></script>
 <?php
 		}
-	    }
+		}
 ?>
 <?php
 //	}
 ?>
 <?php
-    }
+	}
 }
 ?>
 <?php
@@ -424,34 +424,34 @@ 
 
       <ul class="nav navbar-nav">
 <?php
-    if (isset($globalNewsFeeds['global']) && !empty($globalNewsFeeds['global'])) {
+	if (isset($globalNewsFeeds['global']) && !empty($globalNewsFeeds['global'])) {
 ?>
     <li><a href="<?php print $globalURL; ?>/news"><?php echo _("News"); ?></a></li>
 <?php
-    }
+	}
 ?>
 
 <?php 
-    $sub = false;
-    if (
+	$sub = false;
+	if (
 	(
-	    (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
+		(!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
 	) || 
 	(
-	    isset($globalMarine) && $globalMarine === TRUE && ((isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
+		isset($globalMarine) && $globalMarine === TRUE && ((isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
 	) || 
 	(
-	    isset($globalTracker) && $globalTracker === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
+		isset($globalTracker) && $globalTracker === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
 	) || 
 	(
-	    isset($globalSatellite) && $globalSatellite === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE))
+		isset($globalSatellite) && $globalSatellite === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE))
 	)
-    ) {
+	) {
 	$sub = true;
-    }
+	}
 ?>
 <?php
-    if (!isset($globalAircraft) || $globalAircraft === TRUE) {
+	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
 ?>
     <li class="dropdown">
 <?php
@@ -462,7 +462,7 @@ 
 	<ul class="dropdown-menu multi-level">
       	<li class="dropdown-submenu">
 <?php
-        }
+		}
 ?>
 <?php
 	if (isset($globalNewsFeeds['aircraft']) && !empty($globalNewsFeeds['aircraft'])) {
@@ -477,25 +477,25 @@ 
           <ul class="dropdown-menu">
           	<li><a href="<?php print $globalURL; ?>/aircraft"><?php echo _("Aircrafts Types"); ?></a></li>
 <?php
-    if (!isset($globalNoAirlines) || $globalNoAirlines === FALSE) {
+	if (!isset($globalNoAirlines) || $globalNoAirlines === FALSE) {
 ?>
 			<li><a href="<?php print $globalURL; ?>/airline"><?php echo _("Airlines"); ?></a></li>
 <?php
-    }
+	}
 ?>
 			<li><a href="<?php print $globalURL; ?>/airport"><?php echo _("Airports"); ?></a></li>
 <?php
-    if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) {
+	if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) {
 ?>
 			<li><a href="<?php print $globalURL; ?>/owner"><?php echo _("Owners"); ?></a></li>
 <?php
-    } 
-    if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
+	} 
+	if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
 
 ?>
 			<li><a href="<?php print $globalURL; ?>/pilot"><?php echo _("Pilots"); ?></a></li>
 <?php
-    }
+	}
 ?>
 			<li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/currently"><?php echo _("Current Activity"); ?></a></li>
@@ -503,43 +503,43 @@ 
             <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li>
             <?php
-        	if ($globalACARS) {
-        	    if (isset($globalDemo) && $globalDemo) {
-    	    ?>
+			if ($globalACARS) {
+				if (isset($globalDemo) && $globalDemo) {
+			?>
             <li><hr /></li>
             <li><i><?php echo _('ACARS data not available publicly'); ?></i></li>
             <li><a href=""><?php echo _('Latest ACARS messages'); ?></a></li>
             <li><a href=""><?php echo _('Archive ACARS messages'); ?></a></li>
             <?php
-        	    } else {
-    	    ?>
+				} else {
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li>
             <?php
-        	    }
-        	}
-    	    ?>
+				}
+			}
+			?>
     	    <?php
-    	        if (isset($globalAccidents) && $globalAccidents) {
-    	    ?>
+				if (isset($globalAccidents) && $globalAccidents) {
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/accident-latest"><?php echo _("Latest accident"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/accident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Accident"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/incident-latest"><?php echo _("Latest incident"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/incident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Incident"); ?></a></li>
             <?php
-        	}
-    	    ?>
+			}
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li>
             <?php
 		if (!isset($globalNoUpcoming) || $globalNoUpcoming === FALSE) {
-	    ?>
+		?>
             <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li>
 	    <?php
 		}
-	    ?>
+		?>
           </ul>
         </li>
       	<li><a href="<?php print $globalURL; ?>/search"><?php echo _("Search"); ?></a></li>
@@ -566,14 +566,14 @@ 
     </ul>
 <?php
 	}
-    }
+	}
 ?>
 <?php
-    if (isset($globalMarine) && $globalMarine) {
+	if (isset($globalMarine) && $globalMarine) {
 ?>
     <li class="dropdown">
 <?php
-        if ($sub) {
+		if ($sub) {
 ?>
     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Marines"); ?> <b class="caret"></b></a>
 	<ul class="dropdown-menu multi-level">
@@ -607,14 +607,14 @@ 
 	}
 ?>
 <?php
-    }
+	}
 ?>
 <?php
-    if (isset($globalTracker) && $globalTracker) {
+	if (isset($globalTracker) && $globalTracker) {
 ?>
     <li class="dropdown">
 <?php
-        if ($sub) {
+		if ($sub) {
 ?>
     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Trackers"); ?> <b class="caret"></b></a>
 	<ul class="dropdown-menu multi-level">
@@ -648,14 +648,14 @@ 
 	}
 ?>
 <?php
-    }
+	}
 ?>
 <?php
-    if (isset($globalSatellite) && $globalSatellite) {
+	if (isset($globalSatellite) && $globalSatellite) {
 ?>
     <li class="dropdown">
 <?php
-        if ($sub) {
+		if ($sub) {
 ?>
     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Satellites"); ?> <b class="caret"></b></a>
 	<ul class="dropdown-menu multi-level">
@@ -691,7 +691,7 @@ 
 	}
 ?>
 <?php
-    }
+	}
 ?>
 
         <li class="dropdown">
@@ -700,12 +700,12 @@ 
           	<li><a href="<?php print $globalURL; ?>/about"><?php echo _("About The Project"); ?></a></li>
           	<li><a href="<?php print $globalURL; ?>/about/export"><?php echo _("Exporting Data"); ?></a></li>
 <?php
-    if (!isset($globalAircraft) || $globalAircraft === TRUE) {
+	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
 ?>
 		<li><hr /></li>
 		<li><a href="<?php print $globalURL; ?>/about/tv"><?php echo _("Spotter TV"); ?></a></li>
 <?php
-    }
+	}
 ?>
 	    <?php if (isset($globalContribute) && $globalContribute) { ?>
                 <li><hr /></li>
@@ -726,14 +726,14 @@ 
   	    <form>
   		<select class="selectpicker" data-width="120px" onchange="language(this);">
   		    <?php
-  		        $Language = new Language();
-  		        $alllang = $Language->getLanguages();
-  		        foreach ($alllang as $key => $lang) {
-  		            print '<option value="'.$key.'"';
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
-  		            print '>'.$lang[0].'</option>';
-  		        }
-  		    ?>
+  				$Language = new Language();
+  				$alllang = $Language->getLanguages();
+  				foreach ($alllang as $key => $lang) {
+  					print '<option value="'.$key.'"';
+  					if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
+  					print '>'.$lang[0].'</option>';
+  				}
+  			?>
   		</select>
   	    </form>
   	</div>
@@ -765,18 +765,18 @@ 
 ?>
     <div class="top-header clear" role="main">
 <?php
-    if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
+	if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
 ?>
     <div id="archive-map"></div>
 <?php
-    }
+	}
 ?>
     </div>
 <?php
 }
 if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false))
 {
-    ?>
+	?>
     <div class="top-header clear" role="main">
         <div id="map"></div>
 	<link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" />
@@ -787,15 +787,15 @@ 
         var zoom = 13;
 //create the map
 <?php
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
+	if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
 <?php
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
+	} elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
     var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map);
@@ -803,22 +803,22 @@ 
     var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
     var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude']) && isset($spotter_array[0]['latitude'])) {
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude']) && isset($spotter_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
 <?php
-    } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
+	} elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    }
+	}
 ?>
   //initialize the layer group for the aircrft markers
   var layer_data = L.layerGroup();
 
   //a few title layers
 <?php
-    if ($globalMapProvider == 'Mapbox') {
+	if ($globalMapProvider == 'Mapbox') {
 ?>
   L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
     maxZoom: 18,
@@ -829,14 +829,14 @@ 
     token : '<?php print $globalMapboxToken; ?>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'Mapbox-GL') {
+	} elseif ($globalMapProvider == 'Mapbox-GL') {
 ?>
     L.mapboxGL({
 	accessToken: '<?php print $globalMapboxToken; ?>',
 	style: 'mapbox://styles/mapbox/bright-v8'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'MapQuest-OSM') {
+	} elseif ($globalMapProvider == 'MapQuest-OSM') {
 ?>
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -845,7 +845,7 @@ 
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'MapQuest-Aerial') {
+	} elseif ($globalMapProvider == 'MapQuest-Aerial') {
 ?>
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -854,27 +854,27 @@ 
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>, Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency"'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'Google-Roadmap') {
+	} elseif ($globalMapProvider == 'Google-Roadmap') {
 ?>
     var googleLayer = new L.Google('ROADMAP');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Satellite') {
+	} elseif ($globalMapProvider == 'Google-Satellite') {
 ?>
     var googleLayer = new L.Google('SATELLITE');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Hybrid') {
+	} elseif ($globalMapProvider == 'Google-Hybrid') {
 ?>
     var googleLayer = new L.Google('HYBRID');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Terrain') {
+	} elseif ($globalMapProvider == 'Google-Terrain') {
 ?>
     var googleLayer = new L.Google('Terrain');
     map.addLayer(googleLayer);
 <?php
-    } elseif (isset($globalMapCustomLayer[$globalMapProvider])) {
+	} elseif (isset($globalMapCustomLayer[$globalMapProvider])) {
 	$customid = $globalMapProvider;
 ?>
     L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', {
@@ -884,7 +884,7 @@ 
         attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
     }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'offline' || (isset($globalMapOffline) && $globalMapOffline === TRUE)) {
+	} elseif ($globalMapProvider == 'offline' || (isset($globalMapOffline) && $globalMapOffline === TRUE)) {
 ?>
     var center = map.getCenter();
     map.options.crs = L.CRS.EPSG4326;
@@ -899,8 +899,8 @@ 
         attribution: 'Natural Earth'
     }).addTo(map);
 <?php
-    //} elseif ($globalMapProvider == 'OpenStreetMap') {
-    } else {
+	//} elseif ($globalMapProvider == 'OpenStreetMap') {
+	} else {
 ?>
   L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -909,7 +909,7 @@ 
   }).addTo(map);
 
 <?php
-    }
+	}
 ?>
         </script>
     </div>

Spacing +24 added lines, -24 removed lines

@@ -14,35 +14,35 @@ 
 if (isset($globalMapOffline) && $globalMapOffline) $MapType = 'offline';
 
 if (isset($_GET['3d'])) {
-	setcookie('MapFormat','3d');
+	setcookie('MapFormat', '3d');
 } else if (isset($_GET['2d'])) {
-	setcookie('MapFormat','2d');
+	setcookie('MapFormat', '2d');
 }
 
 if (isset($globalTSK) && $globalTSK && isset($_GET['tsk'])) {
-	$tsk = filter_input(INPUT_GET,'tsk',FILTER_SANITIZE_URL);
+	$tsk = filter_input(INPUT_GET, 'tsk', FILTER_SANITIZE_URL);
 }
 
 if (isset($_POST['archive'])) {
-	setcookie('archive','true');
-	setcookie('archive_begin',strtotime($_POST['start_date']));
-	setcookie('archive_end',strtotime($_POST['end_date']));
-	setcookie('archive_speed',$_POST['archivespeed']);
+	setcookie('archive', 'true');
+	setcookie('archive_begin', strtotime($_POST['start_date']));
+	setcookie('archive_end', strtotime($_POST['end_date']));
+	setcookie('archive_speed', $_POST['archivespeed']);
 }
 if (isset($_POST['noarchive'])) {
-	setcookie('archive','false',-1);
-	setcookie('archive_begin','',-1);
-	setcookie('archive_end','',-1);
-	setcookie('archive_speed','',-1);
+	setcookie('archive', 'false', -1);
+	setcookie('archive_begin', '', -1);
+	setcookie('archive_end', '', -1);
+	setcookie('archive_speed', '', -1);
 }
 // When button "Remove all filters" is clicked
 if (isset($_POST['removefilters'])) {
-	$allfilters = array_filter(array_keys($_COOKIE),function($key) {
-	    return strpos($key,'filter_') === 0;
+	$allfilters = array_filter(array_keys($_COOKIE), function($key) {
+	    return strpos($key, 'filter_') === 0;
 	});
 	foreach ($allfilters as $filt) {
 		unset($_COOKIE[$filt]);
-		setcookie($filt,null,-1);
+		setcookie($filt, null, -1);
 	}
 }
 ?>
@@ -264,7 +264,7 @@ 
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if (isset($latitude)) print '&latitude='.$latitude; ?><?php if (isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
 <?php
 		if (!isset($type) || $type == 'aircraft') {
 ?>
@@ -337,7 +337,7 @@ 
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if (isset($latitude)) print '&latitude='.$latitude; ?><?php if (isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
 <script src="<?php print $globalURL; ?>/js/map-aircraft.2d.js.php?flightaware_id=<?php print $flightaware_id; ?>&<?php print time(); ?>"></script>
 <?php
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
@@ -742,8 +742,8 @@ 
 ?>
       <div class="search">
 	<form action="<?php print $globalURL; ?>/search" method="get">
-		<!--<input type="text" name="q" value="<?php if (isset($GET['q'])) { if ($_GET['q'] != ""){ print $_GET['q']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>-->
-		<input type="text" name="callsign" value="<?php if (isset($GET['callsign'])) { if ($_GET['callsign'] != ""){ print $_GET['callsign']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>
+		<!--<input type="text" name="q" value="<?php if (isset($GET['q'])) { if ($_GET['q'] != "") { print $_GET['q']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>-->
+		<input type="text" name="callsign" value="<?php if (isset($GET['callsign'])) { if ($_GET['callsign'] != "") { print $_GET['callsign']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>
 	</form>
 	</div>
   	<div class="social">
@@ -761,7 +761,7 @@ 
 	print '</div>';
 }
 
-if (strtolower($current_page) =='ident-detailed' || strtolower($current_page) == 'flightid-overview') {
+if (strtolower($current_page) == 'ident-detailed' || strtolower($current_page) == 'flightid-overview') {
 ?>
     <div class="top-header clear" role="main">
 <?php
@@ -774,7 +774,7 @@ 
     </div>
 <?php
 }
-if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false))
+if ((strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) || (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false))
 {
     ?>
     <div class="top-header clear" role="main">
@@ -787,15 +787,15 @@ 
         var zoom = 13;
 //create the map
 <?php
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
+    if (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($airport_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
 <?php
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
+    } elseif (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
+    } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
     var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map);
@@ -803,7 +803,7 @@ 
     var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
     var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude']) && isset($spotter_array[0]['latitude'])) {
+    } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude']) && isset($spotter_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
 <?php

Braces +90 added lines, -20 removed lines

@@ -6,12 +6,19 @@ 
 //gets the page file and stores it in a variable
 $file_path = pathinfo($_SERVER['SCRIPT_NAME']);
 $current_page = $file_path['filename'];
-if ($globalTimezone == '') $globalTimezone = 'UTC';
+if ($globalTimezone == '') {
+	$globalTimezone = 'UTC';
+}
 date_default_timezone_set($globalTimezone);
-if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') $MapType = $_COOKIE['MapType'];
-else $MapType = $globalMapProvider;
+if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') {
+	$MapType = $_COOKIE['MapType'];
+} else {
+	$MapType = $globalMapProvider;
+}
 
-if (isset($globalMapOffline) && $globalMapOffline) $MapType = 'offline';
+if (isset($globalMapOffline) && $globalMapOffline) {
+	$MapType = 'offline';
+}
 
 if (isset($_GET['3d'])) {
 	setcookie('MapFormat','3d');
@@ -219,7 +226,10 @@ 
 <?php
 //		}
 ?>
-<script src="<?php print $globalURL; ?>/js/map.2d.js.php?<?php print time(); ?><?php if (isset($tsk)) print '&tsk='.$tsk; ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.2d.js.php?<?php print time(); ?><?php if (isset($tsk)) {
+	print '&tsk='.$tsk;
+}
+?>"></script>
 <?php
 		if (!isset($globalAircraft) || $globalAircraft) {
 ?>
@@ -264,7 +274,13 @@ 
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) {
+	print '&latitude='.$latitude;
+}
+?><?php if(isset($longitude)) {
+	print '&longitude='.$longitude;
+}
+?>&<?php print time(); ?>"></script>
 <?php
 		if (!isset($type) || $type == 'aircraft') {
 ?>
@@ -337,7 +353,13 @@ 
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) {
+	print '&latitude='.$latitude;
+}
+?><?php if(isset($longitude)) {
+	print '&longitude='.$longitude;
+}
+?>&<?php print time(); ?>"></script>
 <script src="<?php print $globalURL; ?>/js/map-aircraft.2d.js.php?flightaware_id=<?php print $flightaware_id; ?>&<?php print time(); ?>"></script>
 <?php
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
@@ -418,7 +440,12 @@ 
         <span class="icon-bar"></span>
       </button>
       <a href="<?php print $globalURL; ?>/search" class="navbar-toggle search"><i class="fa fa-search"></i></a>
-      <a class="navbar-brand" href="<?php if ($globalURL == '') print '/'; else print $globalURL; ?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
+      <a class="navbar-brand" href="<?php if ($globalURL == '') {
+	print '/';
+} else {
+	print $globalURL;
+}
+?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
     </div>
     <div class="collapse navbar-collapse">
 
@@ -473,7 +500,10 @@ 
 	}
 ?>
 
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
+	echo 'right-';
+}
+?>caret"></b></a>
           <ul class="dropdown-menu">
           	<li><a href="<?php print $globalURL; ?>/aircraft"><?php echo _("Aircrafts Types"); ?></a></li>
 <?php
@@ -544,8 +574,14 @@ 
         </li>
       	<li><a href="<?php print $globalURL; ?>/search"><?php echo _("Search"); ?></a></li>
       	<li><a href="<?php print $globalURL; ?>/statistics"><?php echo _("Statistics"); ?></a></li>
-        <li class="dropdown<?php if ($sub) echo '-submenu'; ?>">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Tools"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
+        <li class="dropdown<?php if ($sub) {
+	echo '-submenu';
+}
+?>">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Tools"); ?> <b class="<?php if ($sub) {
+	echo 'right-';
+}
+?>caret"></b></a>
           <ul class="dropdown-menu">
           	<li><a href="<?php print $globalURL; ?>/tools/acars"><?php echo _("ACARS translator"); ?></a></li>
           	<li><a href="<?php print $globalURL; ?>/tools/metar"><?php echo _("METAR translator"); ?></a></li>
@@ -589,7 +625,10 @@ 
 <?php
 	}
 ?>
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
+	echo 'right-';
+}
+?>caret"></b></a>
 		<ul class="dropdown-menu">
 		    <li><a href="<?php print $globalURL; ?>/marine/currently"><?php echo _("Current Activity"); ?></a></li>
 		    <li><a href="<?php print $globalURL; ?>/marine/latest"><?php echo _("Latest Activity"); ?></a></li>
@@ -630,7 +669,10 @@ 
 <?php
 	}
 ?>
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
+	echo 'right-';
+}
+?>caret"></b></a>
 		<ul class="dropdown-menu">
 		    <li><a href="<?php print $globalURL; ?>/tracker/currently"><?php echo _("Current Activity"); ?></a></li>
 		    <li><a href="<?php print $globalURL; ?>/tracker/latest"><?php echo _("Latest Activity"); ?></a></li>
@@ -673,7 +715,10 @@ 
 ?>
 
 <!--
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
+	echo 'right-';
+}
+?>caret"></b></a>
 		<ul class="dropdown-menu">
 		    <li><a href="<?php print $globalURL; ?>/satellite/currently"><?php echo _("Current Activity"); ?></a></li>
 		    <li><a href="<?php print $globalURL; ?>/satellite/latest"><?php echo _("Latest Activity"); ?></a></li>
@@ -730,7 +775,9 @@ 
   		        $alllang = $Language->getLanguages();
   		        foreach ($alllang as $key => $lang) {
   		            print '<option value="'.$key.'"';
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
+  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) {
+  		            	print ' selected ';
+  		            }
   		            print '>'.$lang[0].'</option>';
   		        }
   		    ?>
@@ -878,9 +925,24 @@ 
 	$customid = $globalMapProvider;
 ?>
     L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', {
-        maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '18'; ?>,
-        minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>,
-        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+        maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) {
+	print $globalMapCustomLayer[$customid]['maxZoom'];
+} else {
+	print '18';
+}
+?>,
+        minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) {
+	print $globalMapCustomLayer[$customid]['minZoom'];
+} else {
+	print '0';
+}
+?>,
+        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
         attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
     }).addTo(map);
 <?php
@@ -895,7 +957,12 @@ 
         maxZoom: 5,
         tms : true,
         zindex : 3,
-        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
         attribution: 'Natural Earth'
     }).addTo(map);
 <?php
@@ -918,4 +985,7 @@ 
 
 ?>
 
-<section class="container main-content <?php if (strtolower($current_page) == 'index') print 'index '; ?>clear">
+<section class="container main-content <?php if (strtolower($current_page) == 'index') {
+	print 'index ';
+}
+?>clear">

install/install-action.php

Indentation +12 added lines, -12 removed lines

@@ -86,9 +86,9 @@ 
 	if ($check_version == '0') {
 		
 		if ($globalDBdriver == 'mysql') {
-		    $error .= create_db::import_all_db('../db/');
+			$error .= create_db::import_all_db('../db/');
 		} elseif ($globalDBdriver == 'pgsql') {
-		    $error .= create_db::import_all_db('../db/pgsql/');
+			$error .= create_db::import_all_db('../db/pgsql/');
 		}
 		if ($error != '') {
 			$_SESSION['error'] = $error;
@@ -98,8 +98,8 @@ 
 			$_SESSION['install'] = 'populate';
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
 		} else {
-		    $_SESSION['install'] = 'sources';
-		    $_SESSION['next'] = 'Insert data in source table';
+			$_SESSION['install'] = 'sources';
+			$_SESSION['next'] = 'Insert data in source table';
 		}
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
@@ -156,10 +156,10 @@ 
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
 	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
-	    $_SESSION['install'] = 'notam';
-	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
-	    print json_encode($result);
+		$_SESSION['install'] = 'notam';
+		$_SESSION['next'] = 'Populate NOTAM table with externals data';
+		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		print json_encode($result);
 	/*
 	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
 	    $_SESSION['install'] = 'owner';
@@ -169,10 +169,10 @@ 
 	    print json_encode($result);
 	*/
 	} else {
-	    $_SESSION['install'] = 'sources';
-	    $_SESSION['next'] = 'Insert data in source table';
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
-	    print json_encode($result);
+		$_SESSION['install'] = 'sources';
+		$_SESSION['next'] = 'Insert data in source table';
+		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
 	if (!is_writable('tmp')) {

Spacing +67 added lines, -67 removed lines

@@ -70,15 +70,15 @@ 
 	$globalDebug = FALSE;
 	$dbroot = $_SESSION['database_root'];
 	$dbrootpass = $_SESSION['database_rootpass'];
-	$error .= create_db::create_database($dbroot,$dbrootpass,$globalDBuser,$globalDBpass,$globalDBname,$globalDBdriver,$globalDBhost);
+	$error .= create_db::create_database($dbroot, $dbrootpass, $globalDBuser, $globalDBpass, $globalDBname, $globalDBdriver, $globalDBhost);
 	sleep(5);
 	if ($error != '') {
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create database'));
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Create database'));
 	$_SESSION['install'] = 'database_import';
 	$_SESSION['next'] = 'Create and import tables';
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') {
 	$globalDebug = FALSE;
@@ -92,8 +92,8 @@ 
 		}
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create and import tables'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Create and import tables'));
 		if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$_SESSION['install'] = 'populate';
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
@@ -101,24 +101,24 @@ 
 		    $_SESSION['install'] = 'sources';
 		    $_SESSION['next'] = 'Insert data in source table';
 		}
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} elseif (!is_numeric($check_version)) {
 		$error .= $check_version;
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create and import tables'));
 		if (!isset($_SESSION['next'])) $_SESSION['next'] = '';
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		$error .= update_schema::check_version(true);
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Update schema if needed'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed'));
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') {
@@ -127,8 +127,8 @@ 
 	$error .= update_db::update_waypoints();
 	if ($error != '') {
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate waypoints database'));
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database'));
 /*
 	$_SESSION['install'] = 'airspace';
 	$_SESSION['next'] = 'Populate airspace table';
@@ -145,7 +145,7 @@ 
 */
 	$_SESSION['install'] = 'countries';
 	$_SESSION['next'] = 'Populate countries table';
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') {
 	include_once('class.update_db.php');
@@ -153,12 +153,12 @@ 
 	$error .= update_db::update_countries();
 	if ($error != '') {
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate countries database'));
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database'));
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 	    $_SESSION['install'] = 'notam';
 	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	    $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	    print json_encode($result);
 	/*
 	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
@@ -171,15 +171,15 @@ 
 	} else {
 	    $_SESSION['install'] = 'sources';
 	    $_SESSION['next'] = 'Insert data in source table';
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	    $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	    print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -187,19 +187,19 @@ 
 		$error .= update_db::update_ModeS_fam();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B'));
 		$_SESSION['install'] = 'populate_flarm';
 		$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM'));
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -208,8 +208,8 @@ 
 		$error .= update_db::update_ModeS_ogn();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM'));
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 			$_SESSION['install'] = 'vatsim';
 			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
@@ -228,15 +228,15 @@ 
 			$_SESSION['install'] = 'routes';
 			$_SESSION['next'] = 'Populate routes table with externals data';
 		}
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -244,19 +244,19 @@ 
 		$error .= update_db::update_routes_fam();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data'));
-		} else 	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate routes table with externals data'));
+		} else 	$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data'));
 		$_SESSION['install'] = 'translation';
 		$_SESSION['next'] = 'Populate translation table with externals data';
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data'));
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -264,8 +264,8 @@ 
 		$error .= update_db::update_translation_fam();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data'));
 		if ($_SESSION['waypoints'] == 1) {
 			$_SESSION['install'] = 'waypoints';
 			$_SESSION['next'] = 'Populate waypoints table';
@@ -283,15 +283,15 @@ 
 			$_SESSION['install'] = 'sources';
 			$_SESSION['next'] = 'Insert data in source table';
 		}
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data'));
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -299,19 +299,19 @@ 
 		$error = update_db::update_owner_fam();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data'));
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data'));
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -320,13 +320,13 @@ 
 			$error .= update_db::update_notam();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data'));
 		} else {
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data (no source defined)'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)'));
 		}
 		/*
 		if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
@@ -339,7 +339,7 @@ 
 		*/
 			$_SESSION['install'] = 'sources';
 			$_SESSION['next'] = 'Insert data in source table';
-			$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+			$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 			print json_encode($result);
 		//}
 	}
@@ -376,9 +376,9 @@ 
 		$Source = new Source();
 		$Source->deleteAllLocation();
 		foreach ($sources as $src) {
-			if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+			if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'], $src['latitude'], $src['longitude'], $src['altitude'], $src['city'], $src['country'], $src['source'], 'antenna.png');
 		}
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table'));
 		unset($_SESSION['sources']);
 	}
 	/*
@@ -403,7 +403,7 @@ 
 		$_SESSION['install'] = 'finish';
 		$_SESSION['next'] = 'finish';
 	}
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') {
 	include_once('../install/class.create_db.php');
@@ -415,48 +415,48 @@ 
 			$error .= update_db::update_IVAO();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
 		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$error .= update_db::update_vatsim();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		if (file_exists('tmp/ivae_feb2013.zip')) {
 			$error .= update_db::update_IVAO();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data (IVAO not found)'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)'));
 		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data'));
 	}
 	//$_SESSION['install'] = 'routes';
 	//$_SESSION['next'] = 'Populate routes table with externals data';
 	$_SESSION['install'] = 'finish';
 	$_SESSION['next'] = 'finish';
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else {
 	//unset($_SESSION['install']);
 	$_SESSION['error'] = 'Unknwon task : '.$_SESSION['install'];
-	$result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish');
+	$result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish');
 	print json_encode($result);
 }
 ?>
\ No newline at end of file

Braces +78 added lines, -28 removed lines

@@ -75,7 +75,9 @@ 
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+	}
 	$_SESSION['install'] = 'database_import';
 	$_SESSION['next'] = 'Create and import tables';
 	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -93,7 +95,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+		}
 		if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$_SESSION['install'] = 'populate';
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
@@ -107,7 +111,9 @@ 
 		$error .= $check_version;
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
-		if (!isset($_SESSION['next'])) $_SESSION['next'] = '';
+		if (!isset($_SESSION['next'])) {
+			$_SESSION['next'] = '';
+		}
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -115,7 +121,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+		}
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -128,8 +136,10 @@ 
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
-/*
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
+	}
+	/*
 	$_SESSION['install'] = 'airspace';
 	$_SESSION['next'] = 'Populate airspace table';
 	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -154,7 +164,9 @@ 
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+	}
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 	    $_SESSION['install'] = 'notam';
 	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
@@ -188,7 +200,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+		}
 		$_SESSION['install'] = 'populate_flarm';
 		$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -209,18 +223,26 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+		}
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 			$_SESSION['install'] = 'vatsim';
-			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-			else $_SESSION['next'] = 'Insert VATSIM data';
+			if (file_exists('tmp/ivae_feb2013.zip')) {
+				$_SESSION['next'] = 'Insert IVAO data';
+			} else {
+				$_SESSION['next'] = 'Insert VATSIM data';
+			}
 		} elseif (isset($globalVATSIM) && $globalVATSIM) {
 			$_SESSION['install'] = 'vatsim';
 			$_SESSION['next'] = 'Insert VATSIM data';
 		} elseif (isset($globalIVAO) && $globalIVAO) {
 			$_SESSION['install'] = 'vatsim';
-			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-			else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+			if (file_exists('tmp/ivae_feb2013.zip')) {
+				$_SESSION['next'] = 'Insert IVAO data';
+			} else {
+				$_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+			}
 		} elseif (isset($globalphpVMS) && $globalphpVMS) {
 			$_SESSION['install'] = 'vatsim';
 			$_SESSION['next'] = 'Insert phpVMS data';
@@ -245,7 +267,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data'));
-		} else 	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+		}
 		$_SESSION['install'] = 'translation';
 		$_SESSION['next'] = 'Populate translation table with externals data';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -265,7 +289,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+		}
 		if ($_SESSION['waypoints'] == 1) {
 			$_SESSION['install'] = 'waypoints';
 			$_SESSION['next'] = 'Populate waypoints table';
@@ -300,7 +326,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+		}
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -321,12 +349,16 @@ 
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
+			}
 		} else {
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+			}
 		}
 		/*
 		if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
@@ -376,7 +408,9 @@ 
 		$Source = new Source();
 		$Source->deleteAllLocation();
 		foreach ($sources as $src) {
-			if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+			if (isset($src['latitude']) && $src['latitude'] != '') {
+				$Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+			}
 		}
 		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
 		unset($_SESSION['sources']);
@@ -387,15 +421,21 @@ 
 	*/
 	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 		$_SESSION['install'] = 'vatsim';
-		if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-		else $_SESSION['next'] = 'Insert VATSIM data';
+		if (file_exists('tmp/ivae_feb2013.zip')) {
+			$_SESSION['next'] = 'Insert IVAO data';
+		} else {
+			$_SESSION['next'] = 'Insert VATSIM data';
+		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$_SESSION['install'] = 'vatsim';
 		$_SESSION['next'] = 'Insert VATSIM data';
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		$_SESSION['install'] = 'vatsim';
-		if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-		else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+		if (file_exists('tmp/ivae_feb2013.zip')) {
+			$_SESSION['next'] = 'Insert IVAO data';
+		} else {
+			$_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
 		$_SESSION['install'] = 'vatsim';
 		$_SESSION['next'] = 'Insert phpVMS data';
@@ -416,33 +456,43 @@ 
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			}
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			}
 		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$error .= update_db::update_vatsim();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+		}
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		if (file_exists('tmp/ivae_feb2013.zip')) {
 			$error .= update_db::update_IVAO();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			}
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+			}
 		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
 		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));

scripts/daemon-spotter.php

Spacing +198 added lines, -198 removed lines

@@ -50,20 +50,20 @@ 
 	    die;
 	}
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
-	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
+	$globalSources[] = array('host' => $globalSBS1Host, 'port' => $globalSBS1Port);
     }
 }
 
-$options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver','enable-aircraft','disable-aircraft','enable-tracker','disable-tracker','enable-marine','disable-marine'));
+$options = getopt('s::', array('source::', 'server', 'nodaemon', 'idsource::', 'aprsserverssid::', 'aprsserverpass::', 'aprsserverhost::', 'aprsserverport::', 'format::', 'noaprsserver', 'enable-aircraft', 'disable-aircraft', 'enable-tracker', 'disable-tracker', 'enable-marine', 'disable-marine'));
 //if (isset($options['s'])) $hosts = array($options['s']);
 //elseif (isset($options['source'])) $hosts = array($options['source']);
 if (isset($options['s'])) {
     $globalSources = array();
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'], 'format' => $options['format']);
     else $globalSources[] = array('host' => $options['s']);
 } elseif (isset($options['source'])) {
     $globalSources = array();
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'], 'format' => $options['format']);
     else $globalSources[] = array('host' => $options['source']);
 }
 if (isset($options['aprsserverhost'])) {
@@ -104,13 +104,13 @@ 
 else $id_source = 1;
 if (isset($globalServer) && $globalServer) {
     if ($globalDebug) echo "Using Server Mode\n";
-    $SI=new SpotterServer();
+    $SI = new SpotterServer();
 /*
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
     $SI = new adsb2aprs();
     $SI->connect();
 */
-} else $SI=new SpotterImport($Connection->db);
+} else $SI = new SpotterImport($Connection->db);
 
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
 if (isset($globalMarine) && $globalMarine) {
@@ -124,17 +124,17 @@ 
     $MI = new MarineImport($Connection->db);
 }
 //$APRS=new APRS($Connection->db);
-$SBS=new SBS();
+$SBS = new SBS();
 if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-	$ACARS=new ACARS($Connection->db,true);
-	$Source=new Source($Connection->db);
+	$ACARS = new ACARS($Connection->db, true);
+	$Source = new Source($Connection->db);
 }
-$Common=new Common();
+$Common = new Common();
 date_default_timezone_set('UTC');
 //$servertz = system('date +%Z');
 // signal handler - playing nice with sockets and dump1090
 if (function_exists('pcntl_fork')) {
-    pcntl_signal(SIGINT,  function() {
+    pcntl_signal(SIGINT, function() {
         global $sockets;
         echo "\n\nctrl-c or kill signal received. Tidying up ... ";
         die("Bye!\n");
@@ -150,35 +150,35 @@ 
 
 function connect_all($hosts) {
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
-    global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
+    global $sockets, $httpfeeds, $globalSources, $globalDebug, $aprs_connect, $last_exec, $globalSourcesRights, $use_aprs, $reset, $context;
     $reset++;
     if ($globalDebug) echo 'Connect to all...'."\n";
     foreach ($hosts as $id => $value) {
 	$host = $value['host'];
 	$globalSources[$id]['last_exec'] = 0;
 	// Here we check type of source(s)
-	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
-            if (preg_match('/deltadb.txt$/i',$host)) {
+	if (filter_var($host, FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
+            if (preg_match('/deltadb.txt$/i', $host)) {
         	//$formats[$id] = 'deltadbtxt';
         	$globalSources[$id]['format'] = 'deltadbtxt';
         	//$last_exec['deltadbtxt'] = 0;
         	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
+            } else if (preg_match('/vatsim-data.txt$/i', $host)) {
         	//$formats[$id] = 'vatsimtxt';
         	$globalSources[$id]['format'] = 'vatsimtxt';
         	//$last_exec['vatsimtxt'] = 0;
         	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
+    	    } else if (preg_match('/aircraftlist.json$/i', $host)) {
         	//$formats[$id] = 'aircraftlistjson';
         	$globalSources[$id]['format'] = 'aircraftlistjson';
         	//$last_exec['aircraftlistjson'] = 0;
         	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
-    	    } else if (preg_match('/aircraft.json$/i',$host)) {
+    	    } else if (preg_match('/aircraft.json$/i', $host)) {
         	//$formats[$id] = 'aircraftjson';
         	$globalSources[$id]['format'] = 'aircraftjson';
         	//$last_exec['aircraftlistjson'] = 0;
         	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
-    	    } else if (preg_match('/opensky/i',$host)) {
+    	    } else if (preg_match('/opensky/i', $host)) {
         	//$formats[$id] = 'aircraftlistjson';
         	$globalSources[$id]['format'] = 'opensky';
         	//$last_exec['aircraftlistjson'] = 0;
@@ -195,7 +195,7 @@ 
         	    exit(0);
         	}
     	    */
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
+    	    } else if (preg_match('/planeUpdateFAA.php$/i', $host)) {
         	//$formats[$id] = 'planeupdatefaa';
         	$globalSources[$id]['format'] = 'planeupdatefaa';
         	//$last_exec['planeupdatefaa'] = 0;
@@ -204,37 +204,37 @@ 
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
         	    exit(0);
         	}
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
+            } else if (preg_match('/\/action.php\/acars\/data$/i', $host)) {
         	//$formats[$id] = 'phpvmacars';
         	$globalSources[$id]['format'] = 'phpvmacars';
         	//$last_exec['phpvmacars'] = 0;
         	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
-            } else if (preg_match('/\/api\/v1\/acars\/data$/i',$host)) {
+            } else if (preg_match('/\/api\/v1\/acars\/data$/i', $host)) {
         	//$formats[$id] = 'phpvmacars';
         	$globalSources[$id]['format'] = 'vaos';
         	//$last_exec['phpvmacars'] = 0;
         	if ($globalDebug) echo "Connect to vaos source (".$host.")...\n";
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
+            } else if (preg_match('/VAM-json.php$/i', $host)) {
         	//$formats[$id] = 'phpvmacars';
         	$globalSources[$id]['format'] = 'vam';
         	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
-            } else if (preg_match('/whazzup/i',$host)) {
+            } else if (preg_match('/whazzup/i', $host)) {
         	//$formats[$id] = 'whazzup';
         	$globalSources[$id]['format'] = 'whazzup';
         	//$last_exec['whazzup'] = 0;
         	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
-            } else if (preg_match('/blitzortung/i',$host)) {
+            } else if (preg_match('/blitzortung/i', $host)) {
         	$globalSources[$id]['format'] = 'blitzortung';
         	if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
-            } else if (preg_match('/airwhere/i',$host)) {
+            } else if (preg_match('/airwhere/i', $host)) {
         	$globalSources[$id]['format'] = 'airwhere';
         	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
-            } else if (preg_match('/recentpireps/i',$host)) {
+            } else if (preg_match('/recentpireps/i', $host)) {
         	//$formats[$id] = 'pirepsjson';
         	$globalSources[$id]['format'] = 'pirepsjson';
         	//$last_exec['pirepsjson'] = 0;
         	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
+            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i', $host)) {
         	//$formats[$id] = 'fr24json';
         	$globalSources[$id]['format'] = 'fr24json';
         	//$last_exec['fr24json'] = 0;
@@ -243,7 +243,7 @@ 
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
         	    exit(0);
         	}
-            } else if (preg_match(':myshiptracking.com/:i',$host)) {
+            } else if (preg_match(':myshiptracking.com/:i', $host)) {
         	//$formats[$id] = 'fr24json';
         	$globalSources[$id]['format'] = 'myshiptracking';
         	//$last_exec['fr24json'] = 0;
@@ -253,21 +253,21 @@ 
         	    exit(0);
         	}
             //} else if (preg_match('/10001/',$host)) {
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
+            } else if (preg_match('/10001/', $host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
         	//$formats[$id] = 'tsv';
         	$globalSources[$id]['format'] = 'tsv';
         	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
             }
-        } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
+        } elseif (filter_var($host, FILTER_VALIDATE_URL)) {
     		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
+    		    $idf = fopen($globalSources[$id]['host'], 'r', false, $context);
     		    if ($idf !== false) {
     			$httpfeeds[$id] = $idf;
         		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
     		    } elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
     		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
-	    $hostport = explode(':',$host);
+        } elseif (!filter_var($host, FILTER_VALIDATE_URL)) {
+	    $hostport = explode(':', $host);
 	    if (isset($hostport[1])) {
 		$port = $hostport[1];
 		$hostn = $hostport[0];
@@ -277,19 +277,19 @@ 
 	    }
 	    $Common = new Common();
 	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
+        	$s = $Common->create_socket($hostn, $port, $errno, $errstr);
     	    } else {
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
+        	$s = $Common->create_socket_udp($hostn, $port, $errno, $errstr);
 	    }
 	    if ($s) {
     	        $sockets[$id] = $s;
     	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
+		    if (preg_match('/aprs/', $hostn) || $port == '10152' || $port == '14580') {
 			//$formats[$id] = 'aprs';
 			$globalSources[$id]['format'] = 'aprs';
 			//$aprs_connect = 0;
 			//$use_aprs = true;
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
+		    } elseif (preg_match('/pub-vrs/', $hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
 			$globalSources[$id]['format'] = 'vrstcp';
     		    } elseif ($port == '10001') {
         		//$formats[$id] = 'tsv';
@@ -328,7 +328,7 @@ 
 else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
 else $timeout = 20;
 $errno = '';
-$errstr='';
+$errstr = '';
 
 if (!isset($globalDaemon)) $globalDaemon = TRUE;
 /* Initiate connections to all the hosts simultaneously */
@@ -336,7 +336,7 @@ 
 //connect_all($globalSources);
 
 if (isset($globalProxy) && $globalProxy) {
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
+    $context = stream_context_create(array('http' => array('timeout' => $timeout, 'proxy' => $globalProxy, 'request_fulluri' => true)));
 } else {
     $context = stream_context_create(array('http' => array('timeout' => $timeout)));
 }
@@ -366,16 +366,16 @@ 
 
 if ($use_aprs) {
 	require_once(dirname(__FILE__).'/../require/class.APRS.php');
-	$APRS=new APRS();
+	$APRS = new APRS();
 	$aprs_connect = 0;
 	$aprs_keep = 120;
 	$aprs_last_tx = time();
 	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
+	else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName);
 	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
+	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
 	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
+	else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
 	if ($aprs_full) $aprs_filter = '';
 	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
 	else $aprs_pass = '-1';
@@ -389,12 +389,12 @@ 
 sleep(1);
 if ($globalDebug) echo "SCAN MODE \n\n";
 if (!isset($globalCronEnd)) $globalCronEnd = 60;
-$endtime = time()+$globalCronEnd;
+$endtime = time() + $globalCronEnd;
 $i = 1;
 $tt = array();
 // Delete all ATC
 if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
-	$ATC=new ATC($Connection->db);
+	$ATC = new ATC($Connection->db);
 }
 if (!$globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	$ATC->deleteAll();
@@ -404,7 +404,7 @@ 
 while ($i > 0) {
     if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
 
-    if (!$globalDaemon) $i = $endtime-time();
+    if (!$globalDaemon) $i = $endtime - time();
     // Delete old ATC
     if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
@@ -418,7 +418,7 @@ 
 	}
 	if ($max < $globalMinFetch) {
 	    if ($globalDebug) echo 'Sleeping...'."\n";
-	    sleep($globalMinFetch-$max+2);
+	    sleep($globalMinFetch - $max + 2);
 	}
     }
 
@@ -437,8 +437,8 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
 	    if ($buffer != '') $reset = 0;
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
+	    $buffer = explode('\n', $buffer);
 	    foreach ($buffer as $line) {
     		if ($line != '' && count($line) > 7) {
     		    $line = explode(',', $line);
@@ -471,11 +471,11 @@ 
 	    )
 	) {
 	    date_default_timezone_set('CET');
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
+	    $buffer = $Common->getData(str_replace('{date}', date('Ymd'), $value['host']));
 	    date_default_timezone_set('UTC');
 	    if ($buffer != '') $reset = 0;
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
+	    $buffer = explode('\n', $buffer);
 	    foreach ($buffer as $line) {
 		if ($line != '') {
 		    //echo "'".$line."'\n";
@@ -483,7 +483,7 @@ 
 		    $ais_data = $AIS->parse_line(trim($line));
 		    $data = array();
 		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
+		    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'], -9);
 		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
 		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
 		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
@@ -495,7 +495,7 @@ 
 		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
 		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
 		    if (isset($ais_data['timestamp'])) {
-			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
+			$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
 			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
 			    $add = true;
@@ -518,21 +518,21 @@ 
 	    $w = $e = null;
 	    
 	    if (isset($arr[$id])) {
-		$nn = stream_select($arr,$w,$e,$timeout);
+		$nn = stream_select($arr, $w, $e, $timeout);
 		if ($nn > 0) {
 		    foreach ($httpfeeds as $feed) {
-			$buffer = stream_get_line($feed,2000,"\n");
+			$buffer = stream_get_line($feed, 2000, "\n");
 			if ($buffer === FALSE) {
 			    connect_all($globalSources);
 			}
-			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-			$buffer = explode('\n',$buffer);
+			$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
+			$buffer = explode('\n', $buffer);
 			foreach ($buffer as $line) {
 			    if ($line != '') {
 				$ais_data = $AIS->parse_line(trim($line));
 				$data = array();
 				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-				if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
+				if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'], -9);
 				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
 				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
 				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
@@ -544,9 +544,9 @@ 
 				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
 				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
-				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
 				if (isset($ais_data['timestamp'])) {
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
+				    $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
 				} else {
 				    $data['datetime'] = date('Y-m-d H:i:s');
 				}
@@ -578,10 +578,10 @@ 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
 	    )
 	) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
 	    if ($buffer != '') {
 		//echo $buffer;
-		$all_data = json_decode($buffer,true);
+		$all_data = json_decode($buffer, true);
 		//print_r($all_data);
 		if (isset($all_data[0]['DATA'])) {
 		    foreach ($all_data[0]['DATA'] as $line) {
@@ -590,7 +590,7 @@ 
 			    $data['ident'] = $line['NAME'];
 			    $data['mmsi'] = $line['MMSI'];
 			    if (strlen($data['mmsi']) > 9) {
-				$data['mmsi'] = substr($data['mmsi'],-9);
+				$data['mmsi'] = substr($data['mmsi'], -9);
 			    }
 			    $data['speed'] = $line['SOG'];
 			    $data['heading'] = $line['COG'];
@@ -600,8 +600,8 @@ 
 			    //$data['type_id'] = $line['TYPE'];
 			    $data['imo'] = $line['IMO'];
 			    if ($line['DEST'] != '') $data['arrival_code'] = $line['DEST'];
-			    if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
-			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
+			    if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s', strtotime($line['ARV']));
+			    $data['datetime'] = date('Y-m-d H:i:s', $line['T']);
 			    $data['format_source'] = 'myshiptracking';
 			    $data['id_source'] = $id_source;
 			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -618,16 +618,16 @@ 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
 	    )
 	) {
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
+	    $buffer = $Common->getData(str_replace('{timestamp}', time(), $value['host']));
 	    if ($buffer != '') {
-		$all_data = json_decode($buffer,true);
+		$all_data = json_decode($buffer, true);
 		if (isset($all_data[0]['mmsi'])) {
 		    foreach ($all_data as $line) {
 			if ($line != '') {
 			    $data = array();
 			    $data['ident'] = $line['shipname'];
 			    $data['callsign'] = $line['callsign'];
-			    $data['mmsi'] = substr($line['mmsi'],-9);
+			    $data['mmsi'] = substr($line['mmsi'], -9);
 			    $data['speed'] = $line['sog'];
 			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
 			    $data['latitude'] = $line['latitude'];
@@ -654,14 +654,14 @@ 
 	) {
 	    $buffer = $Common->getData($value['host']);
 	    if ($buffer != '') {
-		$all_data = json_decode($buffer,true);
+		$all_data = json_decode($buffer, true);
 		if (isset($all_data['features'][0]['id'])) {
 		    foreach ($all_data['features'] as $line) {
 			print_r($line);
 			$data = array();
 			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
 			if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign'];
-			if (isset($line['properties']['mmsi'])) $data['mmsi'] = substr($line['properties']['mmsi'],-9);
+			if (isset($line['properties']['mmsi'])) $data['mmsi'] = substr($line['properties']['mmsi'], -9);
 			if (isset($line['properties']['imo'])) $data['imo'] = $line['properties']['imo'];
 			if (isset($line['properties']['speed'])) $data['speed'] = $line['properties']['speed'];
 			if (isset($line['properties']['heading']) && $line['properties']['heading'] != 0) $data['heading'] = $line['properties']['heading'];
@@ -688,31 +688,31 @@ 
 	    )
 	) {
 	    echo 'download...';
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
+	    $buffer = $Common->getData($value['host'], 'post', $value['post'], '', '', '', '', 'ShipPlotter');
 	    echo 'done !'."\n";
 	    // FIXME: Need more work
 	    if ($buffer != '') $reset = 0;
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
+	    $buffer = explode('\n', $buffer);
 	    foreach ($buffer as $line) {
 		if ($line != '') {
 		    $data = array();
 		    echo $line."\n";
-		    $data['mmsi'] = (int)substr($line,0,9);
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
-		    $data['status_id'] = substr($line,21,2);
-		    $data['type_id'] = substr($line,24,3);
-		    $data['latitude'] = substr($line,29,9);
-		    $data['longitude'] = substr($line,41,9);
-		    $data['speed'] = round(substr($line,51,5));
+		    $data['mmsi'] = (int) substr($line, 0, 9);
+		    $data['datetime'] = date('Y-m-d H:i:s', substr($line, 10, 10));
+		    $data['status_id'] = substr($line, 21, 2);
+		    $data['type_id'] = substr($line, 24, 3);
+		    $data['latitude'] = substr($line, 29, 9);
+		    $data['longitude'] = substr($line, 41, 9);
+		    $data['speed'] = round(substr($line, 51, 5));
 		    //$data['course'] = substr($line,57,5);
-		    $data['heading'] = round(substr($line,63,3));
+		    $data['heading'] = round(substr($line, 63, 3));
 		    //$data['draft'] = substr($line,67,4);
 		    //$data['length'] = substr($line,72,3);
 		    //$data['beam'] = substr($line,76,2);
-		    $data['ident'] = trim(utf8_encode(substr($line,78,20)));
+		    $data['ident'] = trim(utf8_encode(substr($line, 78, 20)));
 		    //$data['callsign'] = trim(substr($line,100,7);
-		    $data['arrival_code'] = substr($line,108,20);
+		    $data['arrival_code'] = substr($line, 108, 20);
 		    //$data['etaDate'] = substr($line,129,5);
 		    //$data['etaTime'] = substr($line,135,5);
 		    $data['format_source'] = 'shipplotter';
@@ -743,8 +743,8 @@ 
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
+	    $buffer = explode('\n', $buffer);
 	    $reset = 0;
 	    foreach ($buffer as $line) {
     		if ($line != '') {
@@ -755,7 +755,7 @@ 
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
 			$data['pilot_id'] = $line[1];
 			$data['pilot_name'] = $line[2];
-			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
+			$data['hex'] = str_pad(dechex($Common->str2int($line[1])), 6, '000000', STR_PAD_LEFT);
 			$data['ident'] = $line[0]; // ident
 			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
 			$data['speed'] = $line[8]; // speed
@@ -771,7 +771,7 @@ 
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
 			//if (isset($line[37])) $data['last_update'] = $line[37];
 		        $data['departure_airport_icao'] = $line[11];
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
+		        $data['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':');
 		        $data['arrival_airport_icao'] = $line[13];
 			$data['frequency'] = $line[4];
 			$data['type'] = $line[18];
@@ -780,7 +780,7 @@ 
     			$data['id_source'] = $id_source;
 	    		//$data['arrival_airport_time'] = ;
 	    		if ($line[9] != '') {
-	    		    $aircraft_data = explode('/',$line[9]);
+	    		    $aircraft_data = explode('/', $line[9]);
 	    		    if (isset($aircraft_data[1])) {
 	    			$data['aircraft_icao'] = $aircraft_data[1];
 	    		    }
@@ -795,9 +795,9 @@ 
     			if ($line[3] === 'PILOT') $SI->add($data);
 			elseif ($line[3] === 'ATC') {
 				//print_r($data);
-				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
-				$data['info'] = str_replace('&amp;sect;','',$data['info']);
-				$typec = substr($data['ident'],-3);
+				$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
+				$data['info'] = str_replace('&amp;sect;', '', $data['info']);
+				$typec = substr($data['ident'], -3);
 				if ($typec === 'APP') $data['type'] = 'Approach';
 				elseif ($typec === 'TWR') $data['type'] = 'Tower';
 				elseif ($typec === 'OBS') $data['type'] = 'Observer';
@@ -809,8 +809,8 @@ 
 				elseif ($data['type'] === '') $data['type'] = 'Observer';
 				if (!isset($data['source_name'])) $data['source_name'] = '';
 				if (isset($ATC)) {
-					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
-					else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
+					if (count($ATC->getByIdent($data['ident'], $data['format_source'])) > 0) echo $ATC->update($data['ident'], $data['frequency'], $data['latitude'], $data['longitude'], $data['range'], $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source'], $data['source_name']);
+					else echo $ATC->add($data['ident'], $data['frequency'], $data['latitude'], $data['longitude'], $data['range'], $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source'], $data['source_name']);
 				}
 			}
     			unset($data);
@@ -826,24 +826,24 @@ 
     		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
     	    )
     	) {
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
+	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php', 'get', '', '', '', '', '20');
 	    if ($buffer != '') {
 		$all_data = simplexml_load_string($buffer);
-		foreach($all_data->children() as $childdata) {
+		foreach ($all_data->children() as $childdata) {
 			$data = array();
 			$line = $childdata;
 			//$data['hex'] = str_pad(dechex((int)$line['pktPilotID']),6,'000000',STR_PAD_LEFT);
-			$data['id'] = date('Ymd').(int)$line['pktPilotID'];
-			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST'));
-			$data['latitude'] = (float)$line['pktLatitude'];
-			$data['longitude'] = (float)$line['pktLongitude'];
-			if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack'];
-			if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed'];
-			$data['altitude'] = round((int)$line['pktAltitude']*3.28084);
+			$data['id'] = date('Ymd').(int) $line['pktPilotID'];
+			$data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['entryTime'].' BST'));
+			$data['latitude'] = (float) $line['pktLatitude'];
+			$data['longitude'] = (float) $line['pktLongitude'];
+			if ((float) $line['pktTrack'] != 0) $data['heading'] = (float) $line['pktTrack'];
+			if ((int) $line['pktSpeed'] != 0) $data['speed'] = (int) $line['pktSpeed'];
+			$data['altitude'] = round((int) $line['pktAltitude']*3.28084);
 			$data['altitude_relative'] = 'AMSL';
-			$data['pilot_id'] = (int)$line['pktPilotID'];
+			$data['pilot_id'] = (int) $line['pktPilotID'];
 			$data['aircraft_icao'] = 'PARAGLIDER';
-			$pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
+			$pilot_data = explode(',', $Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
 			if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4];
 			$data['format_source'] = $value['format'];
 			$SI->add($data);
@@ -851,22 +851,22 @@ 
 		}
 	    }
 	    $Source->deleteOldLocationByType('gs');
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
+	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php', 'get', '', '', '', '', '20');
 	    if ($buffer != '') {
 		$all_data = simplexml_load_string($buffer);
-		foreach($all_data->children() as $childdata) {
+		foreach ($all_data->children() as $childdata) {
 			$data = array();
 			$line = $childdata;
-			$data['id'] = (int)$line['gsID'];
-			$data['latitude'] = (float)$line['gsLatitude'];
-			$data['longitude'] = (float)$line['gsLongitude'];
-			$data['altitude'] = round((int)$line['gsHeight']*3.28084);
+			$data['id'] = (int) $line['gsID'];
+			$data['latitude'] = (float) $line['gsLatitude'];
+			$data['longitude'] = (float) $line['gsLongitude'];
+			$data['altitude'] = round((int) $line['gsHeight']*3.28084);
 			$data['altitude_relative'] = 'AMSL';
-			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['gsLastUpdate'].' BST'));
+			$data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['gsLastUpdate'].' BST'));
 			if (count($Source->getLocationInfoByLocationID($data['id'])) > 0) {
-				$Source->updateLocationByLocationID('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']);
+				$Source->updateLocationByLocationID('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']);
 			} else {
-				$Source->addLocation('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']);
+				$Source->addLocation('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']);
 			}
 			unset($data);
 		}
@@ -884,9 +884,9 @@ 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
 	    )
 	) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
 	    if ($buffer != '') {
-	        $all_data = json_decode($buffer,true);
+	        $all_data = json_decode($buffer, true);
 		if (isset($all_data['acList'])) {
 		    $reset = 0;
 		    foreach ($all_data['acList'] as $line) {
@@ -902,7 +902,7 @@ 
 			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
 			$data['emergency'] = ''; // emergency
 			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
 			else $data['datetime'] = date('Y-m-d H:i:s');
 			//$data['datetime'] = date('Y-m-d H:i:s');
 			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
@@ -927,7 +927,7 @@ 
 			$data['verticalrate'] = $line['vrt']; // verticale rate
 			$data['squawk'] = $line['squawk']; // squawk
 			$data['emergency'] = ''; // emergency
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
 			else $data['datetime'] = date('Y-m-d H:i:s');
 			$data['format_source'] = 'aircraftlistjson';
 			$data['id_source'] = $id_source;
@@ -948,7 +948,7 @@ 
     	    )
     	) {
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if (isset($all_data['planes'])) {
 		$reset = 0;
 		foreach ($all_data['planes'] as $key => $line) {
@@ -965,12 +965,12 @@ 
 		    $data['emergency'] = ''; // emergency
 		    $data['registration'] = $line[2];
 		    $data['aircraft_icao'] = $line[0];
-		    $deparr = explode('-',$line[1]);
+		    $deparr = explode('-', $line[1]);
 		    if (count($deparr) === 2) {
 			$data['departure_airport_icao'] = $deparr[0];
 			$data['arrival_airport_icao'] = $deparr[1];
 		    }
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[9]);
 	    	    $data['format_source'] = 'planeupdatefaa';
     		    $data['id_source'] = $id_source;
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -988,7 +988,7 @@ 
 	    )
 	) {
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if (isset($all_data['states'])) {
 		$reset = 0;
 		foreach ($all_data['states'] as $key => $line) {
@@ -1005,7 +1005,7 @@ 
 		    //$data['emergency'] = ''; // emergency
 		    //$data['registration'] = $line[2];
 		    //$data['aircraft_icao'] = $line[0];
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[3]);
 		    $data['format_source'] = 'opensky';
 		    $data['id_source'] = $id_source;
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1022,7 +1022,7 @@ 
 	    )
 	) {
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if (isset($all_data['aircraft'])) {
 		$reset = 0;
 		foreach ($all_data['aircraft'] as $key => $line) {
@@ -1058,7 +1058,7 @@ 
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if (!empty($all_data)) $reset = 0;
 	    foreach ($all_data as $key => $line) {
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
@@ -1096,11 +1096,11 @@ 
 	    )
 	) {
 	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '150');
 	    //echo $buffer;
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
-	    $all_data = json_decode($buffer,true);
+	    $buffer = str_replace(array("\n", "\r"), "", $buffer);
+	    $buffer = preg_replace('/,"num":(.+)/', '}', $buffer);
+	    $all_data = json_decode($buffer, true);
 	    if (json_last_error() != JSON_ERROR_NONE) {
 		die(json_last_error_msg());
 	    }
@@ -1123,7 +1123,7 @@ 
 			//$data['departure_airport_iata'] = $line[11];
 			//$data['arrival_airport_iata'] = $line[12];
 	    		//$data['emergency'] = ''; // emergency
-			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
+			$data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10]
 	    		$data['format_source'] = 'radarvirtueljson';
     			$data['id_source'] = $id_source;
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1144,14 +1144,14 @@ 
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host'].'?'.time());
-	    $all_data = json_decode(utf8_encode($buffer),true);
+	    $all_data = json_decode(utf8_encode($buffer), true);
 	    
 	    if (isset($all_data['pireps'])) {
 		$reset = 0;
 	        foreach ($all_data['pireps'] as $line) {
 		    $data = array();
 		    $data['id'] = $line['id'];
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
+		    $data['hex'] = substr(str_pad(dechex($line['id']), 6, '000000', STR_PAD_LEFT), 0, 6);
 		    $data['ident'] = $line['callsign']; // ident
 		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
 		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
@@ -1181,9 +1181,9 @@ 
 			$SI->add($data);
 		    //    print_r($data);
     		    } elseif ($line['icon'] === 'ct') {
-			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
-			$data['info'] = str_replace('&amp;sect;','',$data['info']);
-			$typec = substr($data['ident'],-3);
+			$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
+			$data['info'] = str_replace('&amp;sect;', '', $data['info']);
+			$typec = substr($data['ident'], -3);
 			$data['type'] = '';
 			if ($typec === 'APP') $data['type'] = 'Approach';
 			elseif ($typec === 'TWR') $data['type'] = 'Tower';
@@ -1194,7 +1194,7 @@ 
 			elseif ($typec === 'FSS') $data['type'] = 'Flight Service Station';
 			elseif ($typec === 'CTR') $data['type'] = 'Control Radar or Centre';
 			else $data['type'] = 'Observer';
-			if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
+			if (isset($ATC)) echo $ATC->add($data['ident'], '', $data['latitude'], $data['longitude'], '0', $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source']);
 		    }
 		    unset($data);
 		}
@@ -1211,14 +1211,14 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if ($buffer != '' && is_array($all_data)) {
 		$reset = 0;
 		foreach ($all_data as $line) {
 	    	    $data = array();
 	    	    //$data['id'] = $line['id']; // id not usable
 	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']), 6, '000000', STR_PAD_LEFT), -6); // hex
 	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
 	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
 	    	    $data['ident'] = $line['flightnum']; // ident
@@ -1233,7 +1233,7 @@ 
 	    	    //$data['datetime'] = $line['lastupdate'];
 	    	    //$data['last_update'] = $line['lastupdate'];
 	    	    if (isset($value['timezone'])) {
-	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
+	    		$datetime = new DateTime($line['lastupdate'], new DateTimeZone($value['timezone']));
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
 	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
@@ -1249,14 +1249,14 @@ 
 		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
 		    if (isset($line['aircraftname'])) {
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
-			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
-	    		$aircraft_data = explode('-',$line['aircraftname']);
+			$line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']);
+	    		$aircraft_data = explode('-', $line['aircraftname']);
 	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
 	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
 	    		else {
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
+	    		    $aircraft_data = explode(' ', $line['aircraftname']);
+	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-', '', $aircraft_data[1]);
+	    		    else $data['aircraft_icao'] = str_replace('-', '', $line['aircraftname']);
 	    		}
 	    	    }
     		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
@@ -1281,7 +1281,7 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if ($buffer != '' && is_array($all_data) && isset($all_data['ACARSData'])) {
 		$reset = 0;
 		foreach ($all_data['ACARSData'] as $line) {
@@ -1292,7 +1292,7 @@ 
 	    	    //$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
 	    	    if (isset($line['user']['username'])) $data['pilot_name'] = $line['user']['username'];
 	    	    if (isset($line['user_id'])) $data['pilot_id'] = $line['user_id'];
-	    	    $data['ident'] = str_replace(' ','',$line['bid']['flightnum']); // ident
+	    	    $data['ident'] = str_replace(' ', '', $line['bid']['flightnum']); // ident
 	    	    if (is_numeric($data['ident'])) $data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
 	    	    $data['altitude'] = $line['altitude']; // altitude
 	    	    $data['speed'] = $line['groundspeed']; // speed
@@ -1303,7 +1303,7 @@ 
 	    	    //$data['squawk'] = ''; // squawk
 	    	    //$data['emergency'] = ''; // emergency
 	    	    if (isset($value['timezone'])) {
-	    		$datetime = new DateTime($line['updated_at'],new DateTimeZone($value['timezone']));
+	    		$datetime = new DateTime($line['updated_at'], new DateTimeZone($value['timezone']));
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
 	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
@@ -1339,14 +1339,14 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if ($buffer != '' && is_array($all_data)) {
 		$reset = 0;
 		foreach ($all_data as $line) {
 	    	    $data = array();
 	    	    //$data['id'] = $line['id']; // id not usable
 	    	    $data['id'] = trim($line['flight_id']);
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']), 6, '000000', STR_PAD_LEFT), -6); // hex
 	    	    $data['pilot_name'] = $line['pilot_name'];
 	    	    $data['pilot_id'] = $line['pilot_id'];
 	    	    $data['ident'] = trim($line['callsign']); // ident
@@ -1390,24 +1390,24 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if ($buffer != '') {
 		$Source->deleteLocationBySource('blitzortung');
-		$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-		$buffer = explode('\n',$buffer);
+		$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
+		$buffer = explode('\n', $buffer);
 		foreach ($buffer as $buffer_line) {
-		    $line = json_decode($buffer_line,true);
+		    $line = json_decode($buffer_line, true);
 		    if (isset($line['time'])) {
 			$data = array();
 			$data['altitude'] = $line['alt']; // altitude
 			$data['latitude'] = $line['lat']; // lat
 			$data['longitude'] = $line['lon']; // long
-			$data['datetime'] = date('Y-m-d H:i:s',substr($line['time'],0,10));
+			$data['datetime'] = date('Y-m-d H:i:s', substr($line['time'], 0, 10));
 			$data['id_source'] = $id_source;
 			$data['format_source'] = 'blitzortung';
 			$SI->add($data);
 			if ($globalDebug) echo '☈ Lightning added'."\n";
-			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
+			$Source->addLocation('', $data['latitude'], $data['longitude'], 0, '', '', 'blitzortung', 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime']);
 			unset($data);
 		    }
 		}
@@ -1430,11 +1430,11 @@ 
 		    //$value = $formats[$nb];
 		    $format = $globalSources[$nb]['format'];
 		    if ($format === 'sbs' || $format === 'aprs' || $format === 'famaprs' || $format === 'raw' || $format === 'tsv' || $format === 'acarssbs3') {
-			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
+			$buffer = @socket_read($r, 6000, PHP_NORMAL_READ);
 		    } elseif ($format === 'vrstcp') {
 			$buffer = @socket_read($r, 6000);
 		    } else {
-			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
+			$az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port);
 		    }
 		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
 		    //echo $buffer."\n";
@@ -1444,8 +1444,8 @@ 
 		    //$SI::del();
 		    if ($buffer !== FALSE) {
 			if ($format === 'vrstcp') {
-			    $buffer = explode('},{',$buffer);
-			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
+			    $buffer = explode('},{', $buffer);
+			} else $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer));
 		    }
 		    // SBS format is CSV format
 		    if ($buffer !== FALSE && $buffer !== '') {
@@ -1469,7 +1469,7 @@ 
 			    $ais_data = $AIS->parse_line(trim($buffer));
 			    $data = array();
 			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
+			    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'], -9);
 			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
 			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
 			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
@@ -1480,13 +1480,13 @@ 
 			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
 			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
 			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
+			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
 			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
 			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
 			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
 
 			    if (isset($ais_data['timestamp'])) {
-				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
+				$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
 			    } else {
 				$data['datetime'] = date('Y-m-d H:i:s');
 			    }
@@ -1497,10 +1497,10 @@ 
                         } elseif ($format === 'flightgearsp') {
                     	    //echo $buffer."\n";
                     	    if (strlen($buffer) > 5) {
-				$line = explode(',',$buffer);
+				$line = explode(',', $buffer);
 				$data = array();
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
-				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6);
+				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6);
 				$data['ident'] = $line[6];
 				$data['aircraft_name'] = $line[7];
 				$data['longitude'] = $line[1];
@@ -1517,16 +1517,16 @@ 
                         } elseif ($format === 'acars') {
                     	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
 			    $ACARS->add(trim($buffer));
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+			    socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port);
 			    $ACARS->deleteLiveAcarsData();
 			} elseif ($format === 'flightgearmp') {
-			    if (substr($buffer,0,1) != '#') {
+			    if (substr($buffer, 0, 1) != '#') {
 				$data = array();
 				//echo $buffer."\n";
-				$line = explode(' ',$buffer);
+				$line = explode(' ', $buffer);
 				if (count($line) === 11) {
-				    $userserver = explode('@',$line[0]);
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
+				    $userserver = explode('@', $line[0]);
+				    $data['hex'] = substr(str_pad(bin2hex($line[0]), 6, '000000', STR_PAD_LEFT), 0, 6); // hex
 				    $data['ident'] = $userserver[0];
 				    $data['registration'] = $userserver[0];
 				    $data['latitude'] = $line[4];
@@ -1534,8 +1534,8 @@ 
 				    $data['altitude'] = $line[6];
 				    $data['datetime'] = date('Y-m-d H:i:s');
 				    $aircraft_type = $line[10];
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
+				    $aircraft_type = preg_split(':/:', $aircraft_type);
+				    $data['aircraft_name'] = substr(end($aircraft_type), 0, -4);
 				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
 				    if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
 				}
@@ -1544,8 +1544,8 @@ 
 			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
 			    die;
 			} elseif ($format === 'vrstcp') {
-			    foreach($buffer as $all_data) {
-				$line = json_decode('{'.$all_data.'}',true);
+			    foreach ($buffer as $all_data) {
+				$line = json_decode('{'.$all_data.'}', true);
 				$data = array();
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
 				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
@@ -1571,16 +1571,16 @@ 
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
 				unset($data);
 			    }
-			} elseif ($format === 'tsv' || substr($buffer,0,4) === 'clock') {
+			} elseif ($format === 'tsv' || substr($buffer, 0, 4) === 'clock') {
 			    $line = explode("\t", $buffer);
-			    for($k = 0; $k < count($line); $k=$k+2) {
+			    for ($k = 0; $k < count($line); $k = $k + 2) {
 				$key = $line[$k];
-			        $lined[$key] = $line[$k+1];
+			        $lined[$key] = $line[$k + 1];
 			    }
     			    if (count($lined) > 3) {
     				$data['hex'] = $lined['hexid'];
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
-    				$data['datetime'] = date('Y-m-d H:i:s');;
+    				$data['datetime'] = date('Y-m-d H:i:s'); ;
     				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
     				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
     				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
@@ -1599,23 +1599,23 @@ 
     			    } else $error = true;
 			} elseif ($format === 'aprs' && $use_aprs) {
 			    if ($aprs_connect === 0) {
-				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
+				$send = @ socket_send($r, $aprs_login, strlen($aprs_login), 0);
 				$aprs_connect = 1;
 			    }
 			    
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
+			    if ($aprs_keep > 60 && time() - $aprs_last_tx > $aprs_keep) {
 				$aprs_last_tx = time();
 				$data_aprs = "# Keep alive";
-				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
+				$send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0);
 			    }
 			    
 			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
 			    //echo 'APRS data : '.$buffer."\n";
-			    $buffer = str_replace('APRS <- ','',$buffer);
-			    $buffer = str_replace('APRS -> ','',$buffer);
+			    $buffer = str_replace('APRS <- ', '', $buffer);
+			    $buffer = str_replace('APRS -> ', '', $buffer);
 			    //echo $buffer."\n";
 			    date_default_timezone_set('UTC');
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
+			    if (substr($buffer, 0, 1) != '#' && substr($buffer, 0, 1) != '@' && substr($buffer, 0, 5) != 'APRS ') {
 				$line = $APRS->parse($buffer);
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
@@ -1630,7 +1630,7 @@ 
 				    if (isset($line['arrival_date'])) $data['arrival_date'] = $line['arrival_date'];
 				    if (isset($line['typeid'])) $data['type_id'] = $line['typeid'];
 				    if (isset($line['statusid'])) $data['status_id'] = $line['statusid'];
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
+				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']);
 				    else $data['datetime'] = date('Y-m-d H:i:s');
 				    //$data['datetime'] = date('Y-m-d H:i:s');
 				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
@@ -1713,29 +1713,29 @@ 
 				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
 					if (!isset($data['altitude'])) $data['altitude'] = 0;
 					$Source->deleteOldLocationByType('gs');
-					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'gs')) > 0) {
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']);
 					} else {
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']);
 					}
 				    } elseif (isset($line['symbol']) && $line['symbol'] === 'Weather Station') {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
 					if ($globalDebug) echo '# Weather Station added'."\n";
 					$Source->deleteOldLocationByType('wx');
 					$weather_data = json_encode($line);
-					if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) {
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'wx')) > 0) {
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data);
 					} else {
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data);
 					}
 				    } elseif (isset($line['symbol']) && ($line['symbol'] === 'Lightning' || $line['symbol'] === 'Thunderstorm')) {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
 					if ($globalDebug) echo '☈ Lightning added'."\n";
 					$Source->deleteOldLocationByType('lightning');
-					if (count($Source->getLocationInfoByNameType($data['ident'],'lightning')) > 0) {
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'lightning')) > 0) {
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']);
 					} else {
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']);
 					}
 				    } elseif ($globalDebug) {
 				    	echo '/!\ Not added: '.$buffer."\n";
@@ -1744,7 +1744,7 @@ 
 				    unset($data);
 				}
 				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
-					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
+					$Source->updateLocationDescByName($line['ident'], $line['source'], $id, $line['comment']);
 				}
 				/*
 				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] === 'Car' || $line['symbol'] === 'Ambulance' || $line['symbol'] === 'Van' || $line['symbol'] === 'Truck' || $line['symbol'] === 'Truck (18 Wheeler)' || $line['symbol'] === 'Motorcycle')) {
@@ -1753,7 +1753,7 @@ 
 				*/
 				//elseif ($line === false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
 				elseif ($line === true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
-				if (isset($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) {
+				if (isset($globalSources[$nb]['last_weather_clean']) && time() - $globalSources[$nb]['last_weather_clean'] > 60*5) {
 					$Source->deleteOldLocationByType('lightning');
 					$Source->deleteOldLocationByType('wx');
 					$globalSources[$nb]['last_weather_clean'] = time();
@@ -1838,7 +1838,7 @@ 
 				connect_all($sourceee);
 				$sourceee = array();
 				//connect_all($globalSources);
-				$tt[$format]=0;
+				$tt[$format] = 0;
 				break;
 			    } 
 			    //else if ($globalDebug) echo "Trying again (".$tt[$format]."x) ".$format."...";
@@ -1848,14 +1848,14 @@ 
 	    } else {
 		$error = socket_strerror(socket_last_error());
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
+			if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n";
 			if (isset($globalDebug)) echo "Restarting...\n";
 			// Restart the script if possible
 			if (is_array($sockets)) {
 			    if ($globalDebug) echo "Shutdown all sockets...";
 			    
 			    foreach ($sockets as $sock) {
-				@socket_shutdown($sock,2);
+				@socket_shutdown($sock, 2);
 				@socket_close($sock);
 			    }
 			    

Indentation +1054 added lines, -1054 removed lines

@@ -16,8 +16,8 @@ 
 require_once(dirname(__FILE__).'/../require/class.Common.php');
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
 if (isset($globalMarine) && $globalMarine) {
-    require_once(dirname(__FILE__).'/../require/class.AIS.php');
-    require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
+	require_once(dirname(__FILE__).'/../require/class.AIS.php');
+	require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
 }
 
 if (!isset($globalDebug)) $globalDebug = FALSE;
@@ -25,46 +25,46 @@ 
 // Check if schema is at latest version
 $Connection = new Connection();
 if ($Connection->connectionExists() === false) {
-    echo "Can't connect to your database. Check DB is running, user/password and database logs.";
-    exit();
+	echo "Can't connect to your database. Check DB is running, user/password and database logs.";
+	exit();
 }
 if ($Connection->latest() === false) {
-    echo "You MUST update to latest schema. Run install/index.php";
-    exit();
+	echo "You MUST update to latest schema. Run install/index.php";
+	exit();
 }
 if (PHP_SAPI != 'cli') {
-    echo "This script MUST be called from console, not a web browser.";
+	echo "This script MUST be called from console, not a web browser.";
 //    exit();
 }
 
 // This is to be compatible with old version of settings.php
 if (!isset($globalSources)) {
-    if (isset($globalSBS1Hosts)) {
-        //$hosts = $globalSBS1Hosts;
-        foreach ($globalSBS1Hosts as $host) {
-	    $globalSources[] = array('host' => $host);
-    	}
-    } else {
-        if (!isset($globalSBS1Host)) {
-	    echo '$globalSources MUST be defined !';
-	    die;
+	if (isset($globalSBS1Hosts)) {
+		//$hosts = $globalSBS1Hosts;
+		foreach ($globalSBS1Hosts as $host) {
+		$globalSources[] = array('host' => $host);
+		}
+	} else {
+		if (!isset($globalSBS1Host)) {
+		echo '$globalSources MUST be defined !';
+		die;
 	}
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
 	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
-    }
+	}
 }
 
 $options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver','enable-aircraft','disable-aircraft','enable-tracker','disable-tracker','enable-marine','disable-marine'));
 //if (isset($options['s'])) $hosts = array($options['s']);
 //elseif (isset($options['source'])) $hosts = array($options['source']);
 if (isset($options['s'])) {
-    $globalSources = array();
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
-    else $globalSources[] = array('host' => $options['s']);
+	$globalSources = array();
+	if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
+	else $globalSources[] = array('host' => $options['s']);
 } elseif (isset($options['source'])) {
-    $globalSources = array();
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
-    else $globalSources[] = array('host' => $options['source']);
+	$globalSources = array();
+	if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
+	else $globalSources[] = array('host' => $options['source']);
 }
 if (isset($options['aprsserverhost'])) {
 	$globalServerAPRS = TRUE;
@@ -103,8 +103,8 @@ 
 if (isset($options['idsource'])) $id_source = $options['idsource'];
 else $id_source = 1;
 if (isset($globalServer) && $globalServer) {
-    if ($globalDebug) echo "Using Server Mode\n";
-    $SI=new SpotterServer();
+	if ($globalDebug) echo "Using Server Mode\n";
+	$SI=new SpotterServer();
 /*
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
     $SI = new adsb2aprs();
@@ -114,14 +114,14 @@ 
 
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
 if (isset($globalMarine) && $globalMarine) {
-    require_once(dirname(__FILE__).'/../require/class.AIS.php');
-    require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
+	require_once(dirname(__FILE__).'/../require/class.AIS.php');
+	require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
 }
 
 if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
 if (isset($globalMarine) && $globalMarine) {
-    $AIS = new AIS();
-    $MI = new MarineImport($Connection->db);
+	$AIS = new AIS();
+	$MI = new MarineImport($Connection->db);
 }
 //$APRS=new APRS($Connection->db);
 $SBS=new SBS();
@@ -134,12 +134,12 @@ 
 //$servertz = system('date +%Z');
 // signal handler - playing nice with sockets and dump1090
 if (function_exists('pcntl_fork')) {
-    pcntl_signal(SIGINT,  function() {
-        global $sockets;
-        echo "\n\nctrl-c or kill signal received. Tidying up ... ";
-        die("Bye!\n");
-    });
-    pcntl_signal_dispatch();
+	pcntl_signal(SIGINT,  function() {
+		global $sockets;
+		echo "\n\nctrl-c or kill signal received. Tidying up ... ";
+		die("Bye!\n");
+	});
+	pcntl_signal_dispatch();
 }
 
 // let's try and connect
@@ -149,41 +149,41 @@ 
 $reset = 0;
 
 function connect_all($hosts) {
-    //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
-    global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
-    $reset++;
-    if ($globalDebug) echo 'Connect to all...'."\n";
-    foreach ($hosts as $id => $value) {
+	//global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
+	global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
+	$reset++;
+	if ($globalDebug) echo 'Connect to all...'."\n";
+	foreach ($hosts as $id => $value) {
 	$host = $value['host'];
 	$globalSources[$id]['last_exec'] = 0;
 	// Here we check type of source(s)
 	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
-            if (preg_match('/deltadb.txt$/i',$host)) {
-        	//$formats[$id] = 'deltadbtxt';
-        	$globalSources[$id]['format'] = 'deltadbtxt';
-        	//$last_exec['deltadbtxt'] = 0;
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
-        	//$formats[$id] = 'vatsimtxt';
-        	$globalSources[$id]['format'] = 'vatsimtxt';
-        	//$last_exec['vatsimtxt'] = 0;
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
-        	//$formats[$id] = 'aircraftlistjson';
-        	$globalSources[$id]['format'] = 'aircraftlistjson';
-        	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
-    	    } else if (preg_match('/aircraft.json$/i',$host)) {
-        	//$formats[$id] = 'aircraftjson';
-        	$globalSources[$id]['format'] = 'aircraftjson';
-        	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
-    	    } else if (preg_match('/opensky/i',$host)) {
-        	//$formats[$id] = 'aircraftlistjson';
-        	$globalSources[$id]['format'] = 'opensky';
-        	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
-    	    /*
+			if (preg_match('/deltadb.txt$/i',$host)) {
+			//$formats[$id] = 'deltadbtxt';
+			$globalSources[$id]['format'] = 'deltadbtxt';
+			//$last_exec['deltadbtxt'] = 0;
+			if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
+			} else if (preg_match('/vatsim-data.txt$/i',$host)) {
+			//$formats[$id] = 'vatsimtxt';
+			$globalSources[$id]['format'] = 'vatsimtxt';
+			//$last_exec['vatsimtxt'] = 0;
+			if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
+			} else if (preg_match('/aircraftlist.json$/i',$host)) {
+			//$formats[$id] = 'aircraftlistjson';
+			$globalSources[$id]['format'] = 'aircraftlistjson';
+			//$last_exec['aircraftlistjson'] = 0;
+			if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
+			} else if (preg_match('/aircraft.json$/i',$host)) {
+			//$formats[$id] = 'aircraftjson';
+			$globalSources[$id]['format'] = 'aircraftjson';
+			//$last_exec['aircraftlistjson'] = 0;
+			if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
+			} else if (preg_match('/opensky/i',$host)) {
+			//$formats[$id] = 'aircraftlistjson';
+			$globalSources[$id]['format'] = 'opensky';
+			//$last_exec['aircraftlistjson'] = 0;
+			if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
+			/*
     	    // Disabled for now, site change source format
     	    } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) {
         	//$formats[$id] = 'radarvirtueljson';
@@ -195,125 +195,125 @@ 
         	    exit(0);
         	}
     	    */
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
-        	//$formats[$id] = 'planeupdatefaa';
-        	$globalSources[$id]['format'] = 'planeupdatefaa';
-        	//$last_exec['planeupdatefaa'] = 0;
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
-        	    exit(0);
-        	}
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
-        	//$formats[$id] = 'phpvmacars';
-        	$globalSources[$id]['format'] = 'phpvmacars';
-        	//$last_exec['phpvmacars'] = 0;
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
-            } else if (preg_match('/\/api\/v1\/acars\/data$/i',$host)) {
-        	//$formats[$id] = 'phpvmacars';
-        	$globalSources[$id]['format'] = 'vaos';
-        	//$last_exec['phpvmacars'] = 0;
-        	if ($globalDebug) echo "Connect to vaos source (".$host.")...\n";
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
-        	//$formats[$id] = 'phpvmacars';
-        	$globalSources[$id]['format'] = 'vam';
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
-            } else if (preg_match('/whazzup/i',$host)) {
-        	//$formats[$id] = 'whazzup';
-        	$globalSources[$id]['format'] = 'whazzup';
-        	//$last_exec['whazzup'] = 0;
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
-            } else if (preg_match('/blitzortung/i',$host)) {
-        	$globalSources[$id]['format'] = 'blitzortung';
-        	if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
-            } else if (preg_match('/airwhere/i',$host)) {
-        	$globalSources[$id]['format'] = 'airwhere';
-        	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
-            } else if (preg_match('/recentpireps/i',$host)) {
-        	//$formats[$id] = 'pirepsjson';
-        	$globalSources[$id]['format'] = 'pirepsjson';
-        	//$last_exec['pirepsjson'] = 0;
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
-        	//$formats[$id] = 'fr24json';
-        	$globalSources[$id]['format'] = 'fr24json';
-        	//$last_exec['fr24json'] = 0;
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
-        	    exit(0);
-        	}
-            } else if (preg_match(':myshiptracking.com/:i',$host)) {
-        	//$formats[$id] = 'fr24json';
-        	$globalSources[$id]['format'] = 'myshiptracking';
-        	//$last_exec['fr24json'] = 0;
-        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
-        	    exit(0);
-        	}
-            //} else if (preg_match('/10001/',$host)) {
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
-        	//$formats[$id] = 'tsv';
-        	$globalSources[$id]['format'] = 'tsv';
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
-            }
-        } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
-    		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
-    		    if ($idf !== false) {
-    			$httpfeeds[$id] = $idf;
-        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
-    		    } elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
-    		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
-	    $hostport = explode(':',$host);
-	    if (isset($hostport[1])) {
+			} else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
+			//$formats[$id] = 'planeupdatefaa';
+			$globalSources[$id]['format'] = 'planeupdatefaa';
+			//$last_exec['planeupdatefaa'] = 0;
+			if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
+				exit(0);
+			}
+			} else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
+			//$formats[$id] = 'phpvmacars';
+			$globalSources[$id]['format'] = 'phpvmacars';
+			//$last_exec['phpvmacars'] = 0;
+			if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
+			} else if (preg_match('/\/api\/v1\/acars\/data$/i',$host)) {
+			//$formats[$id] = 'phpvmacars';
+			$globalSources[$id]['format'] = 'vaos';
+			//$last_exec['phpvmacars'] = 0;
+			if ($globalDebug) echo "Connect to vaos source (".$host.")...\n";
+			} else if (preg_match('/VAM-json.php$/i',$host)) {
+			//$formats[$id] = 'phpvmacars';
+			$globalSources[$id]['format'] = 'vam';
+			if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
+			} else if (preg_match('/whazzup/i',$host)) {
+			//$formats[$id] = 'whazzup';
+			$globalSources[$id]['format'] = 'whazzup';
+			//$last_exec['whazzup'] = 0;
+			if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
+			} else if (preg_match('/blitzortung/i',$host)) {
+			$globalSources[$id]['format'] = 'blitzortung';
+			if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
+			} else if (preg_match('/airwhere/i',$host)) {
+			$globalSources[$id]['format'] = 'airwhere';
+			if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
+			} else if (preg_match('/recentpireps/i',$host)) {
+			//$formats[$id] = 'pirepsjson';
+			$globalSources[$id]['format'] = 'pirepsjson';
+			//$last_exec['pirepsjson'] = 0;
+			if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
+			} else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
+			//$formats[$id] = 'fr24json';
+			$globalSources[$id]['format'] = 'fr24json';
+			//$last_exec['fr24json'] = 0;
+			if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
+				exit(0);
+			}
+			} else if (preg_match(':myshiptracking.com/:i',$host)) {
+			//$formats[$id] = 'fr24json';
+			$globalSources[$id]['format'] = 'myshiptracking';
+			//$last_exec['fr24json'] = 0;
+			if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
+				exit(0);
+			}
+			//} else if (preg_match('/10001/',$host)) {
+			} else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
+			//$formats[$id] = 'tsv';
+			$globalSources[$id]['format'] = 'tsv';
+			if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
+			}
+		} elseif (filter_var($host,FILTER_VALIDATE_URL)) {
+			if ($globalSources[$id]['format'] == 'aisnmeahttp') {
+				$idf = fopen($globalSources[$id]['host'],'r',false,$context);
+				if ($idf !== false) {
+				$httpfeeds[$id] = $idf;
+				if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
+				} elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
+			} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
+		} elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
+		$hostport = explode(':',$host);
+		if (isset($hostport[1])) {
 		$port = $hostport[1];
 		$hostn = $hostport[0];
-	    } else {
+		} else {
 		$port = $globalSources[$id]['port'];
 		$hostn = $globalSources[$id]['host'];
-	    }
-	    $Common = new Common();
-	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
-    	    } else {
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
-	    }
-	    if ($s) {
-    	        $sockets[$id] = $s;
-    	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
+		}
+		$Common = new Common();
+		if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
+			$s = $Common->create_socket($hostn,$port, $errno, $errstr);
+			} else {
+			$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
+		}
+		if ($s) {
+				$sockets[$id] = $s;
+				if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
+			if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
 			//$formats[$id] = 'aprs';
 			$globalSources[$id]['format'] = 'aprs';
 			//$aprs_connect = 0;
 			//$use_aprs = true;
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
+			} elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
 			$globalSources[$id]['format'] = 'vrstcp';
-    		    } elseif ($port == '10001') {
-        		//$formats[$id] = 'tsv';
-        		$globalSources[$id]['format'] = 'tsv';
-		    } elseif ($port == '30002') {
-        		//$formats[$id] = 'raw';
-        		$globalSources[$id]['format'] = 'raw';
-		    } elseif ($port == '5001') {
-        		//$formats[$id] = 'raw';
-        		$globalSources[$id]['format'] = 'flightgearmp';
-		    } elseif ($port == '30005') {
+				} elseif ($port == '10001') {
+				//$formats[$id] = 'tsv';
+				$globalSources[$id]['format'] = 'tsv';
+			} elseif ($port == '30002') {
+				//$formats[$id] = 'raw';
+				$globalSources[$id]['format'] = 'raw';
+			} elseif ($port == '5001') {
+				//$formats[$id] = 'raw';
+				$globalSources[$id]['format'] = 'flightgearmp';
+			} elseif ($port == '30005') {
 			// Not yet supported
-        		//$formats[$id] = 'beast';
-        		$globalSources[$id]['format'] = 'beast';
-		    //} else $formats[$id] = 'sbs';
-		    } else $globalSources[$id]['format'] = 'sbs';
-		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
+				//$formats[$id] = 'beast';
+				$globalSources[$id]['format'] = 'beast';
+			//} else $formats[$id] = 'sbs';
+			} else $globalSources[$id]['format'] = 'sbs';
+			//if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
 		}
 		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
-            } else {
+			} else {
 		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
-    	    }
-        }
-    }
+			}
+		}
+	}
 }
 if (!isset($globalMinFetch)) $globalMinFetch = 15;
 
@@ -336,9 +336,9 @@ 
 //connect_all($globalSources);
 
 if (isset($globalProxy) && $globalProxy) {
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
+	$context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
 } else {
-    $context = stream_context_create(array('http' => array('timeout' => $timeout)));
+	$context = stream_context_create(array('http' => array('timeout' => $timeout)));
 }
 
 // APRS Configuration
@@ -347,21 +347,21 @@ 
 	die;
 }
 foreach ($globalSources as $key => $source) {
-    if (!isset($source['format'])) {
-        $globalSources[$key]['format'] = 'auto';
-    }
-    if (isset($source['callback']) && $source['callback'] === TRUE) {
-        unset($globalSources[$key]);
-    }
+	if (!isset($source['format'])) {
+		$globalSources[$key]['format'] = 'auto';
+	}
+	if (isset($source['callback']) && $source['callback'] === TRUE) {
+		unset($globalSources[$key]);
+	}
 }
 connect_all($globalSources);
 foreach ($globalSources as $key => $source) {
-    if (isset($source['format']) && $source['format'] == 'aprs') {
+	if (isset($source['format']) && $source['format'] == 'aprs') {
 	$aprs_connect = 0;
 	$use_aprs = true;
 	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
 	break;
-    }
+	}
 }
 
 if ($use_aprs) {
@@ -402,133 +402,133 @@ 
 
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
 while ($i > 0) {
-    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
+	if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
 
-    if (!$globalDaemon) $i = $endtime-time();
-    // Delete old ATC
-    if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
+	if (!$globalDaemon) $i = $endtime-time();
+	// Delete old ATC
+	if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
-        $ATC->deleteOldATC();
-    }
+		$ATC->deleteOldATC();
+	}
     
-    if (count($last_exec) == count($globalSources)) {
+	if (count($last_exec) == count($globalSources)) {
 	$max = $globalMinFetch;
 	foreach ($last_exec as $last) {
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
+		if ((time() - $last['last']) < $max) $max = time() - $last['last'];
 	}
 	if ($max < $globalMinFetch) {
-	    if ($globalDebug) echo 'Sleeping...'."\n";
-	    sleep($globalMinFetch-$max+2);
+		if ($globalDebug) echo 'Sleeping...'."\n";
+		sleep($globalMinFetch-$max+2);
+	}
 	}
-    }
 
     
-    //foreach ($formats as $id => $value) {
-    foreach ($globalSources as $id => $value) {
+	//foreach ($formats as $id => $value) {
+	foreach ($globalSources as $id => $value) {
 	date_default_timezone_set('UTC');
 	//if ($globalDebug) echo 'Source host : '.$value['host'].' - Source format: '.$value['format']."\n";
 	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
 	if ($value['format'] === 'deltadbtxt' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-	    )
+		)
 	) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host']);
-	    if ($buffer != '') $reset = 0;
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
-	    foreach ($buffer as $line) {
-    		if ($line != '' && count($line) > 7) {
-    		    $line = explode(',', $line);
-	            $data = array();
-	            $data['hex'] = $line[1]; // hex
-	            $data['ident'] = $line[2]; // ident
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
-	            $data['verticalrate'] = ''; // vertical rate
-	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
-	            $data['emergency'] = ''; // emergency
-		    $data['datetime'] = date('Y-m-d H:i:s');
-		    $data['format_source'] = 'deltadbtxt';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
-    		    $SI->add($data);
-		    unset($data);
-    		}
-    	    }
-    	    $last_exec[$id]['last'] = time();
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host']);
+		if ($buffer != '') $reset = 0;
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
+		$buffer = explode('\n',$buffer);
+		foreach ($buffer as $line) {
+			if ($line != '' && count($line) > 7) {
+				$line = explode(',', $line);
+				$data = array();
+				$data['hex'] = $line[1]; // hex
+				$data['ident'] = $line[2]; // ident
+				if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
+				if (isset($line[4])) $data['speed'] = $line[4]; // speed
+				if (isset($line[5])) $data['heading'] = $line[5]; // heading
+				if (isset($line[6])) $data['latitude'] = $line[6]; // lat
+				if (isset($line[7])) $data['longitude'] = $line[7]; // long
+				$data['verticalrate'] = ''; // vertical rate
+				//if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
+				$data['emergency'] = ''; // emergency
+			$data['datetime'] = date('Y-m-d H:i:s');
+			$data['format_source'] = 'deltadbtxt';
+				$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
+				$SI->add($data);
+			unset($data);
+			}
+			}
+			$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] === 'aisnmeatxt' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
-	    )
+		)
 	) {
-	    date_default_timezone_set('CET');
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
-	    date_default_timezone_set('UTC');
-	    if ($buffer != '') $reset = 0;
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
-	    foreach ($buffer as $line) {
+		date_default_timezone_set('CET');
+		$buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
+		date_default_timezone_set('UTC');
+		if ($buffer != '') $reset = 0;
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
+		$buffer = explode('\n',$buffer);
+		foreach ($buffer as $line) {
 		if ($line != '') {
-		    //echo "'".$line."'\n";
-		    $add = false;
-		    $ais_data = $AIS->parse_line(trim($line));
-		    $data = array();
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
-		    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
-		    if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid'];
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
-		    if (isset($ais_data['timestamp'])) {
+			//echo "'".$line."'\n";
+			$add = false;
+			$ais_data = $AIS->parse_line(trim($line));
+			$data = array();
+			if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
+			if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
+			if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
+			if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
+			if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
+			if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
+			if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
+			if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
+			if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
+			if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid'];
+			if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
+			if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
+			if (isset($ais_data['timestamp'])) {
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
-			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
-			    $add = true;
+				$last_exec[$id]['timestamp'] = $ais_data['timestamp'];
+				$add = true;
 			}
-		    } else {
+			} else {
 			$data['datetime'] = date('Y-m-d H:i:s');
 			$add = true;
-		    }
-		    $data['format_source'] = 'aisnmeatxt';
-    		    $data['id_source'] = $id_source;
-		    //print_r($data);
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
-		    unset($data);
+			}
+			$data['format_source'] = 'aisnmeatxt';
+				$data['id_source'] = $id_source;
+			//print_r($data);
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
+			unset($data);
 		}
-    	    }
-    	    $last_exec[$id]['last'] = time();
+			}
+			$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] === 'aisnmeahttp') {
-	    $arr = $httpfeeds;
-	    $w = $e = null;
+		$arr = $httpfeeds;
+		$w = $e = null;
 	    
-	    if (isset($arr[$id])) {
+		if (isset($arr[$id])) {
 		$nn = stream_select($arr,$w,$e,$timeout);
 		if ($nn > 0) {
-		    foreach ($httpfeeds as $feed) {
+			foreach ($httpfeeds as $feed) {
 			$buffer = stream_get_line($feed,2000,"\n");
 			if ($buffer === FALSE) {
-			    connect_all($globalSources);
+				connect_all($globalSources);
 			}
 			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
 			$buffer = explode('\n',$buffer);
 			foreach ($buffer as $line) {
-			    if ($line != '') {
+				if ($line != '') {
 				$ais_data = $AIS->parse_line(trim($line));
 				$data = array();
 				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
@@ -546,117 +546,117 @@ 
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
 				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
 				if (isset($ais_data['timestamp'])) {
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
+					$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
 				} else {
-				    $data['datetime'] = date('Y-m-d H:i:s');
+					$data['datetime'] = date('Y-m-d H:i:s');
 				}
 				$data['format_source'] = 'aisnmeahttp';
 				$data['id_source'] = $id_source;
 				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
 				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
 				unset($data);
-			    }
+				}
+			}
 			}
-		    }
 		} else {
-		    $format = $value['format'];
-		    if (isset($tt[$format])) $tt[$format]++;
-		    else $tt[$format] = 0;
-		    if ($tt[$format] > 30) {
+			$format = $value['format'];
+			if (isset($tt[$format])) $tt[$format]++;
+			else $tt[$format] = 0;
+			if ($tt[$format] > 30) {
 			if ($globalDebug) echo 'Reconnect...'."\n";
 			sleep(2);
 			//$sourceeen[] = $value;
 			//connect_all($sourceeen);
 			//$sourceeen = array();
 			connect_all($globalSources);
-		    }
+			}
+		}
 		}
-	    }
 	} elseif ($value['format'] === 'myshiptracking' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
-	    )
+		)
 	) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
-	    if ($buffer != '') {
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
+		if ($buffer != '') {
 		//echo $buffer;
 		$all_data = json_decode($buffer,true);
 		//print_r($all_data);
 		if (isset($all_data[0]['DATA'])) {
-		    foreach ($all_data[0]['DATA'] as $line) {
+			foreach ($all_data[0]['DATA'] as $line) {
 			if ($line != '') {
-			    $data = array();
-			    $data['ident'] = $line['NAME'];
-			    $data['mmsi'] = $line['MMSI'];
-			    if (strlen($data['mmsi']) > 9) {
+				$data = array();
+				$data['ident'] = $line['NAME'];
+				$data['mmsi'] = $line['MMSI'];
+				if (strlen($data['mmsi']) > 9) {
 				$data['mmsi'] = substr($data['mmsi'],-9);
-			    }
-			    $data['speed'] = $line['SOG'];
-			    $data['heading'] = $line['COG'];
-			    $data['latitude'] = $line['LAT'];
-			    $data['longitude'] = $line['LNG'];
-			    //    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
-			    //$data['type_id'] = $line['TYPE'];
-			    $data['imo'] = $line['IMO'];
-			    if ($line['DEST'] != '') $data['arrival_code'] = $line['DEST'];
-			    if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
-			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
-			    $data['format_source'] = 'myshiptracking';
-			    $data['id_source'] = $id_source;
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-			    $MI->add($data);
-			    unset($data);
+				}
+				$data['speed'] = $line['SOG'];
+				$data['heading'] = $line['COG'];
+				$data['latitude'] = $line['LAT'];
+				$data['longitude'] = $line['LNG'];
+				//    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
+				//$data['type_id'] = $line['TYPE'];
+				$data['imo'] = $line['IMO'];
+				if ($line['DEST'] != '') $data['arrival_code'] = $line['DEST'];
+				if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
+				$data['datetime'] = date('Y-m-d H:i:s',$line['T']);
+				$data['format_source'] = 'myshiptracking';
+				$data['id_source'] = $id_source;
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+				$MI->add($data);
+				unset($data);
 			}
-		    }
+			}
+		}
 		}
-	    }
-	    $last_exec[$id]['last'] = time();
+		$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] === 'boatbeaconapp' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
-	    )
+		)
 	) {
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
-	    if ($buffer != '') {
+		$buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
+		if ($buffer != '') {
 		$all_data = json_decode($buffer,true);
 		if (isset($all_data[0]['mmsi'])) {
-		    foreach ($all_data as $line) {
+			foreach ($all_data as $line) {
 			if ($line != '') {
-			    $data = array();
-			    $data['ident'] = $line['shipname'];
-			    $data['callsign'] = $line['callsign'];
-			    $data['mmsi'] = substr($line['mmsi'],-9);
-			    $data['speed'] = $line['sog'];
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
-			    $data['latitude'] = $line['latitude'];
-			    $data['longitude'] = $line['longitude'];
-			    $data['type_id'] = $line['shiptype'];
-			    $data['arrival_code'] = $line['destination'];
-			    $data['datetime'] = $line['time'];
-			    $data['format_source'] = 'boatbeaconapp';
-			    $data['id_source'] = $id_source;
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-			    $MI->add($data);
-			    unset($data);
+				$data = array();
+				$data['ident'] = $line['shipname'];
+				$data['callsign'] = $line['callsign'];
+				$data['mmsi'] = substr($line['mmsi'],-9);
+				$data['speed'] = $line['sog'];
+				if ($line['heading'] != '511') $data['heading'] = $line['heading'];
+				$data['latitude'] = $line['latitude'];
+				$data['longitude'] = $line['longitude'];
+				$data['type_id'] = $line['shiptype'];
+				$data['arrival_code'] = $line['destination'];
+				$data['datetime'] = $line['time'];
+				$data['format_source'] = 'boatbeaconapp';
+				$data['id_source'] = $id_source;
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+				$MI->add($data);
+				unset($data);
+			}
 			}
-		    }
 		}
 		
-	    }
-    	    $last_exec[$id]['last'] = time();
+		}
+			$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] === 'boatnerd' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
-	    )
+		)
 	) {
-	    $buffer = $Common->getData($value['host']);
-	    if ($buffer != '') {
+		$buffer = $Common->getData($value['host']);
+		if ($buffer != '') {
 		$all_data = json_decode($buffer,true);
 		if (isset($all_data['features'][0]['id'])) {
-		    foreach ($all_data['features'] as $line) {
+			foreach ($all_data['features'] as $line) {
 			print_r($line);
 			$data = array();
 			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
@@ -676,80 +676,80 @@ 
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
 			if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data);
 			unset($data);
-		    }
+			}
 		}
 		
-	    }
-    	    $last_exec[$id]['last'] = time();
+		}
+			$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] === 'shipplotter' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
-	    )
+		)
 	) {
-	    echo 'download...';
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
-	    echo 'done !'."\n";
-	    // FIXME: Need more work
-	    if ($buffer != '') $reset = 0;
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
-	    foreach ($buffer as $line) {
+		echo 'download...';
+		$buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
+		echo 'done !'."\n";
+		// FIXME: Need more work
+		if ($buffer != '') $reset = 0;
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
+		$buffer = explode('\n',$buffer);
+		foreach ($buffer as $line) {
 		if ($line != '') {
-		    $data = array();
-		    echo $line."\n";
-		    $data['mmsi'] = (int)substr($line,0,9);
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
-		    $data['status_id'] = substr($line,21,2);
-		    $data['type_id'] = substr($line,24,3);
-		    $data['latitude'] = substr($line,29,9);
-		    $data['longitude'] = substr($line,41,9);
-		    $data['speed'] = round(substr($line,51,5));
-		    //$data['course'] = substr($line,57,5);
-		    $data['heading'] = round(substr($line,63,3));
-		    //$data['draft'] = substr($line,67,4);
-		    //$data['length'] = substr($line,72,3);
-		    //$data['beam'] = substr($line,76,2);
-		    $data['ident'] = trim(utf8_encode(substr($line,78,20)));
-		    //$data['callsign'] = trim(substr($line,100,7);
-		    $data['arrival_code'] = substr($line,108,20);
-		    //$data['etaDate'] = substr($line,129,5);
-		    //$data['etaTime'] = substr($line,135,5);
-		    $data['format_source'] = 'shipplotter';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    //print_r($data);
-		    echo 'Add...'."\n";
-		    $MI->add($data);
-		    unset($data);
+			$data = array();
+			echo $line."\n";
+			$data['mmsi'] = (int)substr($line,0,9);
+			$data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
+			$data['status_id'] = substr($line,21,2);
+			$data['type_id'] = substr($line,24,3);
+			$data['latitude'] = substr($line,29,9);
+			$data['longitude'] = substr($line,41,9);
+			$data['speed'] = round(substr($line,51,5));
+			//$data['course'] = substr($line,57,5);
+			$data['heading'] = round(substr($line,63,3));
+			//$data['draft'] = substr($line,67,4);
+			//$data['length'] = substr($line,72,3);
+			//$data['beam'] = substr($line,76,2);
+			$data['ident'] = trim(utf8_encode(substr($line,78,20)));
+			//$data['callsign'] = trim(substr($line,100,7);
+			$data['arrival_code'] = substr($line,108,20);
+			//$data['etaDate'] = substr($line,129,5);
+			//$data['etaTime'] = substr($line,135,5);
+			$data['format_source'] = 'shipplotter';
+				$data['id_source'] = $id_source;
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			//print_r($data);
+			echo 'Add...'."\n";
+			$MI->add($data);
+			unset($data);
 		}
-    	    }
-    	    $last_exec[$id]['last'] = time();
+			}
+			$last_exec[$id]['last'] = time();
 	//} elseif (($value === 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value === 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) {
 	} elseif (
-	    (
+		(
 		$value['format'] === 'whazzup' && 
 		(
-		    (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
-		    (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
+			(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
+			(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
 		)
-	    ) || (
+		) || (
 		$value['format'] === 'vatsimtxt' && 
 		(
-		    (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
-		    (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
+			(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
+			(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
+		)
 		)
-	    )
 	) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host']);
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
-	    $reset = 0;
-	    foreach ($buffer as $line) {
-    		if ($line != '') {
-    		    $line = explode(':', $line);
-    		    if (count($line) > 30 && $line[0] != 'callsign') {
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host']);
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
+		$buffer = explode('\n',$buffer);
+		$reset = 0;
+		foreach ($buffer as $line) {
+			if ($line != '') {
+				$line = explode(':', $line);
+				if (count($line) > 30 && $line[0] != 'callsign') {
 			$data = array();
 			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
@@ -762,37 +762,37 @@ 
 			if (isset($line[45])) $data['heading'] = $line[45]; // heading
 			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
 			$data['latitude'] = $line[5]; // lat
-	        	$data['longitude'] = $line[6]; // long
-	        	$data['verticalrate'] = ''; // vertical rate
-	        	$data['squawk'] = ''; // squawk
-	        	$data['emergency'] = ''; // emergency
-	        	$data['waypoints'] = $line[30];
+				$data['longitude'] = $line[6]; // long
+				$data['verticalrate'] = ''; // vertical rate
+				$data['squawk'] = ''; // squawk
+				$data['emergency'] = ''; // emergency
+				$data['waypoints'] = $line[30];
 			$data['datetime'] = date('Y-m-d H:i:s');
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
 			//if (isset($line[37])) $data['last_update'] = $line[37];
-		        $data['departure_airport_icao'] = $line[11];
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
-		        $data['arrival_airport_icao'] = $line[13];
+				$data['departure_airport_icao'] = $line[11];
+				$data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
+				$data['arrival_airport_icao'] = $line[13];
 			$data['frequency'] = $line[4];
 			$data['type'] = $line[18];
 			$data['range'] = $line[19];
 			if (isset($line[35])) $data['info'] = $line[35];
-    			$data['id_source'] = $id_source;
-	    		//$data['arrival_airport_time'] = ;
-	    		if ($line[9] != '') {
-	    		    $aircraft_data = explode('/',$line[9]);
-	    		    if (isset($aircraft_data[1])) {
-	    			$data['aircraft_icao'] = $aircraft_data[1];
-	    		    }
-        		}
-	    		/*
+				$data['id_source'] = $id_source;
+				//$data['arrival_airport_time'] = ;
+				if ($line[9] != '') {
+					$aircraft_data = explode('/',$line[9]);
+					if (isset($aircraft_data[1])) {
+					$data['aircraft_icao'] = $aircraft_data[1];
+					}
+				}
+				/*
 	    		if ($value === 'whazzup') $data['format_source'] = 'whazzup';
 	    		elseif ($value === 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
 	    		*/
-	    		$data['format_source'] = $value['format'];
+				$data['format_source'] = $value['format'];
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-    			if ($line[3] === 'PILOT') $SI->add($data);
+				if ($line[3] === 'PILOT') $SI->add($data);
 			elseif ($line[3] === 'ATC') {
 				//print_r($data);
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
@@ -813,21 +813,21 @@ 
 					else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
 				}
 			}
-    			unset($data);
-    		    }
-    		}
-    	    }
-    	    //if ($value === 'whazzup') $last_exec['whazzup'] = time();
-    	    //elseif ($value === 'vatsimtxt') $last_exec['vatsimtxt'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	} elseif ($value['format'] === 'airwhere' && 
-    	    (
-    		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
-    		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-    	    )
-    	) {
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
-	    if ($buffer != '') {
+				unset($data);
+				}
+			}
+			}
+			//if ($value === 'whazzup') $last_exec['whazzup'] = time();
+			//elseif ($value === 'vatsimtxt') $last_exec['vatsimtxt'] = time();
+			$last_exec[$id]['last'] = time();
+		} elseif ($value['format'] === 'airwhere' && 
+			(
+			(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
+			(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
+			)
+		) {
+		$buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
+		if ($buffer != '') {
 		$all_data = simplexml_load_string($buffer);
 		foreach($all_data->children() as $childdata) {
 			$data = array();
@@ -849,10 +849,10 @@ 
 			$SI->add($data);
 			unset($data);
 		}
-	    }
-	    $Source->deleteOldLocationByType('gs');
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
-	    if ($buffer != '') {
+		}
+		$Source->deleteOldLocationByType('gs');
+		$buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
+		if ($buffer != '') {
 		$all_data = simplexml_load_string($buffer);
 		foreach($all_data->children() as $childdata) {
 			$data = array();
@@ -870,8 +870,8 @@ 
 			}
 			unset($data);
 		}
-	    }
-	    $last_exec[$id]['last'] = time();
+		}
+		$last_exec[$id]['last'] = time();
 	/*
 	} if ($value['format'] === 'aircraftlistjson') {
 	    print_r($globalSources);
@@ -879,17 +879,17 @@ 
 	    echo $globalMinFetch;
 	*/
 	} elseif ($value['format'] === 'aircraftlistjson' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-	    )
+		)
 	) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
-	    if ($buffer != '') {
-	        $all_data = json_decode($buffer,true);
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
+		if ($buffer != '') {
+			$all_data = json_decode($buffer,true);
 		if (isset($all_data['acList'])) {
-		    $reset = 0;
-		    foreach ($all_data['acList'] as $line) {
+			$reset = 0;
+			foreach ($all_data['acList'] as $line) {
 			$data = array();
 			$data['hex'] = $line['Icao']; // hex
 			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
@@ -912,10 +912,10 @@ 
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
 			if (isset($data['latitude'])) $SI->add($data);
 			unset($data);
-		    }
+			}
 		} elseif (is_array($all_data)) {
-		    $reset = 0;
-		    foreach ($all_data as $line) {
+			$reset = 0;
+			foreach ($all_data as $line) {
 			$data = array();
 			$data['hex'] = $line['hex']; // hex
 			$data['ident'] = $line['flight']; // ident
@@ -935,252 +935,252 @@ 
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
 			$SI->add($data);
 			unset($data);
-		    }
+			}
 		}
-	    } elseif ($globalDebug) echo 'No data'."\n";
-    	    //$last_exec['aircraftlistjson'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value === 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
-    	} elseif ($value['format'] === 'planeupdatefaa' && 
-    	    (
-    		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
-    		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-    	    )
-    	) {
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['planes'])) {
+		} elseif ($globalDebug) echo 'No data'."\n";
+			//$last_exec['aircraftlistjson'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value === 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
+		} elseif ($value['format'] === 'planeupdatefaa' && 
+			(
+			(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
+			(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
+			)
+		) {
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['planes'])) {
 		$reset = 0;
 		foreach ($all_data['planes'] as $key => $line) {
-		    $data = array();
-		    $data['hex'] = $key; // hex
-		    $data['ident'] = $line[3]; // ident
-		    $data['altitude'] = $line[6]; // altitude
-		    $data['speed'] = $line[8]; // speed
-		    $data['heading'] = $line[7]; // heading
-		    $data['latitude'] = $line[4]; // lat
-		    $data['longitude'] = $line[5]; // long
-		    //$data['verticalrate'] = $line[]; // verticale rate
-		    $data['squawk'] = $line[10]; // squawk
-		    $data['emergency'] = ''; // emergency
-		    $data['registration'] = $line[2];
-		    $data['aircraft_icao'] = $line[0];
-		    $deparr = explode('-',$line[1]);
-		    if (count($deparr) === 2) {
+			$data = array();
+			$data['hex'] = $key; // hex
+			$data['ident'] = $line[3]; // ident
+			$data['altitude'] = $line[6]; // altitude
+			$data['speed'] = $line[8]; // speed
+			$data['heading'] = $line[7]; // heading
+			$data['latitude'] = $line[4]; // lat
+			$data['longitude'] = $line[5]; // long
+			//$data['verticalrate'] = $line[]; // verticale rate
+			$data['squawk'] = $line[10]; // squawk
+			$data['emergency'] = ''; // emergency
+			$data['registration'] = $line[2];
+			$data['aircraft_icao'] = $line[0];
+			$deparr = explode('-',$line[1]);
+			if (count($deparr) === 2) {
 			$data['departure_airport_icao'] = $deparr[0];
 			$data['arrival_airport_icao'] = $deparr[1];
-		    }
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
-	    	    $data['format_source'] = 'planeupdatefaa';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+			}
+			$data['datetime'] = date('Y-m-d H:i:s',$line[9]);
+				$data['format_source'] = 'planeupdatefaa';
+				$data['id_source'] = $id_source;
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
 		}
-	    }
-	    //$last_exec['planeupdatefaa'] = time();
-	    $last_exec[$id]['last'] = time();
+		}
+		//$last_exec['planeupdatefaa'] = time();
+		$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] === 'opensky' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-	    )
+		)
 	) {
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['states'])) {
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['states'])) {
 		$reset = 0;
 		foreach ($all_data['states'] as $key => $line) {
-		    $data = array();
-		    $data['hex'] = $line[0]; // hex
-		    $data['ident'] = trim($line[1]); // ident
-		    $data['altitude'] = round($line[7]*3.28084); // altitude
-		    $data['speed'] = round($line[9]*1.94384); // speed
-		    $data['heading'] = round($line[10]); // heading
-		    $data['latitude'] = $line[6]; // lat
-		    $data['longitude'] = $line[5]; // long
-		    $data['verticalrate'] = $line[11]; // verticale rate
-		    //$data['squawk'] = $line[10]; // squawk
-		    //$data['emergency'] = ''; // emergency
-		    //$data['registration'] = $line[2];
-		    //$data['aircraft_icao'] = $line[0];
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
-		    $data['format_source'] = 'opensky';
-		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			$data['hex'] = $line[0]; // hex
+			$data['ident'] = trim($line[1]); // ident
+			$data['altitude'] = round($line[7]*3.28084); // altitude
+			$data['speed'] = round($line[9]*1.94384); // speed
+			$data['heading'] = round($line[10]); // heading
+			$data['latitude'] = $line[6]; // lat
+			$data['longitude'] = $line[5]; // long
+			$data['verticalrate'] = $line[11]; // verticale rate
+			//$data['squawk'] = $line[10]; // squawk
+			//$data['emergency'] = ''; // emergency
+			//$data['registration'] = $line[2];
+			//$data['aircraft_icao'] = $line[0];
+			$data['datetime'] = date('Y-m-d H:i:s',$line[3]);
+			$data['format_source'] = 'opensky';
+			$data['id_source'] = $id_source;
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			$SI->add($data);
+			unset($data);
 		}
-	    }
-	    //$last_exec['planeupdatefaa'] = time();
-	    $last_exec[$id]['last'] = time();
+		}
+		//$last_exec['planeupdatefaa'] = time();
+		$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] === 'aircraftjson' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-	    )
+		)
 	) {
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['aircraft'])) {
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['aircraft'])) {
 		$reset = 0;
 		foreach ($all_data['aircraft'] as $key => $line) {
-		    $data = array();
-		    if (isset($line['hex'])) $data['hex'] = $line['hex']; // hex
-		    if (isset($line['flight'])) $data['ident'] = trim($line['flight']); // ident
-		    if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
-		    if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
-		    if (isset($line['track'])) $data['heading'] = $line['track']; // heading
-		    if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
-		    if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
-		    if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
-		    if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
-		    //$data['emergency'] = ''; // emergency
-		    //$data['registration'] = $line[2];
-		    //$data['aircraft_icao'] = $line[0];
-		    $data['datetime'] = date('Y-m-d H:i:s');
-		    $data['format_source'] = 'aircraftjson';
-		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			if (isset($line['hex'])) $data['hex'] = $line['hex']; // hex
+			if (isset($line['flight'])) $data['ident'] = trim($line['flight']); // ident
+			if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
+			if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
+			if (isset($line['track'])) $data['heading'] = $line['track']; // heading
+			if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
+			if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
+			if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
+			if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
+			//$data['emergency'] = ''; // emergency
+			//$data['registration'] = $line[2];
+			//$data['aircraft_icao'] = $line[0];
+			$data['datetime'] = date('Y-m-d H:i:s');
+			$data['format_source'] = 'aircraftjson';
+			$data['id_source'] = $id_source;
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			$SI->add($data);
+			unset($data);
 		}
-	    }
-	    //$last_exec['planeupdatefaa'] = time();
-	    $last_exec[$id]['last'] = time();
+		}
+		//$last_exec['planeupdatefaa'] = time();
+		$last_exec[$id]['last'] = time();
 	//} elseif ($value === 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
 	} elseif ($value['format'] === 'fr24json' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-	    )
+		)
 	) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (!empty($all_data)) $reset = 0;
-	    foreach ($all_data as $key => $line) {
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if (!empty($all_data)) $reset = 0;
+		foreach ($all_data as $key => $line) {
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
-		    $data = array();
-		    $data['hex'] = $line[0];
-		    $data['ident'] = $line[16]; //$line[13]
-	    	    $data['altitude'] = $line[4]; // altitude
-	    	    $data['speed'] = $line[5]; // speed
-	    	    $data['heading'] = $line[3]; // heading
-	    	    $data['latitude'] = $line[1]; // lat
-	    	    $data['longitude'] = $line[2]; // long
-	    	    $data['verticalrate'] = $line[15]; // verticale rate
-	    	    $data['squawk'] = $line[6]; // squawk
-	    	    $data['aircraft_icao'] = $line[8];
-	    	    $data['registration'] = $line[9];
-		    $data['departure_airport_iata'] = $line[11];
-		    $data['arrival_airport_iata'] = $line[12];
-	    	    $data['emergency'] = ''; // emergency
-		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
-	    	    $data['format_source'] = 'fr24json';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			$data['hex'] = $line[0];
+			$data['ident'] = $line[16]; //$line[13]
+				$data['altitude'] = $line[4]; // altitude
+				$data['speed'] = $line[5]; // speed
+				$data['heading'] = $line[3]; // heading
+				$data['latitude'] = $line[1]; // lat
+				$data['longitude'] = $line[2]; // long
+				$data['verticalrate'] = $line[15]; // verticale rate
+				$data['squawk'] = $line[6]; // squawk
+				$data['aircraft_icao'] = $line[8];
+				$data['registration'] = $line[9];
+			$data['departure_airport_iata'] = $line[11];
+			$data['arrival_airport_iata'] = $line[12];
+				$data['emergency'] = ''; // emergency
+			$data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
+				$data['format_source'] = 'fr24json';
+				$data['id_source'] = $id_source;
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
+		}
 		}
-	    }
-	    //$last_exec['fr24json'] = time();
-	    $last_exec[$id]['last'] = time();
+		//$last_exec['fr24json'] = time();
+		$last_exec[$id]['last'] = time();
 	//} elseif ($value === 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
 	} elseif ($value['format'] === 'radarvirtueljson' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-	    )
+		)
 	) {
-	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
-	    //echo $buffer;
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
-	    $all_data = json_decode($buffer,true);
-	    if (json_last_error() != JSON_ERROR_NONE) {
+		//$buffer = $Common->getData($hosts[$id],'get','','','','','150');
+		$buffer = $Common->getData($value['host'],'get','','','','','150');
+		//echo $buffer;
+		$buffer = str_replace(array("\n","\r"),"",$buffer);
+		$buffer = preg_replace('/,"num":(.+)/','}',$buffer);
+		$all_data = json_decode($buffer,true);
+		if (json_last_error() != JSON_ERROR_NONE) {
 		die(json_last_error_msg());
-	    }
-	    if (isset($all_data['mrkrs'])) {
+		}
+		if (isset($all_data['mrkrs'])) {
 		$reset = 0;
 		foreach ($all_data['mrkrs'] as $key => $line) {
-		    if (isset($line['inf'])) {
+			if (isset($line['inf'])) {
 			$data = array();
 			$data['hex'] = $line['inf']['ia'];
 			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
-	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
-	    		$data['latitude'] = $line['pt'][0]; // lat
-	    		$data['longitude'] = $line['pt'][1]; // long
-	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
-	    		//$data['aircraft_icao'] = $line[8];
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
+				$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
+				if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
+				if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
+				$data['latitude'] = $line['pt'][0]; // lat
+				$data['longitude'] = $line['pt'][1]; // long
+				//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
+				if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
+				//$data['aircraft_icao'] = $line[8];
+				if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
 			//$data['departure_airport_iata'] = $line[11];
 			//$data['arrival_airport_iata'] = $line[12];
-	    		//$data['emergency'] = ''; // emergency
+				//$data['emergency'] = ''; // emergency
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
-	    		$data['format_source'] = 'radarvirtueljson';
-    			$data['id_source'] = $id_source;
+				$data['format_source'] = 'radarvirtueljson';
+				$data['id_source'] = $id_source;
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
 			$SI->add($data);
 			unset($data);
-		    }
+			}
+		}
 		}
-	    }
-	    //$last_exec['radarvirtueljson'] = time();
-	    $last_exec[$id]['last'] = time();
+		//$last_exec['radarvirtueljson'] = time();
+		$last_exec[$id]['last'] = time();
 	//} elseif ($value === 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
 	} elseif ($value['format'] === 'pirepsjson' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-	    )
+		)
 	) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host'].'?'.time());
-	    $all_data = json_decode(utf8_encode($buffer),true);
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host'].'?'.time());
+		$all_data = json_decode(utf8_encode($buffer),true);
 	    
-	    if (isset($all_data['pireps'])) {
+		if (isset($all_data['pireps'])) {
 		$reset = 0;
-	        foreach ($all_data['pireps'] as $line) {
-		    $data = array();
-		    $data['id'] = $line['id'];
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
-		    $data['ident'] = $line['callsign']; // ident
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
-		    $data['latitude'] = $line['lat']; // lat
-		    $data['longitude'] = $line['lon']; // long
-		    //$data['verticalrate'] = $line['vrt']; // verticale rate
-		    //$data['squawk'] = $line['squawk']; // squawk
-		    //$data['emergency'] = ''; // emergency
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
-		    //$data['arrival_airport_time'] = $line['arrtime'];
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
-		    else $data['info'] = '';
-		    $data['format_source'] = 'pireps';
-    		    $data['id_source'] = $id_source;
-		    $data['datetime'] = date('Y-m-d H:i:s');
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if ($line['icon'] === 'plane') {
+			foreach ($all_data['pireps'] as $line) {
+			$data = array();
+			$data['id'] = $line['id'];
+			$data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
+			$data['ident'] = $line['callsign']; // ident
+			if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
+			if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
+			if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
+			if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
+			if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+			$data['latitude'] = $line['lat']; // lat
+			$data['longitude'] = $line['lon']; // long
+			//$data['verticalrate'] = $line['vrt']; // verticale rate
+			//$data['squawk'] = $line['squawk']; // squawk
+			//$data['emergency'] = ''; // emergency
+			if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
+			if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
+			if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
+			//$data['arrival_airport_time'] = $line['arrtime'];
+			if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
+			if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
+			if (isset($line['atis'])) $data['info'] = $line['atis'];
+			else $data['info'] = '';
+			$data['format_source'] = 'pireps';
+				$data['id_source'] = $id_source;
+			$data['datetime'] = date('Y-m-d H:i:s');
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if ($line['icon'] === 'plane') {
 			$SI->add($data);
-		    //    print_r($data);
-    		    } elseif ($line['icon'] === 'ct') {
+			//    print_r($data);
+				} elseif ($line['icon'] === 'ct') {
 			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
 			$typec = substr($data['ident'],-3);
@@ -1195,209 +1195,209 @@ 
 			elseif ($typec === 'CTR') $data['type'] = 'Control Radar or Centre';
 			else $data['type'] = 'Observer';
 			if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
-		    }
-		    unset($data);
+			}
+			unset($data);
+		}
 		}
-	    }
-	    //$last_exec['pirepsjson'] = time();
-	    $last_exec[$id]['last'] = time();
+		//$last_exec['pirepsjson'] = time();
+		$last_exec[$id]['last'] = time();
 	//} elseif ($value === 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
 	} elseif ($value['format'] === 'phpvmacars' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-	    )
+		)
 	) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if ($buffer != '' && is_array($all_data)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		if ($globalDebug) echo 'Get Data...'."\n";
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if ($buffer != '' && is_array($all_data)) {
 		$reset = 0;
 		foreach ($all_data as $line) {
-	    	    $data = array();
-	    	    //$data['id'] = $line['id']; // id not usable
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
-	    	    $data['ident'] = $line['flightnum']; // ident
-	    	    $data['altitude'] = $line['alt']; // altitude
-	    	    $data['speed'] = $line['gs']; // speed
-	    	    $data['heading'] = $line['heading']; // heading
-	    	    $data['latitude'] = $line['lat']; // lat
-	    	    $data['longitude'] = $line['lng']; // long
-	    	    $data['verticalrate'] = ''; // verticale rate
-	    	    $data['squawk'] = ''; // squawk
-	    	    $data['emergency'] = ''; // emergency
-	    	    //$data['datetime'] = $line['lastupdate'];
-	    	    //$data['last_update'] = $line['lastupdate'];
-	    	    if (isset($value['timezone'])) {
-	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
-	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
-	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
-	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
-	    	    $data['departure_airport_icao'] = $line['depicao'];
-	    	    $data['departure_airport_time'] = $line['deptime'];
-	    	    $data['arrival_airport_icao'] = $line['arricao'];
-    		    $data['arrival_airport_time'] = $line['arrtime'];
-    		    if (isset($line['registration'])) {
-    			$data['registration'] = $line['registration'];
-    			//if (isset($line['aircraft'])) $data['id'] = $line['aircraft'];
-    		    } else $data['registration'] = $line['aircraft'];
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
-		    if (isset($line['aircraftname'])) {
+				$data = array();
+				//$data['id'] = $line['id']; // id not usable
+				if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
+				$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
+				if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
+				if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
+				$data['ident'] = $line['flightnum']; // ident
+				$data['altitude'] = $line['alt']; // altitude
+				$data['speed'] = $line['gs']; // speed
+				$data['heading'] = $line['heading']; // heading
+				$data['latitude'] = $line['lat']; // lat
+				$data['longitude'] = $line['lng']; // long
+				$data['verticalrate'] = ''; // verticale rate
+				$data['squawk'] = ''; // squawk
+				$data['emergency'] = ''; // emergency
+				//$data['datetime'] = $line['lastupdate'];
+				//$data['last_update'] = $line['lastupdate'];
+				if (isset($value['timezone'])) {
+				$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
+				$datetime->setTimeZone(new DateTimeZone('UTC'));
+				$data['datetime'] = $datetime->format('Y-m-d H:i:s');
+				} else $data['datetime'] = date('Y-m-d H:i:s');
+				$data['departure_airport_icao'] = $line['depicao'];
+				$data['departure_airport_time'] = $line['deptime'];
+				$data['arrival_airport_icao'] = $line['arricao'];
+				$data['arrival_airport_time'] = $line['arrtime'];
+				if (isset($line['registration'])) {
+				$data['registration'] = $line['registration'];
+				//if (isset($line['aircraft'])) $data['id'] = $line['aircraft'];
+				} else $data['registration'] = $line['aircraft'];
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+			if (isset($line['aircraftname'])) {
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
-	    		$aircraft_data = explode('-',$line['aircraftname']);
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
-	    		else {
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
-	    		}
-	    	    }
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
-    		    $data['id_source'] = $id_source;
-	    	    $data['format_source'] = 'phpvmacars';
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+				$aircraft_data = explode('-',$line['aircraftname']);
+				if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
+				elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
+				else {
+					$aircraft_data = explode(' ',$line['aircraftname']);
+					if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
+					else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
+				}
+				}
+				if (isset($line['route'])) $data['waypoints'] = $line['route'];
+				$data['id_source'] = $id_source;
+				$data['format_source'] = 'phpvmacars';
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
 		}
 		if ($globalDebug) echo 'No more data...'."\n";
 		unset($buffer);
 		unset($all_data);
-	    }
-	    //$last_exec['phpvmacars'] = time();
-	    $last_exec[$id]['last'] = time();
+		}
+		//$last_exec['phpvmacars'] = time();
+		$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] === 'vaos' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-	    )
+		)
 	) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if ($buffer != '' && is_array($all_data) && isset($all_data['ACARSData'])) {
+		//$buffer = $Common->getData($hosts[$id]);
+		if ($globalDebug) echo 'Get Data...'."\n";
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if ($buffer != '' && is_array($all_data) && isset($all_data['ACARSData'])) {
 		$reset = 0;
 		foreach ($all_data['ACARSData'] as $line) {
-		    //print_r($line);
-	    	    $data = array();
-	    	    //$data['id'] = $line['id']; // id not usable
-	    	    $data['id'] = $line['id'];
-	    	    //$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
-	    	    if (isset($line['user']['username'])) $data['pilot_name'] = $line['user']['username'];
-	    	    if (isset($line['user_id'])) $data['pilot_id'] = $line['user_id'];
-	    	    $data['ident'] = str_replace(' ','',$line['bid']['flightnum']); // ident
-	    	    if (is_numeric($data['ident'])) $data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
-	    	    $data['altitude'] = $line['altitude']; // altitude
-	    	    $data['speed'] = $line['groundspeed']; // speed
-	    	    $data['heading'] = $line['heading']; // heading
-	    	    $data['latitude'] = $line['lat']; // lat
-	    	    $data['longitude'] = $line['lon']; // long
-	    	    //$data['verticalrate'] = ''; // verticale rate
-	    	    //$data['squawk'] = ''; // squawk
-	    	    //$data['emergency'] = ''; // emergency
-	    	    if (isset($value['timezone'])) {
-	    		$datetime = new DateTime($line['updated_at'],new DateTimeZone($value['timezone']));
-	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
-	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
-	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
+			//print_r($line);
+				$data = array();
+				//$data['id'] = $line['id']; // id not usable
+				$data['id'] = $line['id'];
+				//$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
+				if (isset($line['user']['username'])) $data['pilot_name'] = $line['user']['username'];
+				if (isset($line['user_id'])) $data['pilot_id'] = $line['user_id'];
+				$data['ident'] = str_replace(' ','',$line['bid']['flightnum']); // ident
+				if (is_numeric($data['ident'])) $data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
+				$data['altitude'] = $line['altitude']; // altitude
+				$data['speed'] = $line['groundspeed']; // speed
+				$data['heading'] = $line['heading']; // heading
+				$data['latitude'] = $line['lat']; // lat
+				$data['longitude'] = $line['lon']; // long
+				//$data['verticalrate'] = ''; // verticale rate
+				//$data['squawk'] = ''; // squawk
+				//$data['emergency'] = ''; // emergency
+				if (isset($value['timezone'])) {
+				$datetime = new DateTime($line['updated_at'],new DateTimeZone($value['timezone']));
+				$datetime->setTimeZone(new DateTimeZone('UTC'));
+				$data['datetime'] = $datetime->format('Y-m-d H:i:s');
+				} else $data['datetime'] = date('Y-m-d H:i:s');
 	    	    
-	    	    $data['departure_airport_icao'] = $line['bid']['depapt']['icao'];
-	    	    $data['departure_airport_time'] = $line['bid']['deptime'];
-	    	    $data['arrival_airport_icao'] = $line['bid']['arrapt']['icao'];
-		    $data['arrival_airport_time'] = $line['bid']['arrtime'];
-		    $data['registration'] = $line['bid']['aircraft']['registration'];
+				$data['departure_airport_icao'] = $line['bid']['depapt']['icao'];
+				$data['departure_airport_time'] = $line['bid']['deptime'];
+				$data['arrival_airport_icao'] = $line['bid']['arrapt']['icao'];
+			$data['arrival_airport_time'] = $line['bid']['arrtime'];
+			$data['registration'] = $line['bid']['aircraft']['registration'];
 
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($line['bid']['route']) && $line['bid']['route'] != '') $data['waypoints'] = $line['bid']['route']; // route
-	    	    $data['aircraft_icao'] = $line['bid']['aircraft']['icao'];
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($line['bid']['route']) && $line['bid']['route'] != '') $data['waypoints'] = $line['bid']['route']; // route
+				$data['aircraft_icao'] = $line['bid']['aircraft']['icao'];
 
-    		    $data['id_source'] = $id_source;
-	    	    $data['format_source'] = 'vaos';
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+				$data['id_source'] = $id_source;
+				$data['format_source'] = 'vaos';
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
 		}
 		if ($globalDebug) echo 'No more data...'."\n";
 		unset($buffer);
 		unset($all_data);
-	    }
-	    //$last_exec['phpvmacars'] = time();
-	    $last_exec[$id]['last'] = time();
+		}
+		//$last_exec['phpvmacars'] = time();
+		$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] === 'vam' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-	    )
+		)
 	) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if ($buffer != '' && is_array($all_data)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		if ($globalDebug) echo 'Get Data...'."\n";
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if ($buffer != '' && is_array($all_data)) {
 		$reset = 0;
 		foreach ($all_data as $line) {
-	    	    $data = array();
-	    	    //$data['id'] = $line['id']; // id not usable
-	    	    $data['id'] = trim($line['flight_id']);
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
-	    	    $data['pilot_name'] = $line['pilot_name'];
-	    	    $data['pilot_id'] = $line['pilot_id'];
-	    	    $data['ident'] = trim($line['callsign']); // ident
-	    	    $data['altitude'] = $line['altitude']; // altitude
-	    	    $data['speed'] = $line['gs']; // speed
-	    	    $data['heading'] = $line['heading']; // heading
-	    	    $data['latitude'] = $line['latitude']; // lat
-	    	    $data['longitude'] = $line['longitude']; // long
-	    	    $data['verticalrate'] = ''; // verticale rate
-	    	    $data['squawk'] = ''; // squawk
-	    	    $data['emergency'] = ''; // emergency
-	    	    //$data['datetime'] = $line['lastupdate'];
-	    	    $data['last_update'] = $line['last_update'];
-		    $data['datetime'] = date('Y-m-d H:i:s');
-	    	    $data['departure_airport_icao'] = $line['departure'];
-	    	    //$data['departure_airport_time'] = $line['departure_time'];
-	    	    $data['arrival_airport_icao'] = $line['arrival'];
-    		    //$data['arrival_airport_time'] = $line['arrival_time'];
-    		    //$data['registration'] = $line['aircraft'];
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
-	    	    $data['aircraft_icao'] = $line['plane_type'];
-    		    $data['id_source'] = $id_source;
-	    	    $data['format_source'] = 'vam';
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+				$data = array();
+				//$data['id'] = $line['id']; // id not usable
+				$data['id'] = trim($line['flight_id']);
+				$data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
+				$data['pilot_name'] = $line['pilot_name'];
+				$data['pilot_id'] = $line['pilot_id'];
+				$data['ident'] = trim($line['callsign']); // ident
+				$data['altitude'] = $line['altitude']; // altitude
+				$data['speed'] = $line['gs']; // speed
+				$data['heading'] = $line['heading']; // heading
+				$data['latitude'] = $line['latitude']; // lat
+				$data['longitude'] = $line['longitude']; // long
+				$data['verticalrate'] = ''; // verticale rate
+				$data['squawk'] = ''; // squawk
+				$data['emergency'] = ''; // emergency
+				//$data['datetime'] = $line['lastupdate'];
+				$data['last_update'] = $line['last_update'];
+			$data['datetime'] = date('Y-m-d H:i:s');
+				$data['departure_airport_icao'] = $line['departure'];
+				//$data['departure_airport_time'] = $line['departure_time'];
+				$data['arrival_airport_icao'] = $line['arrival'];
+				//$data['arrival_airport_time'] = $line['arrival_time'];
+				//$data['registration'] = $line['aircraft'];
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+				$data['aircraft_icao'] = $line['plane_type'];
+				$data['id_source'] = $id_source;
+				$data['format_source'] = 'vam';
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
 		}
 		if ($globalDebug) echo 'No more data...'."\n";
 		unset($buffer);
 		unset($all_data);
-	    }
-	    //$last_exec['phpvmacars'] = time();
-	    $last_exec[$id]['last'] = time();
+		}
+		//$last_exec['phpvmacars'] = time();
+		$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] === 'blitzortung' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-	    )
+		)
 	) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if ($buffer != '') {
+		//$buffer = $Common->getData($hosts[$id]);
+		if ($globalDebug) echo 'Get Data...'."\n";
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if ($buffer != '') {
 		$Source->deleteLocationBySource('blitzortung');
 		$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
 		$buffer = explode('\n',$buffer);
 		foreach ($buffer as $buffer_line) {
-		    $line = json_decode($buffer_line,true);
-		    if (isset($line['time'])) {
+			$line = json_decode($buffer_line,true);
+			if (isset($line['time'])) {
 			$data = array();
 			$data['altitude'] = $line['alt']; // altitude
 			$data['latitude'] = $line['lat']; // lat
@@ -1409,94 +1409,94 @@ 
 			if ($globalDebug) echo '☈ Lightning added'."\n";
 			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
 			unset($data);
-		    }
+			}
 		}
 		if ($globalDebug) echo 'No more data...'."\n";
 		unset($buffer);
-	    }
-	    $last_exec[$id]['last'] = time();
+		}
+		$last_exec[$id]['last'] = time();
 	//} elseif ($value === 'sbs' || $value === 'tsv' || $value === 'raw' || $value === 'aprs' || $value === 'beast') {
 	} elseif ($value['format'] === 'sbs' || $value['format'] === 'tsv' || $value['format'] === 'raw' || $value['format'] === 'aprs' || $value['format'] === 'famaprs' || $value['format'] === 'beast' || $value['format'] === 'flightgearmp' || $value['format'] === 'flightgearsp' || $value['format'] === 'acars' || $value['format'] === 'acarssbs3' || $value['format'] === 'ais' || $value['format'] === 'vrstcp') {
-	    //$last_exec[$id]['last'] = time();
-	    //$read = array( $sockets[$id] );
-	    $read = $sockets;
-	    $write = NULL;
-	    $e = NULL;
-	    $n = socket_select($read, $write, $e, $timeout);
-	    if ($e != NULL) var_dump($e);
-	    if ($n > 0) {
+		//$last_exec[$id]['last'] = time();
+		//$read = array( $sockets[$id] );
+		$read = $sockets;
+		$write = NULL;
+		$e = NULL;
+		$n = socket_select($read, $write, $e, $timeout);
+		if ($e != NULL) var_dump($e);
+		if ($n > 0) {
 		$reset = 0;
 		foreach ($read as $nb => $r) {
-		    //$value = $formats[$nb];
-		    $format = $globalSources[$nb]['format'];
-		    if ($format === 'sbs' || $format === 'aprs' || $format === 'famaprs' || $format === 'raw' || $format === 'tsv' || $format === 'acarssbs3') {
+			//$value = $formats[$nb];
+			$format = $globalSources[$nb]['format'];
+			if ($format === 'sbs' || $format === 'aprs' || $format === 'famaprs' || $format === 'raw' || $format === 'tsv' || $format === 'acarssbs3') {
 			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
-		    } elseif ($format === 'vrstcp') {
+			} elseif ($format === 'vrstcp') {
 			$buffer = @socket_read($r, 6000);
-		    } else {
+			} else {
 			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
-		    }
-		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
-		    //echo $buffer."\n";
-		    // lets play nice and handle signals such as ctrl-c/kill properly
-		    //if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
-		    $error = false;
-		    //$SI::del();
-		    if ($buffer !== FALSE) {
+			}
+			//$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
+			//echo $buffer."\n";
+			// lets play nice and handle signals such as ctrl-c/kill properly
+			//if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
+			$error = false;
+			//$SI::del();
+			if ($buffer !== FALSE) {
 			if ($format === 'vrstcp') {
-			    $buffer = explode('},{',$buffer);
+				$buffer = explode('},{',$buffer);
 			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
-		    }
-		    // SBS format is CSV format
-		    if ($buffer !== FALSE && $buffer !== '') {
+			}
+			// SBS format is CSV format
+			if ($buffer !== FALSE && $buffer !== '') {
 			$tt[$format] = 0;
 			if ($format === 'acarssbs3') {
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
-			    $ACARS->add(trim($buffer));
-			    $ACARS->deleteLiveAcarsData();
+				if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+				$ACARS->add(trim($buffer));
+				$ACARS->deleteLiveAcarsData();
 			} elseif ($format === 'raw') {
-			    // AVR format
-			    $data = $SBS->parse($buffer);
-			    if (is_array($data)) {
+				// AVR format
+				$data = $SBS->parse($buffer);
+				if (is_array($data)) {
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'raw';
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
 				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
 				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
-			    }
+				}
 			} elseif ($format === 'ais') {
-			    $ais_data = $AIS->parse_line(trim($buffer));
-			    $data = array();
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
-			    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
-			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+				$ais_data = $AIS->parse_line(trim($buffer));
+				$data = array();
+				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
+				if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
+				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
+				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
+				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
+				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
+				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
+				if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
+				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
+				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
+				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
+				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
+				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
 
-			    if (isset($ais_data['timestamp'])) {
+				if (isset($ais_data['timestamp'])) {
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
-			    } else {
+				} else {
 				$data['datetime'] = date('Y-m-d H:i:s');
-			    }
-			    $data['format_source'] = 'aisnmea';
-    			    $data['id_source'] = $id_source;
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
-			    unset($data);
-                        } elseif ($format === 'flightgearsp') {
-                    	    //echo $buffer."\n";
-                    	    if (strlen($buffer) > 5) {
+				}
+				$data['format_source'] = 'aisnmea';
+					$data['id_source'] = $id_source;
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
+				unset($data);
+						} elseif ($format === 'flightgearsp') {
+							//echo $buffer."\n";
+							if (strlen($buffer) > 5) {
 				$line = explode(',',$buffer);
 				$data = array();
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
@@ -1513,38 +1513,38 @@ 
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
 				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
 				//$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
-			    }
-                        } elseif ($format === 'acars') {
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
-			    $ACARS->add(trim($buffer));
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
-			    $ACARS->deleteLiveAcarsData();
+				}
+						} elseif ($format === 'acars') {
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+				$ACARS->add(trim($buffer));
+				socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+				$ACARS->deleteLiveAcarsData();
 			} elseif ($format === 'flightgearmp') {
-			    if (substr($buffer,0,1) != '#') {
+				if (substr($buffer,0,1) != '#') {
 				$data = array();
 				//echo $buffer."\n";
 				$line = explode(' ',$buffer);
 				if (count($line) === 11) {
-				    $userserver = explode('@',$line[0]);
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
-				    $data['ident'] = $userserver[0];
-				    $data['registration'] = $userserver[0];
-				    $data['latitude'] = $line[4];
-				    $data['longitude'] = $line[5];
-				    $data['altitude'] = $line[6];
-				    $data['datetime'] = date('Y-m-d H:i:s');
-				    $aircraft_type = $line[10];
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-				    if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+					$userserver = explode('@',$line[0]);
+					$data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
+					$data['ident'] = $userserver[0];
+					$data['registration'] = $userserver[0];
+					$data['latitude'] = $line[4];
+					$data['longitude'] = $line[5];
+					$data['altitude'] = $line[6];
+					$data['datetime'] = date('Y-m-d H:i:s');
+					$aircraft_type = $line[10];
+					$aircraft_type = preg_split(':/:',$aircraft_type);
+					$data['aircraft_name'] = substr(end($aircraft_type),0,-4);
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
+					if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+				}
 				}
-			    }
 			} elseif ($format === 'beast') {
-			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
-			    die;
+				echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
+				die;
 			} elseif ($format === 'vrstcp') {
-			    foreach($buffer as $all_data) {
+				foreach($buffer as $all_data) {
 				$line = json_decode('{'.$all_data.'}',true);
 				$data = array();
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
@@ -1564,153 +1564,153 @@ 
 				*/
 				$data['datetime'] = date('Y-m-d H:i:s');
 				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
-		    		$data['format_source'] = 'vrstcp';
+					$data['format_source'] = 'vrstcp';
 				$data['id_source'] = $id_source;
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
 				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
 				unset($data);
-			    }
+				}
 			} elseif ($format === 'tsv' || substr($buffer,0,4) === 'clock') {
-			    $line = explode("\t", $buffer);
-			    for($k = 0; $k < count($line); $k=$k+2) {
+				$line = explode("\t", $buffer);
+				for($k = 0; $k < count($line); $k=$k+2) {
 				$key = $line[$k];
-			        $lined[$key] = $line[$k+1];
-			    }
-    			    if (count($lined) > 3) {
-    				$data['hex'] = $lined['hexid'];
-    				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
-    				$data['datetime'] = date('Y-m-d H:i:s');;
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
-    				$data['id_source'] = $id_source;
-    				$data['format_source'] = 'tsv';
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+					$lined[$key] = $line[$k+1];
+				}
+					if (count($lined) > 3) {
+					$data['hex'] = $lined['hexid'];
+					//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
+					$data['datetime'] = date('Y-m-d H:i:s');;
+					if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
+					if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
+					if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
+					if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
+					if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
+					if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
+					if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
+					$data['id_source'] = $id_source;
+					$data['format_source'] = 'tsv';
+					if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
-    				unset($lined);
-    				unset($data);
-    			    } else $error = true;
+					if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+					unset($lined);
+					unset($data);
+					} else $error = true;
 			} elseif ($format === 'aprs' && $use_aprs) {
-			    if ($aprs_connect === 0) {
+				if ($aprs_connect === 0) {
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
 				$aprs_connect = 1;
-			    }
+				}
 			    
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
+				if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
 				$aprs_last_tx = time();
 				$data_aprs = "# Keep alive";
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
-			    }
+				}
 			    
-			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
-			    //echo 'APRS data : '.$buffer."\n";
-			    $buffer = str_replace('APRS <- ','',$buffer);
-			    $buffer = str_replace('APRS -> ','',$buffer);
-			    //echo $buffer."\n";
-			    date_default_timezone_set('UTC');
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
+				//echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
+				//echo 'APRS data : '.$buffer."\n";
+				$buffer = str_replace('APRS <- ','',$buffer);
+				$buffer = str_replace('APRS -> ','',$buffer);
+				//echo $buffer."\n";
+				date_default_timezone_set('UTC');
+				if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
 				$line = $APRS->parse($buffer);
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
-				    $aprs_last_tx = time();
-				    $data = array();
-				    //print_r($line);
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
-				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
-				    if (isset($line['imo'])) $data['imo'] = $line['imo'];
-				    if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
-				    if (isset($line['arrival_code'])) $data['arrival_code'] = $line['arrival_code'];
-				    if (isset($line['arrival_date'])) $data['arrival_date'] = $line['arrival_date'];
-				    if (isset($line['typeid'])) $data['type_id'] = $line['typeid'];
-				    if (isset($line['statusid'])) $data['status_id'] = $line['statusid'];
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
-				    else $data['datetime'] = date('Y-m-d H:i:s');
-				    //$data['datetime'] = date('Y-m-d H:i:s');
-				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
-				    $data['latitude'] = $line['latitude'];
-				    $data['longitude'] = $line['longitude'];
-				    //$data['verticalrate'] = $line[16];
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
-				    //else $data['speed'] = 0;
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
-				    //if (isset($line['heading'])) $data['heading'] = $line['heading'];
+					$aprs_last_tx = time();
+					$data = array();
+					//print_r($line);
+					if (isset($line['address'])) $data['hex'] = $line['address'];
+					if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
+					if (isset($line['imo'])) $data['imo'] = $line['imo'];
+					if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
+					if (isset($line['arrival_code'])) $data['arrival_code'] = $line['arrival_code'];
+					if (isset($line['arrival_date'])) $data['arrival_date'] = $line['arrival_date'];
+					if (isset($line['typeid'])) $data['type_id'] = $line['typeid'];
+					if (isset($line['statusid'])) $data['status_id'] = $line['statusid'];
+					if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
+					else $data['datetime'] = date('Y-m-d H:i:s');
+					//$data['datetime'] = date('Y-m-d H:i:s');
+					if (isset($line['ident'])) $data['ident'] = $line['ident'];
+					$data['latitude'] = $line['latitude'];
+					$data['longitude'] = $line['longitude'];
+					//$data['verticalrate'] = $line[16];
+					if (isset($line['speed'])) $data['speed'] = $line['speed'];
+					//else $data['speed'] = 0;
+					if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
+					if (isset($line['comment'])) $data['comment'] = $line['comment'];
+					if (isset($line['symbol'])) $data['type'] = $line['symbol'];
+					//if (isset($line['heading'])) $data['heading'] = $line['heading'];
 				    
-				    if (isset($line['heading']) && isset($line['format_source'])) $data['heading'] = $line['heading'];
-				    //else echo 'No heading...'."\n";
-				    //else $data['heading'] = 0;
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
-				    //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
-				    if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
-				    elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-				    elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
-    				    $data['id_source'] = $id_source;
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
-				    else $data['format_source'] = 'aprs';
-				    $data['source_name'] = $line['source'];
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
-				    else $data['source_type'] = 'flarm';
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-				    $currentdate = date('Y-m-d H:i:s');
-				    $aprsdate = strtotime($data['datetime']);
-				    if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';
-				    // Accept data if time <= system time + 20s
-				    //if (($data['source_type'] === 'modes') || isset($line['stealth']) && ($line['stealth'] === 0 || $line['stealth'] === '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
-				    if (($data['source_type'] === 'modes') || isset($line['stealth']) && (!isset($data['hex']) || $data['hex'] != 'FFFFFF') && ($line['stealth'] === 0 || $line['stealth'] === '') && (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
+					if (isset($line['heading']) && isset($line['format_source'])) $data['heading'] = $line['heading'];
+					//else echo 'No heading...'."\n";
+					//else $data['heading'] = 0;
+					if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
+					//if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
+					if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
+					elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
+					elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
+						$data['id_source'] = $id_source;
+						if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
+					else $data['format_source'] = 'aprs';
+					$data['source_name'] = $line['source'];
+					if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
+					else $data['source_type'] = 'flarm';
+						if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+					$currentdate = date('Y-m-d H:i:s');
+					$aprsdate = strtotime($data['datetime']);
+					if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';
+					// Accept data if time <= system time + 20s
+					//if (($data['source_type'] === 'modes') || isset($line['stealth']) && ($line['stealth'] === 0 || $line['stealth'] === '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
+					if (($data['source_type'] === 'modes') || isset($line['stealth']) && (!isset($data['hex']) || $data['hex'] != 'FFFFFF') && ($line['stealth'] === 0 || $line['stealth'] === '') && (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
 					$send = $SI->add($data);
-				    } elseif ($data['source_type'] === 'ais') {
+					} elseif ($data['source_type'] === 'ais') {
 					$data['type'] = '';
 					if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);
-				    } elseif (isset($line['stealth'])) {
+					} elseif (isset($line['stealth'])) {
 					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
 					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
-				    } elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
-					    //$line['symbol'] === 'Balloon' ||
-					    $line['symbol'] === 'Glider' || 
-					    $line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter')) {
-					    if ($line['symbol'] === 'Ballon') $data['aircraft_icao'] = 'BALL';
-					    if ($line['symbol'] === 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';
-					    $send = $SI->add($data);
-				    } elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
-					    $line['symbol'] === 'Yacht (Sail)' || 
-					    $line['symbol'] === 'Ship (Power Boat)')) {
-					    $send = $MI->add($data);
-				    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
-					    $line['symbol'] === 'Car' || 
-					    $line['symbol'] === 'Ambulance' || 
-					    $line['symbol'] === 'Van' || 
-					    $line['symbol'] === 'Truck' || $line['symbol'] === 'Truck (18 Wheeler)' || 
-					    $line['symbol'] === 'Motorcycle' || 
-					    $line['symbol'] === 'Tractor' || 
-					    $line['symbol'] === 'Police' || 
-					    $line['symbol'] === 'Bike' || 
-					    $line['symbol'] === 'Jogger' || 
-					    $line['symbol'] === 'Horse' || 
-					    $line['symbol'] === 'Bus' || 
-					    $line['symbol'] === 'Jeep' || 
-					    $line['symbol'] === 'Recreational Vehicle' || 
-					    $line['symbol'] === 'Yacht (Sail)' || 
-					    $line['symbol'] === 'Ship (Power Boat)' || 
-					    $line['symbol'] === 'Firetruck' || 
-					    $line['symbol'] === 'Balloon' || $line['symbol'] === 'Glider' || 
-					    $line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter' || 
-					    $line['symbol'] === 'SUV' ||
-					    $line['symbol'] === 'Snowmobile' ||
-					    $line['symbol'] === 'Mobile Satellite Station')) {
-				    //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
+					} elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
+						//$line['symbol'] === 'Balloon' ||
+						$line['symbol'] === 'Glider' || 
+						$line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter')) {
+						if ($line['symbol'] === 'Ballon') $data['aircraft_icao'] = 'BALL';
+						if ($line['symbol'] === 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';
+						$send = $SI->add($data);
+					} elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
+						$line['symbol'] === 'Yacht (Sail)' || 
+						$line['symbol'] === 'Ship (Power Boat)')) {
+						$send = $MI->add($data);
+					} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
+						$line['symbol'] === 'Car' || 
+						$line['symbol'] === 'Ambulance' || 
+						$line['symbol'] === 'Van' || 
+						$line['symbol'] === 'Truck' || $line['symbol'] === 'Truck (18 Wheeler)' || 
+						$line['symbol'] === 'Motorcycle' || 
+						$line['symbol'] === 'Tractor' || 
+						$line['symbol'] === 'Police' || 
+						$line['symbol'] === 'Bike' || 
+						$line['symbol'] === 'Jogger' || 
+						$line['symbol'] === 'Horse' || 
+						$line['symbol'] === 'Bus' || 
+						$line['symbol'] === 'Jeep' || 
+						$line['symbol'] === 'Recreational Vehicle' || 
+						$line['symbol'] === 'Yacht (Sail)' || 
+						$line['symbol'] === 'Ship (Power Boat)' || 
+						$line['symbol'] === 'Firetruck' || 
+						$line['symbol'] === 'Balloon' || $line['symbol'] === 'Glider' || 
+						$line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter' || 
+						$line['symbol'] === 'SUV' ||
+						$line['symbol'] === 'Snowmobile' ||
+						$line['symbol'] === 'Mobile Satellite Station')) {
+					//} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
 				//    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
 					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
-				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
+					} elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
 					if (!isset($data['altitude'])) $data['altitude'] = 0;
 					$Source->deleteOldLocationByType('gs');
 					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
@@ -1718,7 +1718,7 @@ 
 					} else {
 						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
 					}
-				    } elseif (isset($line['symbol']) && $line['symbol'] === 'Weather Station') {
+					} elseif (isset($line['symbol']) && $line['symbol'] === 'Weather Station') {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
 					if ($globalDebug) echo '# Weather Station added'."\n";
 					$Source->deleteOldLocationByType('wx');
@@ -1728,7 +1728,7 @@ 
 					} else {
 						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
 					}
-				    } elseif (isset($line['symbol']) && ($line['symbol'] === 'Lightning' || $line['symbol'] === 'Thunderstorm')) {
+					} elseif (isset($line['symbol']) && ($line['symbol'] === 'Lightning' || $line['symbol'] === 'Thunderstorm')) {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
 					if ($globalDebug) echo '☈ Lightning added'."\n";
 					$Source->deleteOldLocationByType('lightning');
@@ -1737,11 +1737,11 @@ 
 					} else {
 						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
 					}
-				    } elseif ($globalDebug) {
-				    	echo '/!\ Not added: '.$buffer."\n";
-				    	print_r($line);
-				    }
-				    unset($data);
+					} elseif ($globalDebug) {
+						echo '/!\ Not added: '.$buffer."\n";
+						print_r($line);
+					}
+					unset($data);
 				}
 				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
 					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
@@ -1760,12 +1760,12 @@ 
 				} elseif (!isset($globalSources[$nb]['last_weather_clean'])) {
 					$globalSources[$nb]['last_weather_clean'] = time();
 				}
-			    }
+				}
 			} else {
-			    $line = explode(',', $buffer);
-    			    if (count($line) > 20) {
-    			    	$data['hex'] = $line[4];
-    				/*
+				$line = explode(',', $buffer);
+					if (count($line) > 20) {
+						$data['hex'] = $line[4];
+					/*
     				$data['datetime'] = $line[6].' '.$line[7];
     					date_default_timezone_set($globalTimezone);
     					$datetime = new DateTime($data['datetime']);
@@ -1773,30 +1773,30 @@ 
     					$data['datetime'] = $datetime->format('Y-m-d H:i:s');
     					date_default_timezone_set('UTC');
     				*/
-    				// Force datetime to current UTC datetime
-    				date_default_timezone_set('UTC');
-    				$data['datetime'] = date('Y-m-d H:i:s');
-    				$data['ident'] = trim($line[10]);
-    				$data['latitude'] = $line[14];
-    				$data['longitude'] = $line[15];
-    				$data['verticalrate'] = $line[16];
-    				$data['emergency'] = $line[20];
-    				$data['speed'] = $line[12];
-    				$data['squawk'] = $line[17];
-    				$data['altitude'] = $line[11];
-    				$data['heading'] = $line[13];
-    				$data['ground'] = $line[21];
-    				$data['emergency'] = $line[19];
-    				$data['format_source'] = 'sbs';
+					// Force datetime to current UTC datetime
+					date_default_timezone_set('UTC');
+					$data['datetime'] = date('Y-m-d H:i:s');
+					$data['ident'] = trim($line[10]);
+					$data['latitude'] = $line[14];
+					$data['longitude'] = $line[15];
+					$data['verticalrate'] = $line[16];
+					$data['emergency'] = $line[20];
+					$data['speed'] = $line[12];
+					$data['squawk'] = $line[17];
+					$data['altitude'] = $line[11];
+					$data['heading'] = $line[13];
+					$data['ground'] = $line[21];
+					$data['emergency'] = $line[19];
+					$data['format_source'] = 'sbs';
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-    				$data['id_source'] = $id_source;
-    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
-    				else $error = true;
-    				unset($data);
-    			    } else $error = true;
-			    if ($error) {
+					$data['id_source'] = $id_source;
+					if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
+					else $error = true;
+					unset($data);
+					} else $error = true;
+				if ($error) {
 				if (count($line) > 1 && ($line[0] === 'STA' || $line[0] === 'AIR' || $line[0] === 'SEL' || $line[0] === 'ID' || $line[0] === 'CLK')) { 
 					if ($globalDebug) echo "Not a message. Ignoring... \n";
 				} else {
@@ -1812,13 +1812,13 @@ 
 					connect_all($sourceer);
 					$sourceer = array();
 				}
-			    }
+				}
 			}
 			// Sleep for xxx microseconds
 			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
-		    } else {
+			} else {
 			if ($format === 'flightgearmp') {
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
+					if ($globalDebug) echo "Reconnect FlightGear MP...";
 				//@socket_close($r);
 				sleep($globalMinFetch);
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1827,9 +1827,9 @@ 
 				break;
 				
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
-			    if (isset($tt[$format])) $tt[$format]++;
-			    else $tt[$format] = 0;
-			    if ($tt[$format] > 30 || $buffer === FALSE) {
+				if (isset($tt[$format])) $tt[$format]++;
+				else $tt[$format] = 0;
+				if ($tt[$format] > 30 || $buffer === FALSE) {
 				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
 				//@socket_close($r);
 				sleep(2);
@@ -1840,24 +1840,24 @@ 
 				//connect_all($globalSources);
 				$tt[$format]=0;
 				break;
-			    } 
-			    //else if ($globalDebug) echo "Trying again (".$tt[$format]."x) ".$format."...";
+				} 
+				//else if ($globalDebug) echo "Trying again (".$tt[$format]."x) ".$format."...";
+			}
 			}
-		    }
 		}
-	    } else {
+		} else {
 		$error = socket_strerror(socket_last_error());
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
 			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
 			if (isset($globalDebug)) echo "Restarting...\n";
 			// Restart the script if possible
 			if (is_array($sockets)) {
-			    if ($globalDebug) echo "Shutdown all sockets...";
+				if ($globalDebug) echo "Shutdown all sockets...";
 			    
-			    foreach ($sockets as $sock) {
+				foreach ($sockets as $sock) {
 				@socket_shutdown($sock,2);
 				@socket_close($sock);
-			    }
+				}
 			    
 			}
 			if ($globalDebug) echo "Waiting...";
@@ -1872,15 +1872,15 @@ 
 			if ($globalDebug) echo "Restart all connections...";
 			connect_all($globalSources);
 		}
-	    }
+		}
 	}
 	if ($globalDaemon === false) {
-	    if ($globalDebug) echo 'Check all...'."\n";
-	    if (isset($SI)) $SI->checkAll();
-	    if (isset($TI)) $TI->checkAll();
-	    if (isset($MI)) $MI->checkAll();
+		if ($globalDebug) echo 'Check all...'."\n";
+		if (isset($SI)) $SI->checkAll();
+		if (isset($TI)) $TI->checkAll();
+		if (isset($MI)) $MI->checkAll();
+	}
 	}
-    }
 }
 
 ?>

Braces +1135 added lines, -383 removed lines

@@ -14,13 +14,17 @@ 
 require_once(dirname(__FILE__).'/../require/class.Source.php');
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
 require_once(dirname(__FILE__).'/../require/class.Common.php');
-if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
+if (isset($globalTracker) && $globalTracker) {
+	require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
+}
 if (isset($globalMarine) && $globalMarine) {
     require_once(dirname(__FILE__).'/../require/class.AIS.php');
     require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
 }
 
-if (!isset($globalDebug)) $globalDebug = FALSE;
+if (!isset($globalDebug)) {
+	$globalDebug = FALSE;
+}
 
 // Check if schema is at latest version
 $Connection = new Connection();
@@ -59,66 +63,107 @@ 
 //elseif (isset($options['source'])) $hosts = array($options['source']);
 if (isset($options['s'])) {
     $globalSources = array();
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
-    else $globalSources[] = array('host' => $options['s']);
-} elseif (isset($options['source'])) {
+    if (isset($options['format'])) {
+    	$globalSources[] = array('host' => $options['s'],'format' => $options['format']);
+    } else {
+    	$globalSources[] = array('host' => $options['s']);
+    }
+    } elseif (isset($options['source'])) {
     $globalSources = array();
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
-    else $globalSources[] = array('host' => $options['source']);
-}
+    if (isset($options['format'])) {
+    	$globalSources[] = array('host' => $options['source'],'format' => $options['format']);
+    } else {
+    	$globalSources[] = array('host' => $options['source']);
+    }
+    }
 if (isset($options['aprsserverhost'])) {
 	$globalServerAPRS = TRUE;
 	$globalServerAPRShost = $options['aprsserverhost'];
 }
-if (isset($options['aprsserverport'])) $globalServerAPRSport = $options['aprsserverport'];
-if (isset($options['aprsserverssid'])) $globalServerAPRSssid = $options['aprsserverssid'];
-if (isset($options['aprsserverpass'])) $globalServerAPRSpass = $options['aprsserverpass'];
-if (isset($options['noaprsserver'])) $globalServerAPRS = FALSE; 
+if (isset($options['aprsserverport'])) {
+	$globalServerAPRSport = $options['aprsserverport'];
+}
+if (isset($options['aprsserverssid'])) {
+	$globalServerAPRSssid = $options['aprsserverssid'];
+}
+if (isset($options['aprsserverpass'])) {
+	$globalServerAPRSpass = $options['aprsserverpass'];
+}
+if (isset($options['noaprsserver'])) {
+	$globalServerAPRS = FALSE;
+}
 if (isset($options['enable-aircraft'])) {
-	if ($globalDebug) echo 'Enable Aircraft mode'."\n";
+	if ($globalDebug) {
+		echo 'Enable Aircraft mode'."\n";
+	}
 	$globalAircraft = TRUE; 
 }
 if (isset($options['disable-aircraft'])) {
-	if ($globalDebug) echo 'Disable Aircraft mode'."\n";
+	if ($globalDebug) {
+		echo 'Disable Aircraft mode'."\n";
+	}
 	$globalAircraft = FALSE;
 }
 if (isset($options['enable-tracker'])) {
-	if ($globalDebug) echo 'Enable Tracker mode'."\n";
+	if ($globalDebug) {
+		echo 'Enable Tracker mode'."\n";
+	}
 	$globalTracker = TRUE; 
 }
 if (isset($options['disable-tracker'])) {
-	if ($globalDebug) echo 'Disable Tracker mode'."\n";
+	if ($globalDebug) {
+		echo 'Disable Tracker mode'."\n";
+	}
 	$globalTracker = FALSE;
 }
 if (isset($options['enable-marine'])) {
-	if ($globalDebug) echo 'Enable Marine mode'."\n";
+	if ($globalDebug) {
+		echo 'Enable Marine mode'."\n";
+	}
 	$globalMarine = TRUE;
 }
 if (isset($options['disable-marine'])) {
-	if ($globalDebug) echo 'Disable Marine mode'."\n";
+	if ($globalDebug) {
+		echo 'Disable Marine mode'."\n";
+	}
 	$globalMarine = FALSE;
 }
-if (isset($options['nodaemon'])) $globalDaemon = FALSE;
-if (isset($options['server'])) $globalServer = TRUE;
-if (isset($options['idsource'])) $id_source = $options['idsource'];
-else $id_source = 1;
+if (isset($options['nodaemon'])) {
+	$globalDaemon = FALSE;
+}
+if (isset($options['server'])) {
+	$globalServer = TRUE;
+}
+if (isset($options['idsource'])) {
+	$id_source = $options['idsource'];
+} else {
+	$id_source = 1;
+}
 if (isset($globalServer) && $globalServer) {
-    if ($globalDebug) echo "Using Server Mode\n";
+    if ($globalDebug) {
+    	echo "Using Server Mode\n";
+    }
     $SI=new SpotterServer();
 /*
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
     $SI = new adsb2aprs();
     $SI->connect();
 */
-} else $SI=new SpotterImport($Connection->db);
+} else {
+	$SI=new SpotterImport($Connection->db);
+}
 
-if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
+if (isset($globalTracker) && $globalTracker) {
+	require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
+}
 if (isset($globalMarine) && $globalMarine) {
     require_once(dirname(__FILE__).'/../require/class.AIS.php');
     require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
 }
 
-if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
+if (isset($globalTracker) && $globalTracker) {
+	$TI = new TrackerImport($Connection->db);
+}
 if (isset($globalMarine) && $globalMarine) {
     $AIS = new AIS();
     $MI = new MarineImport($Connection->db);
@@ -143,7 +188,9 @@ 
 }
 
 // let's try and connect
-if ($globalDebug) echo "Connecting...\n";
+if ($globalDebug) {
+	echo "Connecting...\n";
+}
 $use_aprs = false;
 $aprs_full = false;
 $reset = 0;
@@ -152,7 +199,9 @@ 
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
     global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
     $reset++;
-    if ($globalDebug) echo 'Connect to all...'."\n";
+    if ($globalDebug) {
+    	echo 'Connect to all...'."\n";
+    }
     foreach ($hosts as $id => $value) {
 	$host = $value['host'];
 	$globalSources[$id]['last_exec'] = 0;
@@ -162,27 +211,37 @@ 
         	//$formats[$id] = 'deltadbtxt';
         	$globalSources[$id]['format'] = 'deltadbtxt';
         	//$last_exec['deltadbtxt'] = 0;
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to deltadb source (".$host.")...\n";
+        	}
             } else if (preg_match('/vatsim-data.txt$/i',$host)) {
         	//$formats[$id] = 'vatsimtxt';
         	$globalSources[$id]['format'] = 'vatsimtxt';
         	//$last_exec['vatsimtxt'] = 0;
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to vatsim source (".$host.")...\n";
+        	}
     	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
         	//$formats[$id] = 'aircraftlistjson';
         	$globalSources[$id]['format'] = 'aircraftlistjson';
         	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to aircraftlist.json source (".$host.")...\n";
+        	}
     	    } else if (preg_match('/aircraft.json$/i',$host)) {
         	//$formats[$id] = 'aircraftjson';
         	$globalSources[$id]['format'] = 'aircraftjson';
         	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to aircraftlist.json source (".$host.")...\n";
+        	}
     	    } else if (preg_match('/opensky/i',$host)) {
         	//$formats[$id] = 'aircraftlistjson';
         	$globalSources[$id]['format'] = 'opensky';
         	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to opensky source (".$host.")...\n";
+        	}
     	    /*
     	    // Disabled for now, site change source format
     	    } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) {
@@ -199,7 +258,9 @@ 
         	//$formats[$id] = 'planeupdatefaa';
         	$globalSources[$id]['format'] = 'planeupdatefaa';
         	//$last_exec['planeupdatefaa'] = 0;
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
+        	}
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
         	    exit(0);
@@ -208,37 +269,53 @@ 
         	//$formats[$id] = 'phpvmacars';
         	$globalSources[$id]['format'] = 'phpvmacars';
         	//$last_exec['phpvmacars'] = 0;
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to phpvmacars source (".$host.")...\n";
+        	}
             } else if (preg_match('/\/api\/v1\/acars\/data$/i',$host)) {
         	//$formats[$id] = 'phpvmacars';
         	$globalSources[$id]['format'] = 'vaos';
         	//$last_exec['phpvmacars'] = 0;
-        	if ($globalDebug) echo "Connect to vaos source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to vaos source (".$host.")...\n";
+        	}
             } else if (preg_match('/VAM-json.php$/i',$host)) {
         	//$formats[$id] = 'phpvmacars';
         	$globalSources[$id]['format'] = 'vam';
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to Vam source (".$host.")...\n";
+        	}
             } else if (preg_match('/whazzup/i',$host)) {
         	//$formats[$id] = 'whazzup';
         	$globalSources[$id]['format'] = 'whazzup';
         	//$last_exec['whazzup'] = 0;
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to whazzup source (".$host.")...\n";
+        	}
             } else if (preg_match('/blitzortung/i',$host)) {
         	$globalSources[$id]['format'] = 'blitzortung';
-        	if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to blitzortung source (".$host.")...\n";
+        	}
             } else if (preg_match('/airwhere/i',$host)) {
         	$globalSources[$id]['format'] = 'airwhere';
-        	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to airwhere source (".$host.")...\n";
+        	}
             } else if (preg_match('/recentpireps/i',$host)) {
         	//$formats[$id] = 'pirepsjson';
         	$globalSources[$id]['format'] = 'pirepsjson';
         	//$last_exec['pirepsjson'] = 0;
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to pirepsjson source (".$host.")...\n";
+        	}
             } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
         	//$formats[$id] = 'fr24json';
         	$globalSources[$id]['format'] = 'fr24json';
         	//$last_exec['fr24json'] = 0;
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to fr24 source (".$host.")...\n";
+        	}
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
         	    exit(0);
@@ -247,7 +324,9 @@ 
         	//$formats[$id] = 'fr24json';
         	$globalSources[$id]['format'] = 'myshiptracking';
         	//$last_exec['fr24json'] = 0;
-        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to myshiptracking source (".$host.")...\n";
+        	}
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
         	    exit(0);
@@ -256,16 +335,24 @@ 
             } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
         	//$formats[$id] = 'tsv';
         	$globalSources[$id]['format'] = 'tsv';
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to tsv source (".$host.")...\n";
+        	}
             }
         } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
     		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
     		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
     		    if ($idf !== false) {
     			$httpfeeds[$id] = $idf;
-        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
-    		    } elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
-    		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
+        		if ($globalDebug) {
+        			echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
+        		}
+    		    } elseif ($globalDebug) {
+    		    	echo "Can't connect to ".$globalSources[$id]['host']."\n";
+    		    }
+    		} elseif ($globalDebug) {
+    			echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
+    		}
         } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
 	    $hostport = explode(':',$host);
 	    if (isset($hostport[1])) {
@@ -305,17 +392,25 @@ 
         		//$formats[$id] = 'beast';
         		$globalSources[$id]['format'] = 'beast';
 		    //} else $formats[$id] = 'sbs';
-		    } else $globalSources[$id]['format'] = 'sbs';
+		    } else {
+		    	$globalSources[$id]['format'] = 'sbs';
+		    }
 		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
 		}
-		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
+		if ($globalDebug) {
+			echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
+		}
             } else {
-		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
+		if ($globalDebug) {
+			echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
+		}
     	    }
         }
     }
 }
-if (!isset($globalMinFetch)) $globalMinFetch = 15;
+if (!isset($globalMinFetch)) {
+	$globalMinFetch = 15;
+}
 
 // Initialize all
 $status = array();
@@ -324,13 +419,19 @@ 
 $formats = array();
 $last_exec = array();
 $time = time();
-if (isset($globalSourcesTimeout)) $timeout = $globalSourcesTimeOut;
-else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
-else $timeout = 20;
+if (isset($globalSourcesTimeout)) {
+	$timeout = $globalSourcesTimeOut;
+} else if (isset($globalSBS1TimeOut)) {
+	$timeout = $globalSBS1TimeOut;
+} else {
+	$timeout = 20;
+}
 $errno = '';
 $errstr='';
 
-if (!isset($globalDaemon)) $globalDaemon = TRUE;
+if (!isset($globalDaemon)) {
+	$globalDaemon = TRUE;
+}
 /* Initiate connections to all the hosts simultaneously */
 //connect_all($hosts);
 //connect_all($globalSources);
@@ -359,7 +460,9 @@ 
     if (isset($source['format']) && $source['format'] == 'aprs') {
 	$aprs_connect = 0;
 	$use_aprs = true;
-	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
+	if (isset($source['port']) && $source['port'] == '10152') {
+		$aprs_full = true;
+	}
 	break;
     }
 }
@@ -370,25 +473,46 @@ 
 	$aprs_connect = 0;
 	$aprs_keep = 120;
 	$aprs_last_tx = time();
-	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
-	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
-	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
-	if ($aprs_full) $aprs_filter = '';
-	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
-	else $aprs_pass = '-1';
+	if (isset($globalAPRSversion)) {
+		$aprs_version = $globalAPRSversion;
+	} else {
+		$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
+	}
+	if (isset($globalAPRSssid)) {
+		$aprs_ssid = $globalAPRSssid;
+	} else {
+		$aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
+	}
+	if (isset($globalAPRSfilter)) {
+		$aprs_filter = $globalAPRSfilter;
+	} else {
+		$aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
+	}
+	if ($aprs_full) {
+		$aprs_filter = '';
+	}
+	if (isset($globalAPRSpass)) {
+		$aprs_pass = $globalAPRSpass;
+	} else {
+		$aprs_pass = '-1';
+	}
 
-	if ($aprs_filter != '') $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n";
-	else $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
-}
+	if ($aprs_filter != '') {
+		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n";
+	} else {
+		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
+	}
+	}
 
 // connected - lets do some work
 //if ($globalDebug) echo "Connected!\n";
 sleep(1);
-if ($globalDebug) echo "SCAN MODE \n\n";
-if (!isset($globalCronEnd)) $globalCronEnd = 60;
+if ($globalDebug) {
+	echo "SCAN MODE \n\n";
+}
+if (!isset($globalCronEnd)) {
+	$globalCronEnd = 60;
+}
 $endtime = time()+$globalCronEnd;
 $i = 1;
 $tt = array();
@@ -402,22 +526,32 @@ 
 
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
 while ($i > 0) {
-    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
+    if (function_exists('pcntl_fork')) {
+    	pcntl_signal_dispatch();
+    }
 
-    if (!$globalDaemon) $i = $endtime-time();
+    if (!$globalDaemon) {
+    	$i = $endtime-time();
+    }
     // Delete old ATC
     if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
-	if ($globalDebug) echo 'Delete old ATC...'."\n";
+	if ($globalDebug) {
+		echo 'Delete old ATC...'."\n";
+	}
         $ATC->deleteOldATC();
     }
     
     if (count($last_exec) == count($globalSources)) {
 	$max = $globalMinFetch;
 	foreach ($last_exec as $last) {
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
+	    if ((time() - $last['last']) < $max) {
+	    	$max = time() - $last['last'];
+	    }
 	}
 	if ($max < $globalMinFetch) {
-	    if ($globalDebug) echo 'Sleeping...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Sleeping...'."\n";
+	    }
 	    sleep($globalMinFetch-$max+2);
 	}
     }
@@ -427,7 +561,9 @@ 
     foreach ($globalSources as $id => $value) {
 	date_default_timezone_set('UTC');
 	//if ($globalDebug) echo 'Source host : '.$value['host'].' - Source format: '.$value['format']."\n";
-	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
+	if (!isset($last_exec[$id]['last'])) {
+		$last_exec[$id]['last'] = 0;
+	}
 	if ($value['format'] === 'deltadbtxt' && 
 	    (
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
@@ -436,7 +572,9 @@ 
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
-	    if ($buffer != '') $reset = 0;
+	    if ($buffer != '') {
+	    	$reset = 0;
+	    }
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
 	    $buffer = explode('\n',$buffer);
 	    foreach ($buffer as $line) {
@@ -445,20 +583,41 @@ 
 	            $data = array();
 	            $data['hex'] = $line[1]; // hex
 	            $data['ident'] = $line[2]; // ident
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
+	            if (isset($line[3])) {
+	            	$data['altitude'] = $line[3];
+	            }
+	            // altitude
+	            if (isset($line[4])) {
+	            	$data['speed'] = $line[4];
+	            }
+	            // speed
+	            if (isset($line[5])) {
+	            	$data['heading'] = $line[5];
+	            }
+	            // heading
+	            if (isset($line[6])) {
+	            	$data['latitude'] = $line[6];
+	            }
+	            // lat
+	            if (isset($line[7])) {
+	            	$data['longitude'] = $line[7];
+	            }
+	            // long
 	            $data['verticalrate'] = ''; // vertical rate
 	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
 	            $data['emergency'] = ''; // emergency
 		    $data['datetime'] = date('Y-m-d H:i:s');
 		    $data['format_source'] = 'deltadbtxt';
     		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
+		    if (isset($value['sourcestats'])) {
+		    	$data['sourcestats'] = $value['sourcestats'];
+		    }
     		    $SI->add($data);
 		    unset($data);
     		}
@@ -473,7 +632,9 @@ 
 	    date_default_timezone_set('CET');
 	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
 	    date_default_timezone_set('UTC');
-	    if ($buffer != '') $reset = 0;
+	    if ($buffer != '') {
+	    	$reset = 0;
+	    }
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
 	    $buffer = explode('\n',$buffer);
 	    foreach ($buffer as $line) {
@@ -482,18 +643,42 @@ 
 		    $add = false;
 		    $ais_data = $AIS->parse_line(trim($line));
 		    $data = array();
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
-		    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
-		    if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid'];
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
+		    if (isset($ais_data['ident'])) {
+		    	$data['ident'] = $ais_data['ident'];
+		    }
+		    if (isset($ais_data['mmsi'])) {
+		    	$data['mmsi'] = substr($ais_data['mmsi'],-9);
+		    }
+		    if (isset($ais_data['speed'])) {
+		    	$data['speed'] = $ais_data['speed'];
+		    }
+		    if (isset($ais_data['heading'])) {
+		    	$data['heading'] = $ais_data['heading'];
+		    }
+		    if (isset($ais_data['latitude'])) {
+		    	$data['latitude'] = $ais_data['latitude'];
+		    }
+		    if (isset($ais_data['longitude'])) {
+		    	$data['longitude'] = $ais_data['longitude'];
+		    }
+		    if (isset($ais_data['status'])) {
+		    	$data['status'] = $ais_data['status'];
+		    }
+		    if (isset($ais_data['statusid'])) {
+		    	$data['status_id'] = $ais_data['statusid'];
+		    }
+		    if (isset($ais_data['type'])) {
+		    	$data['type'] = $ais_data['type'];
+		    }
+		    if (isset($ais_data['typeid'])) {
+		    	$data['type_id'] = $ais_data['typeid'];
+		    }
+		    if (isset($ais_data['imo'])) {
+		    	$data['imo'] = $ais_data['imo'];
+		    }
+		    if (isset($ais_data['callsign'])) {
+		    	$data['callsign'] = $ais_data['callsign'];
+		    }
 		    if (isset($ais_data['timestamp'])) {
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
@@ -507,8 +692,12 @@ 
 		    $data['format_source'] = 'aisnmeatxt';
     		    $data['id_source'] = $id_source;
 		    //print_r($data);
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
+		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') {
+		    	$MI->add($data);
+		    }
 		    unset($data);
 		}
     	    }
@@ -531,20 +720,48 @@ 
 			    if ($line != '') {
 				$ais_data = $AIS->parse_line(trim($line));
 				$data = array();
-				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-				if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
-				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
-				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
-				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
-				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
-				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
-				if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
-				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
-				if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid'];
-				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
-				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
-				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
-				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
+				if (isset($ais_data['ident'])) {
+					$data['ident'] = $ais_data['ident'];
+				}
+				if (isset($ais_data['mmsi'])) {
+					$data['mmsi'] = substr($ais_data['mmsi'],-9);
+				}
+				if (isset($ais_data['speed'])) {
+					$data['speed'] = $ais_data['speed'];
+				}
+				if (isset($ais_data['heading'])) {
+					$data['heading'] = $ais_data['heading'];
+				}
+				if (isset($ais_data['latitude'])) {
+					$data['latitude'] = $ais_data['latitude'];
+				}
+				if (isset($ais_data['longitude'])) {
+					$data['longitude'] = $ais_data['longitude'];
+				}
+				if (isset($ais_data['status'])) {
+					$data['status'] = $ais_data['status'];
+				}
+				if (isset($ais_data['statusid'])) {
+					$data['status_id'] = $ais_data['statusid'];
+				}
+				if (isset($ais_data['type'])) {
+					$data['type'] = $ais_data['type'];
+				}
+				if (isset($ais_data['typeid'])) {
+					$data['type_id'] = $ais_data['typeid'];
+				}
+				if (isset($ais_data['imo'])) {
+					$data['imo'] = $ais_data['imo'];
+				}
+				if (isset($ais_data['callsign'])) {
+					$data['callsign'] = $ais_data['callsign'];
+				}
+				if (isset($ais_data['destination'])) {
+					$data['arrival_code'] = $ais_data['destination'];
+				}
+				if (isset($ais_data['eta_ts'])) {
+					$data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
+				}
 				if (isset($ais_data['timestamp'])) {
 				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
 				} else {
@@ -552,18 +769,27 @@ 
 				}
 				$data['format_source'] = 'aisnmeahttp';
 				$data['id_source'] = $id_source;
-				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+					$data['noarchive'] = true;
+				}
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') {
+					$MI->add($data);
+				}
 				unset($data);
 			    }
 			}
 		    }
 		} else {
 		    $format = $value['format'];
-		    if (isset($tt[$format])) $tt[$format]++;
-		    else $tt[$format] = 0;
+		    if (isset($tt[$format])) {
+		    	$tt[$format]++;
+		    } else {
+		    	$tt[$format] = 0;
+		    }
 		    if ($tt[$format] > 30) {
-			if ($globalDebug) echo 'Reconnect...'."\n";
+			if ($globalDebug) {
+				echo 'Reconnect...'."\n";
+			}
 			sleep(2);
 			//$sourceeen[] = $value;
 			//connect_all($sourceeen);
@@ -599,12 +825,18 @@ 
 			    //    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
 			    //$data['type_id'] = $line['TYPE'];
 			    $data['imo'] = $line['IMO'];
-			    if ($line['DEST'] != '') $data['arrival_code'] = $line['DEST'];
-			    if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
+			    if ($line['DEST'] != '') {
+			    	$data['arrival_code'] = $line['DEST'];
+			    }
+			    if ($line['ARV'] != '') {
+			    	$data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
+			    }
 			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
 			    $data['format_source'] = 'myshiptracking';
 			    $data['id_source'] = $id_source;
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+			    	$data['noarchive'] = true;
+			    }
 			    $MI->add($data);
 			    unset($data);
 			}
@@ -629,7 +861,9 @@ 
 			    $data['callsign'] = $line['callsign'];
 			    $data['mmsi'] = substr($line['mmsi'],-9);
 			    $data['speed'] = $line['sog'];
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
+			    if ($line['heading'] != '511') {
+			    	$data['heading'] = $line['heading'];
+			    }
 			    $data['latitude'] = $line['latitude'];
 			    $data['longitude'] = $line['longitude'];
 			    $data['type_id'] = $line['shiptype'];
@@ -637,7 +871,9 @@ 
 			    $data['datetime'] = $line['time'];
 			    $data['format_source'] = 'boatbeaconapp';
 			    $data['id_source'] = $id_source;
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+			    	$data['noarchive'] = true;
+			    }
 			    $MI->add($data);
 			    unset($data);
 			}
@@ -659,22 +895,44 @@ 
 		    foreach ($all_data['features'] as $line) {
 			print_r($line);
 			$data = array();
-			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
-			if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign'];
-			if (isset($line['properties']['mmsi'])) $data['mmsi'] = substr($line['properties']['mmsi'],-9);
-			if (isset($line['properties']['imo'])) $data['imo'] = $line['properties']['imo'];
-			if (isset($line['properties']['speed'])) $data['speed'] = $line['properties']['speed'];
-			if (isset($line['properties']['heading']) && $line['properties']['heading'] != 0) $data['heading'] = $line['properties']['heading'];
+			if (isset($line['properties']['name'])) {
+				$data['ident'] = $line['properties']['name'];
+			}
+			if (isset($line['properties']['callsign'])) {
+				$data['callsign'] = $line['properties']['callsign'];
+			}
+			if (isset($line['properties']['mmsi'])) {
+				$data['mmsi'] = substr($line['properties']['mmsi'],-9);
+			}
+			if (isset($line['properties']['imo'])) {
+				$data['imo'] = $line['properties']['imo'];
+			}
+			if (isset($line['properties']['speed'])) {
+				$data['speed'] = $line['properties']['speed'];
+			}
+			if (isset($line['properties']['heading']) && $line['properties']['heading'] != 0) {
+				$data['heading'] = $line['properties']['heading'];
+			}
 			$data['latitude'] = $line['geometry']['coordinates'][1];
 			$data['longitude'] = $line['geometry']['coordinates'][0];
-			if (isset($line['properties']['vesselType'])) $data['type'] = $line['properties']['vesselType'];
-			if (isset($line['properties']['destination'])) $data['arrival_code'] = $line['properties']['destination'];
-			if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') $data['arrival_date'] = $line['properties']['eta'];
+			if (isset($line['properties']['vesselType'])) {
+				$data['type'] = $line['properties']['vesselType'];
+			}
+			if (isset($line['properties']['destination'])) {
+				$data['arrival_code'] = $line['properties']['destination'];
+			}
+			if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') {
+				$data['arrival_date'] = $line['properties']['eta'];
+			}
 			$data['format_source'] = 'boatnerd';
 			$data['id_source'] = $id_source;
 			$data['datetime'] = date('Y-m-d H:i:s');
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-			if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data);
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+				$data['noarchive'] = true;
+			}
+			if ($line['properties']['vesselType'] != 'Navigation Aid') {
+				$MI->add($data);
+			}
 			unset($data);
 		    }
 		}
@@ -691,7 +949,9 @@ 
 	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
 	    echo 'done !'."\n";
 	    // FIXME: Need more work
-	    if ($buffer != '') $reset = 0;
+	    if ($buffer != '') {
+	    	$reset = 0;
+	    }
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
 	    $buffer = explode('\n',$buffer);
 	    foreach ($buffer as $line) {
@@ -717,7 +977,9 @@ 
 		    //$data['etaTime'] = substr($line,135,5);
 		    $data['format_source'] = 'shipplotter';
     		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
 		    //print_r($data);
 		    echo 'Add...'."\n";
 		    $MI->add($data);
@@ -751,16 +1013,28 @@ 
     		    $line = explode(':', $line);
     		    if (count($line) > 30 && $line[0] != 'callsign') {
 			$data = array();
-			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
-			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
+			if (isset($line[37]) && $line[37] != '') {
+				$data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
+			} else {
+				$data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
+			}
 			$data['pilot_id'] = $line[1];
 			$data['pilot_name'] = $line[2];
 			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
 			$data['ident'] = $line[0]; // ident
-			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
+			if ($line[7] != '' && $line[7] != 0) {
+				$data['altitude'] = $line[7];
+			}
+			// altitude
 			$data['speed'] = $line[8]; // speed
-			if (isset($line[45])) $data['heading'] = $line[45]; // heading
-			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
+			if (isset($line[45])) {
+				$data['heading'] = $line[45];
+			}
+			// heading
+			elseif (isset($line[38])) {
+				$data['heading'] = $line[38];
+			}
+			// heading
 			$data['latitude'] = $line[5]; // lat
 	        	$data['longitude'] = $line[6]; // long
 	        	$data['verticalrate'] = ''; // vertical rate
@@ -776,7 +1050,9 @@ 
 			$data['frequency'] = $line[4];
 			$data['type'] = $line[18];
 			$data['range'] = $line[19];
-			if (isset($line[35])) $data['info'] = $line[35];
+			if (isset($line[35])) {
+				$data['info'] = $line[35];
+			}
     			$data['id_source'] = $id_source;
 	    		//$data['arrival_airport_time'] = ;
 	    		if ($line[9] != '') {
@@ -790,27 +1066,47 @@ 
 	    		elseif ($value === 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
 	    		*/
 	    		$data['format_source'] = $value['format'];
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-    			if ($line[3] === 'PILOT') $SI->add($data);
-			elseif ($line[3] === 'ATC') {
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+				$data['noarchive'] = true;
+			}
+			if (isset($value['name']) && $value['name'] != '') {
+				$data['source_name'] = $value['name'];
+			}
+    			if ($line[3] === 'PILOT') {
+    				$SI->add($data);
+    			} elseif ($line[3] === 'ATC') {
 				//print_r($data);
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
 				$data['info'] = str_replace('&amp;sect;','',$data['info']);
 				$typec = substr($data['ident'],-3);
-				if ($typec === 'APP') $data['type'] = 'Approach';
-				elseif ($typec === 'TWR') $data['type'] = 'Tower';
-				elseif ($typec === 'OBS') $data['type'] = 'Observer';
-				elseif ($typec === 'GND') $data['type'] = 'Ground';
-				elseif ($typec === 'DEL') $data['type'] = 'Delivery';
-				elseif ($typec === 'DEP') $data['type'] = 'Departure';
-				elseif ($typec === 'FSS') $data['type'] = 'Flight Service Station';
-				elseif ($typec === 'CTR') $data['type'] = 'Control Radar or Centre';
-				elseif ($data['type'] === '') $data['type'] = 'Observer';
-				if (!isset($data['source_name'])) $data['source_name'] = '';
+				if ($typec === 'APP') {
+					$data['type'] = 'Approach';
+				} elseif ($typec === 'TWR') {
+					$data['type'] = 'Tower';
+				} elseif ($typec === 'OBS') {
+					$data['type'] = 'Observer';
+				} elseif ($typec === 'GND') {
+					$data['type'] = 'Ground';
+				} elseif ($typec === 'DEL') {
+					$data['type'] = 'Delivery';
+				} elseif ($typec === 'DEP') {
+					$data['type'] = 'Departure';
+				} elseif ($typec === 'FSS') {
+					$data['type'] = 'Flight Service Station';
+				} elseif ($typec === 'CTR') {
+					$data['type'] = 'Control Radar or Centre';
+				} elseif ($data['type'] === '') {
+					$data['type'] = 'Observer';
+				}
+				if (!isset($data['source_name'])) {
+					$data['source_name'] = '';
+				}
 				if (isset($ATC)) {
-					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
-					else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
+					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) {
+						echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
+					} else {
+						echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
+					}
 				}
 			}
     			unset($data);
@@ -837,14 +1133,20 @@ 
 			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST'));
 			$data['latitude'] = (float)$line['pktLatitude'];
 			$data['longitude'] = (float)$line['pktLongitude'];
-			if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack'];
-			if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed'];
+			if ((float)$line['pktTrack'] != 0) {
+				$data['heading'] = (float)$line['pktTrack'];
+			}
+			if ((int)$line['pktSpeed'] != 0) {
+				$data['speed'] = (int)$line['pktSpeed'];
+			}
 			$data['altitude'] = round((int)$line['pktAltitude']*3.28084);
 			$data['altitude_relative'] = 'AMSL';
 			$data['pilot_id'] = (int)$line['pktPilotID'];
 			$data['aircraft_icao'] = 'PARAGLIDER';
 			$pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
-			if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4];
+			if (isset($pilot_data[4])) {
+				$data['pilot_name'] = $pilot_data[4];
+			}
 			$data['format_source'] = $value['format'];
 			$SI->add($data);
 			unset($data);
@@ -892,25 +1194,59 @@ 
 		    foreach ($all_data['acList'] as $line) {
 			$data = array();
 			$data['hex'] = $line['Icao']; // hex
-			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
-			if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
-			if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
-			if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
-			if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
-			if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
+			if (isset($line['Call'])) {
+				$data['ident'] = $line['Call'];
+			}
+			// ident
+			if (isset($line['Alt'])) {
+				$data['altitude'] = $line['Alt'];
+			}
+			// altitude
+			if (isset($line['Spd'])) {
+				$data['speed'] = $line['Spd'];
+			}
+			// speed
+			if (isset($line['Trak'])) {
+				$data['heading'] = $line['Trak'];
+			}
+			// heading
+			if (isset($line['Lat'])) {
+				$data['latitude'] = $line['Lat'];
+			}
+			// lat
+			if (isset($line['Long'])) {
+				$data['longitude'] = $line['Long'];
+			}
+			// long
 			//$data['verticalrate'] = $line['']; // verticale rate
-			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
+			if (isset($line['Sqk'])) {
+				$data['squawk'] = $line['Sqk'];
+			}
+			// squawk
 			$data['emergency'] = ''; // emergency
-			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
-			else $data['datetime'] = date('Y-m-d H:i:s');
+			if (isset($line['Reg'])) {
+				$data['registration'] = $line['Reg'];
+			}
+			if (isset($line['PosTime'])) {
+				$data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
+			} else {
+				$data['datetime'] = date('Y-m-d H:i:s');
+			}
 			//$data['datetime'] = date('Y-m-d H:i:s');
-			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
+			if (isset($line['Type'])) {
+				$data['aircraft_icao'] = $line['Type'];
+			}
 			$data['format_source'] = 'aircraftlistjson';
 			$data['id_source'] = $id_source;
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-			if (isset($data['latitude'])) $SI->add($data);
+			if (isset($value['name']) && $value['name'] != '') {
+				$data['source_name'] = $value['name'];
+			}
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+				$data['noarchive'] = true;
+			}
+			if (isset($data['latitude'])) {
+				$SI->add($data);
+			}
 			unset($data);
 		    }
 		} elseif (is_array($all_data)) {
@@ -927,17 +1263,26 @@ 
 			$data['verticalrate'] = $line['vrt']; // verticale rate
 			$data['squawk'] = $line['squawk']; // squawk
 			$data['emergency'] = ''; // emergency
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
-			else $data['datetime'] = date('Y-m-d H:i:s');
+			if (isset($line['PosTime'])) {
+				$data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
+			} else {
+				$data['datetime'] = date('Y-m-d H:i:s');
+			}
 			$data['format_source'] = 'aircraftlistjson';
 			$data['id_source'] = $id_source;
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+				$data['noarchive'] = true;
+			}
+			if (isset($value['name']) && $value['name'] != '') {
+				$data['source_name'] = $value['name'];
+			}
 			$SI->add($data);
 			unset($data);
 		    }
 		}
-	    } elseif ($globalDebug) echo 'No data'."\n";
+	    } elseif ($globalDebug) {
+	    	echo 'No data'."\n";
+	    }
     	    //$last_exec['aircraftlistjson'] = time();
     	    $last_exec[$id]['last'] = time();
     	//} elseif ($value === 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
@@ -973,8 +1318,12 @@ 
 		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
 	    	    $data['format_source'] = 'planeupdatefaa';
     		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
@@ -1008,7 +1357,9 @@ 
 		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
 		    $data['format_source'] = 'opensky';
 		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
@@ -1027,22 +1378,51 @@ 
 		$reset = 0;
 		foreach ($all_data['aircraft'] as $key => $line) {
 		    $data = array();
-		    if (isset($line['hex'])) $data['hex'] = $line['hex']; // hex
-		    if (isset($line['flight'])) $data['ident'] = trim($line['flight']); // ident
-		    if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
-		    if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
-		    if (isset($line['track'])) $data['heading'] = $line['track']; // heading
-		    if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
-		    if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
-		    if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
-		    if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
+		    if (isset($line['hex'])) {
+		    	$data['hex'] = $line['hex'];
+		    }
+		    // hex
+		    if (isset($line['flight'])) {
+		    	$data['ident'] = trim($line['flight']);
+		    }
+		    // ident
+		    if (isset($line['altitude'])) {
+		    	$data['altitude'] = $line['altitude'];
+		    }
+		    // altitude
+		    if (isset($line['speed'])) {
+		    	$data['speed'] = $line['speed'];
+		    }
+		    // speed
+		    if (isset($line['track'])) {
+		    	$data['heading'] = $line['track'];
+		    }
+		    // heading
+		    if (isset($line['lat'])) {
+		    	$data['latitude'] = $line['lat'];
+		    }
+		    // lat
+		    if (isset($line['lon'])) {
+		    	$data['longitude'] = $line['lon'];
+		    }
+		    // long
+		    if (isset($line['vert_rate'])) {
+		    	$data['verticalrate'] = $line['vert_rate'];
+		    }
+		    // verticale rate
+		    if (isset($line['squawk'])) {
+		    	$data['squawk'] = $line['squawk'];
+		    }
+		    // squawk
 		    //$data['emergency'] = ''; // emergency
 		    //$data['registration'] = $line[2];
 		    //$data['aircraft_icao'] = $line[0];
 		    $data['datetime'] = date('Y-m-d H:i:s');
 		    $data['format_source'] = 'aircraftjson';
 		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
@@ -1059,7 +1439,9 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
-	    if (!empty($all_data)) $reset = 0;
+	    if (!empty($all_data)) {
+	    	$reset = 0;
+	    }
 	    foreach ($all_data as $key => $line) {
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
 		    $data = array();
@@ -1080,8 +1462,12 @@ 
 		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
 	    	    $data['format_source'] = 'fr24json';
     		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
@@ -1110,24 +1496,42 @@ 
 		    if (isset($line['inf'])) {
 			$data = array();
 			$data['hex'] = $line['inf']['ia'];
-			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
+			if (isset($line['inf']['cs'])) {
+				$data['ident'] = $line['inf']['cs'];
+			}
+			//$line[13]
 	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
+	    		if (isset($line['inf']['gs'])) {
+	    			$data['speed'] = round($line['inf']['gs']*0.539957);
+	    		}
+	    		// speed
+	    		if (isset($line['inf']['tr'])) {
+	    			$data['heading'] = $line['inf']['tr'];
+	    		}
+	    		// heading
 	    		$data['latitude'] = $line['pt'][0]; // lat
 	    		$data['longitude'] = $line['pt'][1]; // long
 	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
+	    		if (isset($line['inf']['sq'])) {
+	    			$data['squawk'] = $line['inf']['sq'];
+	    		}
+	    		// squawk
 	    		//$data['aircraft_icao'] = $line[8];
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
+	    		if (isset($line['inf']['rc'])) {
+	    			$data['registration'] = $line['inf']['rc'];
+	    		}
 			//$data['departure_airport_iata'] = $line[11];
 			//$data['arrival_airport_iata'] = $line[12];
 	    		//$data['emergency'] = ''; // emergency
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
 	    		$data['format_source'] = 'radarvirtueljson';
     			$data['id_source'] = $id_source;
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+				$data['noarchive'] = true;
+			}
+			if (isset($value['name']) && $value['name'] != '') {
+				$data['source_name'] = $value['name'];
+			}
 			$SI->add($data);
 			unset($data);
 		    }
@@ -1153,30 +1557,65 @@ 
 		    $data['id'] = $line['id'];
 		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
 		    $data['ident'] = $line['callsign']; // ident
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+		    if (isset($line['pilotid'])) {
+		    	$data['pilot_id'] = $line['pilotid'];
+		    }
+		    // pilot id
+		    if (isset($line['name'])) {
+		    	$data['pilot_name'] = $line['name'];
+		    }
+		    // pilot name
+		    if (isset($line['alt'])) {
+		    	$data['altitude'] = $line['alt'];
+		    }
+		    // altitude
+		    if (isset($line['gs'])) {
+		    	$data['speed'] = $line['gs'];
+		    }
+		    // speed
+		    if (isset($line['heading'])) {
+		    	$data['heading'] = $line['heading'];
+		    }
+		    // heading
+		    if (isset($line['route'])) {
+		    	$data['waypoints'] = $line['route'];
+		    }
+		    // route
 		    $data['latitude'] = $line['lat']; // lat
 		    $data['longitude'] = $line['lon']; // long
 		    //$data['verticalrate'] = $line['vrt']; // verticale rate
 		    //$data['squawk'] = $line['squawk']; // squawk
 		    //$data['emergency'] = ''; // emergency
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
+		    if (isset($line['depicao'])) {
+		    	$data['departure_airport_icao'] = $line['depicao'];
+		    }
+		    if (isset($line['deptime'])) {
+		    	$data['departure_airport_time'] = $line['deptime'];
+		    }
+		    if (isset($line['arricao'])) {
+		    	$data['arrival_airport_icao'] = $line['arricao'];
+		    }
 		    //$data['arrival_airport_time'] = $line['arrtime'];
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
-		    else $data['info'] = '';
+		    if (isset($line['aircraft'])) {
+		    	$data['aircraft_icao'] = $line['aircraft'];
+		    }
+		    if (isset($line['transponder'])) {
+		    	$data['squawk'] = $line['transponder'];
+		    }
+		    if (isset($line['atis'])) {
+		    	$data['info'] = $line['atis'];
+		    } else {
+		    	$data['info'] = '';
+		    }
 		    $data['format_source'] = 'pireps';
     		    $data['id_source'] = $id_source;
 		    $data['datetime'] = date('Y-m-d H:i:s');
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    if ($line['icon'] === 'plane') {
 			$SI->add($data);
 		    //    print_r($data);
@@ -1185,16 +1624,28 @@ 
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
 			$typec = substr($data['ident'],-3);
 			$data['type'] = '';
-			if ($typec === 'APP') $data['type'] = 'Approach';
-			elseif ($typec === 'TWR') $data['type'] = 'Tower';
-			elseif ($typec === 'OBS') $data['type'] = 'Observer';
-			elseif ($typec === 'GND') $data['type'] = 'Ground';
-			elseif ($typec === 'DEL') $data['type'] = 'Delivery';
-			elseif ($typec === 'DEP') $data['type'] = 'Departure';
-			elseif ($typec === 'FSS') $data['type'] = 'Flight Service Station';
-			elseif ($typec === 'CTR') $data['type'] = 'Control Radar or Centre';
-			else $data['type'] = 'Observer';
-			if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
+			if ($typec === 'APP') {
+				$data['type'] = 'Approach';
+			} elseif ($typec === 'TWR') {
+				$data['type'] = 'Tower';
+			} elseif ($typec === 'OBS') {
+				$data['type'] = 'Observer';
+			} elseif ($typec === 'GND') {
+				$data['type'] = 'Ground';
+			} elseif ($typec === 'DEL') {
+				$data['type'] = 'Delivery';
+			} elseif ($typec === 'DEP') {
+				$data['type'] = 'Departure';
+			} elseif ($typec === 'FSS') {
+				$data['type'] = 'Flight Service Station';
+			} elseif ($typec === 'CTR') {
+				$data['type'] = 'Control Radar or Centre';
+			} else {
+				$data['type'] = 'Observer';
+			}
+			if (isset($ATC)) {
+				echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
+			}
 		    }
 		    unset($data);
 		}
@@ -1209,7 +1660,9 @@ 
 	    )
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Get Data...'."\n";
+	    }
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
 	    if ($buffer != '' && is_array($all_data)) {
@@ -1217,10 +1670,16 @@ 
 		foreach ($all_data as $line) {
 	    	    $data = array();
 	    	    //$data['id'] = $line['id']; // id not usable
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
+	    	    if (isset($line['pilotid'])) {
+	    	    	$data['id'] = $line['pilotid'].$line['flightnum'];
+	    	    }
 	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
+	    	    if (isset($line['pilotname'])) {
+	    	    	$data['pilot_name'] = $line['pilotname'];
+	    	    }
+	    	    if (isset($line['pilotid'])) {
+	    	    	$data['pilot_id'] = $line['pilotid'];
+	    	    }
 	    	    $data['ident'] = $line['flightnum']; // ident
 	    	    $data['altitude'] = $line['alt']; // altitude
 	    	    $data['speed'] = $line['gs']; // speed
@@ -1236,7 +1695,9 @@ 
 	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
-	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
+	    	    } else {
+	    	    	$data['datetime'] = date('Y-m-d H:i:s');
+	    	    }
 	    	    $data['departure_airport_icao'] = $line['depicao'];
 	    	    $data['departure_airport_time'] = $line['deptime'];
 	    	    $data['arrival_airport_icao'] = $line['arricao'];
@@ -1244,29 +1705,47 @@ 
     		    if (isset($line['registration'])) {
     			$data['registration'] = $line['registration'];
     			//if (isset($line['aircraft'])) $data['id'] = $line['aircraft'];
-    		    } else $data['registration'] = $line['aircraft'];
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+    		    } else {
+    		    	$data['registration'] = $line['aircraft'];
+    		    }
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
+		    if (isset($line['route'])) {
+		    	$data['waypoints'] = $line['route'];
+		    }
+		    // route
 		    if (isset($line['aircraftname'])) {
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
 	    		$aircraft_data = explode('-',$line['aircraftname']);
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
-	    		else {
+	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) {
+	    			$data['aircraft_icao'] = $aircraft_data[0];
+	    		} elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) {
+	    			$data['aircraft_icao'] = $aircraft_data[1];
+	    		} else {
 	    		    $aircraft_data = explode(' ',$line['aircraftname']);
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
+	    		    if (isset($aircraft_data[1])) {
+	    		    	$data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
+	    		    } else {
+	    		    	$data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
+	    		    }
 	    		}
 	    	    }
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
+    		    if (isset($line['route'])) {
+    		    	$data['waypoints'] = $line['route'];
+    		    }
     		    $data['id_source'] = $id_source;
 	    	    $data['format_source'] = 'phpvmacars';
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
-		if ($globalDebug) echo 'No more data...'."\n";
+		if ($globalDebug) {
+			echo 'No more data...'."\n";
+		}
 		unset($buffer);
 		unset($all_data);
 	    }
@@ -1279,7 +1758,9 @@ 
 	    )
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Get Data...'."\n";
+	    }
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
 	    if ($buffer != '' && is_array($all_data) && isset($all_data['ACARSData'])) {
@@ -1290,10 +1771,16 @@ 
 	    	    //$data['id'] = $line['id']; // id not usable
 	    	    $data['id'] = $line['id'];
 	    	    //$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
-	    	    if (isset($line['user']['username'])) $data['pilot_name'] = $line['user']['username'];
-	    	    if (isset($line['user_id'])) $data['pilot_id'] = $line['user_id'];
+	    	    if (isset($line['user']['username'])) {
+	    	    	$data['pilot_name'] = $line['user']['username'];
+	    	    }
+	    	    if (isset($line['user_id'])) {
+	    	    	$data['pilot_id'] = $line['user_id'];
+	    	    }
 	    	    $data['ident'] = str_replace(' ','',$line['bid']['flightnum']); // ident
-	    	    if (is_numeric($data['ident'])) $data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
+	    	    if (is_numeric($data['ident'])) {
+	    	    	$data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
+	    	    }
 	    	    $data['altitude'] = $line['altitude']; // altitude
 	    	    $data['speed'] = $line['groundspeed']; // speed
 	    	    $data['heading'] = $line['heading']; // heading
@@ -1306,7 +1793,9 @@ 
 	    		$datetime = new DateTime($line['updated_at'],new DateTimeZone($value['timezone']));
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
-	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
+	    	    } else {
+	    	    	$data['datetime'] = date('Y-m-d H:i:s');
+	    	    }
 	    	    
 	    	    $data['departure_airport_icao'] = $line['bid']['depapt']['icao'];
 	    	    $data['departure_airport_time'] = $line['bid']['deptime'];
@@ -1314,17 +1803,26 @@ 
 		    $data['arrival_airport_time'] = $line['bid']['arrtime'];
 		    $data['registration'] = $line['bid']['aircraft']['registration'];
 
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($line['bid']['route']) && $line['bid']['route'] != '') $data['waypoints'] = $line['bid']['route']; // route
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
+		    if (isset($line['bid']['route']) && $line['bid']['route'] != '') {
+		    	$data['waypoints'] = $line['bid']['route'];
+		    }
+		    // route
 	    	    $data['aircraft_icao'] = $line['bid']['aircraft']['icao'];
 
     		    $data['id_source'] = $id_source;
 	    	    $data['format_source'] = 'vaos';
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
-		if ($globalDebug) echo 'No more data...'."\n";
+		if ($globalDebug) {
+			echo 'No more data...'."\n";
+		}
 		unset($buffer);
 		unset($all_data);
 	    }
@@ -1337,7 +1835,9 @@ 
 	    )
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Get Data...'."\n";
+	    }
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
 	    if ($buffer != '' && is_array($all_data)) {
@@ -1366,16 +1866,25 @@ 
 	    	    $data['arrival_airport_icao'] = $line['arrival'];
     		    //$data['arrival_airport_time'] = $line['arrival_time'];
     		    //$data['registration'] = $line['aircraft'];
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+		    if (isset($line['route'])) {
+		    	$data['waypoints'] = $line['route'];
+		    }
+		    // route
 	    	    $data['aircraft_icao'] = $line['plane_type'];
     		    $data['id_source'] = $id_source;
 	    	    $data['format_source'] = 'vam';
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
-		if ($globalDebug) echo 'No more data...'."\n";
+		if ($globalDebug) {
+			echo 'No more data...'."\n";
+		}
 		unset($buffer);
 		unset($all_data);
 	    }
@@ -1388,7 +1897,9 @@ 
 	    )
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Get Data...'."\n";
+	    }
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
 	    if ($buffer != '') {
@@ -1406,12 +1917,16 @@ 
 			$data['id_source'] = $id_source;
 			$data['format_source'] = 'blitzortung';
 			$SI->add($data);
-			if ($globalDebug) echo '☈ Lightning added'."\n";
+			if ($globalDebug) {
+				echo '☈ Lightning added'."\n";
+			}
 			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
 			unset($data);
 		    }
 		}
-		if ($globalDebug) echo 'No more data...'."\n";
+		if ($globalDebug) {
+			echo 'No more data...'."\n";
+		}
 		unset($buffer);
 	    }
 	    $last_exec[$id]['last'] = time();
@@ -1423,7 +1938,9 @@ 
 	    $write = NULL;
 	    $e = NULL;
 	    $n = socket_select($read, $write, $e, $timeout);
-	    if ($e != NULL) var_dump($e);
+	    if ($e != NULL) {
+	    	var_dump($e);
+	    }
 	    if ($n > 0) {
 		$reset = 0;
 		foreach ($read as $nb => $r) {
@@ -1445,13 +1962,17 @@ 
 		    if ($buffer !== FALSE) {
 			if ($format === 'vrstcp') {
 			    $buffer = explode('},{',$buffer);
-			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
+			} else {
+				$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
+			}
 		    }
 		    // SBS format is CSV format
 		    if ($buffer !== FALSE && $buffer !== '') {
 			$tt[$format] = 0;
 			if ($format === 'acarssbs3') {
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+			    if ($globalDebug) {
+			    	echo 'ACARS : '.$buffer."\n";
+			    }
 			    $ACARS->add(trim($buffer));
 			    $ACARS->deleteLiveAcarsData();
 			} elseif ($format === 'raw') {
@@ -1460,30 +1981,70 @@ 
 			    if (is_array($data)) {
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'raw';
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
+					$data['source_name'] = $globalSources[$nb]['name'];
+				}
+				if (isset($globalSources[$nb]['sourcestats'])) {
+					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+				}
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
+					$data['noarchive'] = true;
+				}
+				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
+					$SI->add($data);
+				}
 			    }
 			} elseif ($format === 'ais') {
 			    $ais_data = $AIS->parse_line(trim($buffer));
 			    $data = array();
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
-			    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
-			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+			    if (isset($ais_data['ident'])) {
+			    	$data['ident'] = $ais_data['ident'];
+			    }
+			    if (isset($ais_data['mmsi'])) {
+			    	$data['mmsi'] = substr($ais_data['mmsi'],-9);
+			    }
+			    if (isset($ais_data['speed'])) {
+			    	$data['speed'] = $ais_data['speed'];
+			    }
+			    if (isset($ais_data['heading'])) {
+			    	$data['heading'] = $ais_data['heading'];
+			    }
+			    if (isset($ais_data['latitude'])) {
+			    	$data['latitude'] = $ais_data['latitude'];
+			    }
+			    if (isset($ais_data['longitude'])) {
+			    	$data['longitude'] = $ais_data['longitude'];
+			    }
+			    if (isset($ais_data['status'])) {
+			    	$data['status'] = $ais_data['status'];
+			    }
+			    if (isset($ais_data['statusid'])) {
+			    	$data['status_id'] = $ais_data['statusid'];
+			    }
+			    if (isset($ais_data['type'])) {
+			    	$data['type'] = $ais_data['type'];
+			    }
+			    if (isset($ais_data['imo'])) {
+			    	$data['imo'] = $ais_data['imo'];
+			    }
+			    if (isset($ais_data['callsign'])) {
+			    	$data['callsign'] = $ais_data['callsign'];
+			    }
+			    if (isset($ais_data['destination'])) {
+			    	$data['arrival_code'] = $ais_data['destination'];
+			    }
+			    if (isset($ais_data['eta_ts'])) {
+			    	$data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
+			    }
+			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
+			    	$data['noarchive'] = true;
+			    }
+			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
+			    	$data['source_name'] = $globalSources[$nb]['name'];
+			    }
+			    if (isset($globalSources[$nb]['sourcestats'])) {
+			    	$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+			    }
 
 			    if (isset($ais_data['timestamp'])) {
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
@@ -1492,7 +2053,9 @@ 
 			    }
 			    $data['format_source'] = 'aisnmea';
     			    $data['id_source'] = $id_source;
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
+			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') {
+			    	$MI->add($data);
+			    }
 			    unset($data);
                         } elseif ($format === 'flightgearsp') {
                     	    //echo $buffer."\n";
@@ -1510,12 +2073,18 @@ 
 				$data['speed'] = round($line[5]*1.94384);
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'flightgearsp';
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
+					$data['noarchive'] = true;
+				}
+				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
+					$SI->add($data);
+				}
 				//$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
 			    }
                         } elseif ($format === 'acars') {
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+                    	    if ($globalDebug) {
+                    	    	echo 'ACARS : '.$buffer."\n";
+                    	    }
 			    $ACARS->add(trim($buffer));
 			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
 			    $ACARS->deleteLiveAcarsData();
@@ -1536,8 +2105,12 @@ 
 				    $aircraft_type = $line[10];
 				    $aircraft_type = preg_split(':/:',$aircraft_type);
 				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-				    if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
+				    	$data['noarchive'] = true;
+				    }
+				    if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
+				    	$SI->add($data);
+				    }
 				}
 			    }
 			} elseif ($format === 'beast') {
@@ -1547,28 +2120,62 @@ 
 			    foreach($buffer as $all_data) {
 				$line = json_decode('{'.$all_data.'}',true);
 				$data = array();
-				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
-				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
-				if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
-				if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
-				if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
-				if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
-				if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
+				if (isset($line['Icao'])) {
+					$data['hex'] = $line['Icao'];
+				}
+				// hex
+				if (isset($line['Call'])) {
+					$data['ident'] = $line['Call'];
+				}
+				// ident
+				if (isset($line['Alt'])) {
+					$data['altitude'] = $line['Alt'];
+				}
+				// altitude
+				if (isset($line['Spd'])) {
+					$data['speed'] = $line['Spd'];
+				}
+				// speed
+				if (isset($line['Trak'])) {
+					$data['heading'] = $line['Trak'];
+				}
+				// heading
+				if (isset($line['Lat'])) {
+					$data['latitude'] = $line['Lat'];
+				}
+				// lat
+				if (isset($line['Long'])) {
+					$data['longitude'] = $line['Long'];
+				}
+				// long
 				//$data['verticalrate'] = $line['']; // verticale rate
-				if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
+				if (isset($line['Sqk'])) {
+					$data['squawk'] = $line['Sqk'];
+				}
+				// squawk
 				$data['emergency'] = ''; // emergency
-				if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
+				if (isset($line['Reg'])) {
+					$data['registration'] = $line['Reg'];
+				}
 				/*
 				if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000);
 				else $data['datetime'] = date('Y-m-d H:i:s');
 				*/
 				$data['datetime'] = date('Y-m-d H:i:s');
-				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
+				if (isset($line['Type'])) {
+					$data['aircraft_icao'] = $line['Type'];
+				}
 		    		$data['format_source'] = 'vrstcp';
 				$data['id_source'] = $id_source;
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
+					$data['noarchive'] = true;
+				}
+				if (isset($value['name']) && $value['name'] != '') {
+					$data['source_name'] = $value['name'];
+				}
+				if (isset($data['latitude']) && isset($data['hex'])) {
+					$SI->add($data);
+				}
 				unset($data);
 			    }
 			} elseif ($format === 'tsv' || substr($buffer,0,4) === 'clock') {
@@ -1581,22 +2188,46 @@ 
     				$data['hex'] = $lined['hexid'];
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
     				$data['datetime'] = date('Y-m-d H:i:s');;
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
+    				if (isset($lined['ident'])) {
+    					$data['ident'] = $lined['ident'];
+    				}
+    				if (isset($lined['lat'])) {
+    					$data['latitude'] = $lined['lat'];
+    				}
+    				if (isset($lined['lon'])) {
+    					$data['longitude'] = $lined['lon'];
+    				}
+    				if (isset($lined['speed'])) {
+    					$data['speed'] = $lined['speed'];
+    				}
+    				if (isset($lined['squawk'])) {
+    					$data['squawk'] = $lined['squawk'];
+    				}
+    				if (isset($lined['alt'])) {
+    					$data['altitude'] = $lined['alt'];
+    				}
+    				if (isset($lined['heading'])) {
+    					$data['heading'] = $lined['heading'];
+    				}
     				$data['id_source'] = $id_source;
     				$data['format_source'] = 'tsv';
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
+    					$data['source_name'] = $globalSources[$nb]['name'];
+    				}
+    				if (isset($globalSources[$nb]['sourcestats'])) {
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+    				}
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
+					$data['noarchive'] = true;
+				}
+    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
+    					$SI->add($data);
+    				}
     				unset($lined);
     				unset($data);
-    			    } else $error = true;
+    			    } else {
+    			    	$error = true;
+    			    }
 			} elseif ($format === 'aprs' && $use_aprs) {
 			    if ($aprs_connect === 0) {
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
@@ -1622,63 +2253,121 @@ 
 				    $aprs_last_tx = time();
 				    $data = array();
 				    //print_r($line);
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
-				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
-				    if (isset($line['imo'])) $data['imo'] = $line['imo'];
-				    if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
-				    if (isset($line['arrival_code'])) $data['arrival_code'] = $line['arrival_code'];
-				    if (isset($line['arrival_date'])) $data['arrival_date'] = $line['arrival_date'];
-				    if (isset($line['typeid'])) $data['type_id'] = $line['typeid'];
-				    if (isset($line['statusid'])) $data['status_id'] = $line['statusid'];
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
-				    else $data['datetime'] = date('Y-m-d H:i:s');
+				    if (isset($line['address'])) {
+				    	$data['hex'] = $line['address'];
+				    }
+				    if (isset($line['mmsi'])) {
+				    	$data['mmsi'] = $line['mmsi'];
+				    }
+				    if (isset($line['imo'])) {
+				    	$data['imo'] = $line['imo'];
+				    }
+				    if (isset($line['squawk'])) {
+				    	$data['squawk'] = $line['squawk'];
+				    }
+				    if (isset($line['arrival_code'])) {
+				    	$data['arrival_code'] = $line['arrival_code'];
+				    }
+				    if (isset($line['arrival_date'])) {
+				    	$data['arrival_date'] = $line['arrival_date'];
+				    }
+				    if (isset($line['typeid'])) {
+				    	$data['type_id'] = $line['typeid'];
+				    }
+				    if (isset($line['statusid'])) {
+				    	$data['status_id'] = $line['statusid'];
+				    }
+				    if (isset($line['timestamp'])) {
+				    	$data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
+				    } else {
+				    	$data['datetime'] = date('Y-m-d H:i:s');
+				    }
 				    //$data['datetime'] = date('Y-m-d H:i:s');
-				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
+				    if (isset($line['ident'])) {
+				    	$data['ident'] = $line['ident'];
+				    }
 				    $data['latitude'] = $line['latitude'];
 				    $data['longitude'] = $line['longitude'];
 				    //$data['verticalrate'] = $line[16];
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
+				    if (isset($line['speed'])) {
+				    	$data['speed'] = $line['speed'];
+				    }
 				    //else $data['speed'] = 0;
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
+				    if (isset($line['altitude'])) {
+				    	$data['altitude'] = $line['altitude'];
+				    }
+				    if (isset($line['comment'])) {
+				    	$data['comment'] = $line['comment'];
+				    }
+				    if (isset($line['symbol'])) {
+				    	$data['type'] = $line['symbol'];
+				    }
 				    //if (isset($line['heading'])) $data['heading'] = $line['heading'];
 				    
-				    if (isset($line['heading']) && isset($line['format_source'])) $data['heading'] = $line['heading'];
+				    if (isset($line['heading']) && isset($line['format_source'])) {
+				    	$data['heading'] = $line['heading'];
+				    }
 				    //else echo 'No heading...'."\n";
 				    //else $data['heading'] = 0;
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
+				    if (isset($line['stealth'])) {
+				    	$data['aircraft_type'] = $line['stealth'];
+				    }
 				    //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
-				    if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
-				    elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-				    elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
+				    if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) {
+				    	$data['noarchive'] = true;
+				    } elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) {
+				    	$data['noarchive'] = false;
+				    }
+				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
+				    	$data['noarchive'] = true;
+				    } elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) {
+				    	$data['noarchive'] = false;
+				    }
     				    $data['id_source'] = $id_source;
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
-				    else $data['format_source'] = 'aprs';
+    				    if (isset($line['format_source'])) {
+    				    	$data['format_source'] = $line['format_source'];
+    				    } else {
+				    	$data['format_source'] = 'aprs';
+				    }
 				    $data['source_name'] = $line['source'];
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
-				    else $data['source_type'] = 'flarm';
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+				    if (isset($line['source_type'])) {
+				    	$data['source_type'] = $line['source_type'];
+				    } else {
+				    	$data['source_type'] = 'flarm';
+				    }
+    				    if (isset($globalSources[$nb]['sourcestats'])) {
+    				    	$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+    				    }
 				    $currentdate = date('Y-m-d H:i:s');
 				    $aprsdate = strtotime($data['datetime']);
-				    if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';
+				    if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') {
+				    	$data['altitude_relative'] = 'AMSL';
+				    }
 				    // Accept data if time <= system time + 20s
 				    //if (($data['source_type'] === 'modes') || isset($line['stealth']) && ($line['stealth'] === 0 || $line['stealth'] === '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
 				    if (($data['source_type'] === 'modes') || isset($line['stealth']) && (!isset($data['hex']) || $data['hex'] != 'FFFFFF') && ($line['stealth'] === 0 || $line['stealth'] === '') && (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
 					$send = $SI->add($data);
 				    } elseif ($data['source_type'] === 'ais') {
 					$data['type'] = '';
-					if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);
+					if (isset($globalMarine) && $globalMarine) {
+						$send = $MI->add($data);
+					}
 				    } elseif (isset($line['stealth'])) {
-					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
-					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
+					if ($line['stealth'] != 0) {
+						echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
+					} else {
+						echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
+					}
 				    } elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
 					    //$line['symbol'] === 'Balloon' ||
 					    $line['symbol'] === 'Glider' || 
 					    $line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter')) {
-					    if ($line['symbol'] === 'Ballon') $data['aircraft_icao'] = 'BALL';
-					    if ($line['symbol'] === 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';
+					    if ($line['symbol'] === 'Ballon') {
+					    	$data['aircraft_icao'] = 'BALL';
+					    }
+					    if ($line['symbol'] === 'Glider') {
+					    	$data['aircraft_icao'] = 'PARAGLIDER';
+					    }
 					    $send = $SI->add($data);
 				    } elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
 					    $line['symbol'] === 'Yacht (Sail)' || 
@@ -1709,9 +2398,13 @@ 
 				    //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
 				//    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
-					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
+					if (isset($globalTracker) && $globalTracker) {
+						$send = $TI->add($data);
+					}
 				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
-					if (!isset($data['altitude'])) $data['altitude'] = 0;
+					if (!isset($data['altitude'])) {
+						$data['altitude'] = 0;
+					}
 					$Source->deleteOldLocationByType('gs');
 					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
 						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
@@ -1720,7 +2413,9 @@ 
 					}
 				    } elseif (isset($line['symbol']) && $line['symbol'] === 'Weather Station') {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
-					if ($globalDebug) echo '# Weather Station added'."\n";
+					if ($globalDebug) {
+						echo '# Weather Station added'."\n";
+					}
 					$Source->deleteOldLocationByType('wx');
 					$weather_data = json_encode($line);
 					if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) {
@@ -1730,7 +2425,9 @@ 
 					}
 				    } elseif (isset($line['symbol']) && ($line['symbol'] === 'Lightning' || $line['symbol'] === 'Thunderstorm')) {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
-					if ($globalDebug) echo '☈ Lightning added'."\n";
+					if ($globalDebug) {
+						echo '☈ Lightning added'."\n";
+					}
 					$Source->deleteOldLocationByType('lightning');
 					if (count($Source->getLocationInfoByNameType($data['ident'],'lightning')) > 0) {
 						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
@@ -1742,8 +2439,7 @@ 
 				    	print_r($line);
 				    }
 				    unset($data);
-				}
-				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
+				} elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
 					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
 				}
 				/*
@@ -1752,7 +2448,9 @@ 
 				}
 				*/
 				//elseif ($line === false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
-				elseif ($line === true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
+				elseif ($line === true && $globalDebug) {
+					echo '!! Failed : '.$buffer."!!\n";
+				}
 				if (isset($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) {
 					$Source->deleteOldLocationByType('lightning');
 					$Source->deleteOldLocationByType('wx');
@@ -1788,26 +2486,45 @@ 
     				$data['ground'] = $line[21];
     				$data['emergency'] = $line[19];
     				$data['format_source'] = 'sbs';
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
+					$data['source_name'] = $globalSources[$nb]['name'];
+				}
+    				if (isset($globalSources[$nb]['sourcestats'])) {
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+    				}
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
+					$data['noarchive'] = true;
+				}
     				$data['id_source'] = $id_source;
-    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
-    				else $error = true;
+    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
+    					$send = $SI->add($data);
+    				} else {
+    					$error = true;
+    				}
     				unset($data);
-    			    } else $error = true;
+    			    } else {
+    			    	$error = true;
+    			    }
 			    if ($error) {
 				if (count($line) > 1 && ($line[0] === 'STA' || $line[0] === 'AIR' || $line[0] === 'SEL' || $line[0] === 'ID' || $line[0] === 'CLK')) { 
-					if ($globalDebug) echo "Not a message. Ignoring... \n";
+					if ($globalDebug) {
+						echo "Not a message. Ignoring... \n";
+					}
 				} else {
-					if ($globalDebug) echo "Wrong line format. Ignoring... \n";
+					if ($globalDebug) {
+						echo "Wrong line format. Ignoring... \n";
+					}
 					if ($globalDebug) {
 						echo $buffer;
 						//print_r($line);
 					}
 					//socket_close($r);
-					if ($globalDebug) echo "Reconnect after an error...\n";
-					if ($format === 'aprs') $aprs_connect = 0;
+					if ($globalDebug) {
+						echo "Reconnect after an error...\n";
+					}
+					if ($format === 'aprs') {
+						$aprs_connect = 0;
+					}
 					$sourceer[$nb] = $globalSources[$nb];
 					connect_all($sourceer);
 					$sourceer = array();
@@ -1815,10 +2532,14 @@ 
 			    }
 			}
 			// Sleep for xxx microseconds
-			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
+			if (isset($globalSBSSleep)) {
+				usleep($globalSBSSleep);
+			}
 		    } else {
 			if ($format === 'flightgearmp') {
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
+			    	if ($globalDebug) {
+			    		echo "Reconnect FlightGear MP...";
+			    	}
 				//@socket_close($r);
 				sleep($globalMinFetch);
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1827,10 +2548,15 @@ 
 				break;
 				
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
-			    if (isset($tt[$format])) $tt[$format]++;
-			    else $tt[$format] = 0;
+			    if (isset($tt[$format])) {
+			    	$tt[$format]++;
+			    } else {
+			    	$tt[$format] = 0;
+			    }
 			    if ($tt[$format] > 30 || $buffer === FALSE) {
-				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
+				if ($globalDebug) {
+					echo "ERROR : Reconnect ".$format."...";
+				}
 				//@socket_close($r);
 				sleep(2);
 				$aprs_connect = 0;
@@ -1848,11 +2574,17 @@ 
 	    } else {
 		$error = socket_strerror(socket_last_error());
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
-			if (isset($globalDebug)) echo "Restarting...\n";
+			if ($globalDebug) {
+				echo "ERROR : socket_select give this error ".$error . "\n";
+			}
+			if (isset($globalDebug)) {
+				echo "Restarting...\n";
+			}
 			// Restart the script if possible
 			if (is_array($sockets)) {
-			    if ($globalDebug) echo "Shutdown all sockets...";
+			    if ($globalDebug) {
+			    	echo "Shutdown all sockets...";
+			    }
 			    
 			    foreach ($sockets as $sock) {
 				@socket_shutdown($sock,2);
@@ -1860,25 +2592,45 @@ 
 			    }
 			    
 			}
-			if ($globalDebug) echo "Waiting...";
+			if ($globalDebug) {
+				echo "Waiting...";
+			}
 			sleep(2);
 			$time = time();
 			//connect_all($hosts);
 			$aprs_connect = 0;
-			if ($reset%5 === 0) sleep(20);
-			if ($reset%10 === 0) sleep(100);
-			if ($reset%20 === 0) sleep(200);
-			if ($reset > 100) exit('Too many attempts...');
-			if ($globalDebug) echo "Restart all connections...";
+			if ($reset%5 === 0) {
+				sleep(20);
+			}
+			if ($reset%10 === 0) {
+				sleep(100);
+			}
+			if ($reset%20 === 0) {
+				sleep(200);
+			}
+			if ($reset > 100) {
+				exit('Too many attempts...');
+			}
+			if ($globalDebug) {
+				echo "Restart all connections...";
+			}
 			connect_all($globalSources);
 		}
 	    }
 	}
 	if ($globalDaemon === false) {
-	    if ($globalDebug) echo 'Check all...'."\n";
-	    if (isset($SI)) $SI->checkAll();
-	    if (isset($TI)) $TI->checkAll();
-	    if (isset($MI)) $MI->checkAll();
+	    if ($globalDebug) {
+	    	echo 'Check all...'."\n";
+	    }
+	    if (isset($SI)) {
+	    	$SI->checkAll();
+	    }
+	    if (isset($TI)) {
+	    	$TI->checkAll();
+	    }
+	    if (isset($MI)) {
+	    	$MI->checkAll();
+	    }
 	}
     }
 }

install/index.php

Indentation +42 added lines, -42 removed lines

@@ -188,13 +188,13 @@ 
 			<p>
 				<label for="siteurl">Site directory</label>
 				<?php
-				    // Try to detect site directory
-				    if ((!isset($globalURL) || $globalURL == '') && (!isset($globalDBuser) || $globalDBuser == '')) {
+					// Try to detect site directory
+					if ((!isset($globalURL) || $globalURL == '') && (!isset($globalDBuser) || $globalDBuser == '')) {
 					if (isset($_SERVER['REQUEST_URI'])) {
 						$URL = $_SERVER['REQUEST_URI'];
 						$globalURL = str_replace('/install','',str_replace('/install/','',str_replace('/install/index.php','',$URL)));
 					}
-				    }
+					}
 				?>
 				<input type="text" name="siteurl" id="siteurl" value="<?php if (isset($globalURL)) print $globalURL; ?>" />
 				<p class="help-block">ex : <i>/flightairmap</i> if complete URL is <i>http://toto.com/flightairmap</i></p>
@@ -373,17 +373,17 @@ 
 				</tr>
 				
 		<?php
-		    if (isset($globalDBuser) && isset($globalDBpass) && $globalDBuser != '' && $globalDBpass != '') {
+			if (isset($globalDBuser) && isset($globalDBpass) && $globalDBuser != '' && $globalDBpass != '') {
 		?>
 		<!--
 		<?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->tableExists('source_location')) {
+				if ($Connection->tableExists('source_location')) {
 				require_once(dirname(__FILE__).'/../require/class.Source.php');
 				$Source = new Source();
 				//$alllocations = $Source->getAllLocationInfo();
@@ -403,9 +403,9 @@ 
 		
 		<?php
 				}
-			    }
+				}
+			}
 			}
-		    }
 		?>
 
 				<tr>
@@ -515,12 +515,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="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td>
 								<?php
-								    } else {
+									} else {
 									$hostport = explode(':',$source['host']);
 									if (isset($hostport[1])) {
 										$host = $hostport[0];
@@ -533,7 +533,7 @@ 
 								<td><input type="text" name="host[]" id="host" value="<?php print $host; ?>" /></td>
 								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php print $port; ?>" /></td>
 								<?php
-								    }
+									}
 								?>
 								<td>
 									<select name="format[]" id="format">
@@ -673,9 +673,9 @@ 
 			    </thead>
 			    <tbody>
 				<?php
-				    if (isset($globalNewsFeeds) && !empty($globalNewsFeeds)) {
+					if (isset($globalNewsFeeds) && !empty($globalNewsFeeds)) {
 					foreach ($globalNewsFeeds as $type => $feedslng) {
-					    foreach ($feedslng as $lng => $feeds) {
+						foreach ($feedslng as $lng => $feeds) {
 						foreach ($feeds as $feed) {
 				?>
 				<tr>
@@ -700,9 +700,9 @@ 
 				
 				<?php
 						}
-					    }
+						}
+					}
 					}
-				    }
 				?>
 				<tr>
 				    <td><input type="url" name="newsurl[]" /></td>
@@ -1092,7 +1092,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'; ?>" />
@@ -1102,11 +1102,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 />
@@ -1130,7 +1130,7 @@ 
 	</p>
 <?php
 	require('../footer.php');
-        exit;
+		exit;
 }
 // '	
 $settings = array();
@@ -1221,8 +1221,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;
 
@@ -1232,13 +1232,13 @@ 
 	
 	$newsfeeds = array();
 	foreach($newsurl as $newskey => $url) {
-	    if ($url != '') {
+		if ($url != '') {
 		$type = $newstype[$newskey];
 		$lng = $newslng[$newskey];
 		if (isset($newsfeeds[$type][$lng])) {
-		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url));
+			$newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url));
 		} else $newsfeeds[$type][$lng] = array($url);
-	    }
+		}
 	}
 	$settings = array_merge($settings,array('globalNewsFeeds' => $newsfeeds));
 
@@ -1681,14 +1681,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'));
 
@@ -1736,21 +1736,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>';
@@ -1816,7 +1816,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 +592 added lines, -159 removed lines

@@ -4,11 +4,19 @@ 
 if (isset($_SESSION['error'])) {
 	header('Content-Encoding: none;');
 	echo 'Error : '.$_SESSION['error'].' - Resetting install... You need to fix the problem and run install again.';
-	if (isset($_SESSION['error'])) unset($_SESSION['error']);
-	if (isset($_SESSION['errorlst'])) unset($_SESSION['errorlst']);
-	if (isset($_SESSION['next'])) unset($_SESSION['next']);
-	if (isset($_SESSION['install'])) unset($_SESSION['install']);
-}
+	if (isset($_SESSION['error'])) {
+		unset($_SESSION['error']);
+	}
+	if (isset($_SESSION['errorlst'])) {
+		unset($_SESSION['errorlst']);
+	}
+	if (isset($_SESSION['next'])) {
+		unset($_SESSION['next']);
+	}
+	if (isset($_SESSION['install'])) {
+		unset($_SESSION['install']);
+	}
+	}
 /*
 if (isset($_SESSION['errorlst'])) {
 	header('Content-Encoding: none;');
@@ -159,31 +167,49 @@ 
 			</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>
@@ -196,18 +222,27 @@ 
 					}
 				    }
 				?>
-				<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">ex : <i>/flightairmap</i> if complete URL is <i>http://toto.com/flightairmap</i></p>
 				<p class="help-block">Can be empty</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>
@@ -227,11 +262,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>
@@ -239,7 +280,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>
@@ -247,7 +291,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>
@@ -255,7 +302,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>
@@ -263,11 +313,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>
@@ -275,7 +331,10 @@ 
 			<div id="openweathermap_data">
 				<p>
 					<label for="openweathermapkey">OpenWeatherMap key (weather layer)</label>
-					<input type="text" name="openweathermapkey" id="openweathermapkey" value="<?php if (isset($globalOpenWeatherMapKey)) print $globalOpenWeatherMapKey; ?>" />
+					<input type="text" name="openweathermapkey" id="openweathermapkey" value="<?php if (isset($globalOpenWeatherMapKey)) {
+	print $globalOpenWeatherMapKey;
+}
+?>" />
 					<p class="help-block">Get a key <a href="https://openweathermap.org/">here</a></p>
 				</p>
 			</div>
@@ -304,42 +363,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>
@@ -348,15 +451,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">
@@ -472,11 +584,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>
 -->
@@ -518,7 +636,10 @@ 
 								    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="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td>
+								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) {
+	print $source['port'];
+}
+?>" /></td>
 								<?php
 								    } else {
 									$hostport = explode(':',$source['host']);
@@ -537,35 +658,110 @@ 
 								?>
 								<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="aircraftjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftjson') print 'selected'; ?>>Dump1090 aircraft.json</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 AircraftList.json</option>
-										<option value="vrstcp" <?php if (isset($source['format']) && $source['format'] == 'vrstcp') print 'selected'; ?>>Virtual Radar Server TCP</option>
-										<option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') print 'selected'; ?>>phpVMS</option>
-										<option value="vaos" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') print 'selected'; ?>>Virtual Airline Operations System (VAOS)</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 SBS-3 over TCP</option>
-										<option value="ais" <?php if (isset($source['format']) && $source['format'] == 'ais') print 'selected'; ?>>NMEA AIS over TCP</option>
-										<option value="airwhere" <?php if (isset($source['format']) && $source['format'] == 'airwhere') print 'selected'; ?>>AirWhere website</option>
-										<option value="hidnseek_callback" <?php if (isset($source['format']) && $source['format'] == 'hidnseek_callback') print 'selected'; ?>>HidnSeek Callback</option>
-										<option value="blitzortung" <?php if (isset($source['format']) && $source['format'] == 'blitzortung') print 'selected'; ?>>Blitzortung</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="aircraftjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftjson') {
+	print 'selected';
+}
+?>>Dump1090 aircraft.json</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 AircraftList.json</option>
+										<option value="vrstcp" <?php if (isset($source['format']) && $source['format'] == 'vrstcp') {
+	print 'selected';
+}
+?>>Virtual Radar Server TCP</option>
+										<option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') {
+	print 'selected';
+}
+?>>phpVMS</option>
+										<option value="vaos" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') {
+	print 'selected';
+}
+?>>Virtual Airline Operations System (VAOS)</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 SBS-3 over TCP</option>
+										<option value="ais" <?php if (isset($source['format']) && $source['format'] == 'ais') {
+	print 'selected';
+}
+?>>NMEA AIS over TCP</option>
+										<option value="airwhere" <?php if (isset($source['format']) && $source['format'] == 'airwhere') {
+	print 'selected';
+}
+?>>AirWhere website</option>
+										<option value="hidnseek_callback" <?php if (isset($source['format']) && $source['format'] == 'hidnseek_callback') {
+	print 'selected';
+}
+?>>HidnSeek Callback</option>
+										<option value="blitzortung" <?php if (isset($source['format']) && $source['format'] == 'blitzortung') {
+	print 'selected';
+}
+?>>Blitzortung</option>
 									</select>
 								</td>
 								<td>
-									<input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) print $source['name']; ?>" />
+									<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="checkbox" name="noarchive[]" id="noarchive" title="Don't archive this source" value="1" <?php if (isset($source['noarchive']) && $source['noarchive']) print 'checked'; ?> /></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="checkbox" name="noarchive[]" id="noarchive" title="Don't archive this source" value="1" <?php if (isset($source['noarchive']) && $source['noarchive']) {
+	print 'checked';
+}
+?> /></td>
 								<td>
 									<select name="timezones[]" id="timezones">
 								<?php
@@ -575,7 +771,9 @@ 
 											print '<option selected>'.$timezones.'</option>';
 										} elseif (!isset($source['timezone']) && $timezones == 'UTC') {
 											print '<option selected>'.$timezones.'</option>';
-										} else print '<option>'.$timezones.'</option>';
+										} else {
+											print '<option>'.$timezones.'</option>';
+										}
 									}
 								?>
 									</select>
@@ -627,7 +825,9 @@ 
 									foreach($timezonelist as $timezones){
 										if ($timezones == 'UTC') {
 											print '<option selected>'.$timezones.'</option>';
-										} else print '<option>'.$timezones.'</option>';
+										} else {
+											print '<option>'.$timezones.'</option>';
+										}
 									}
 								?>
 									</select>
@@ -652,11 +852,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>
@@ -682,17 +888,38 @@ 
 				    <td><input type="url" name="newsurl[]" value="<?php print $feed; ?>"/></td>
 				    <td>
 					<select name="newslang[]">
-					    <option value="en"<?php if ($lng == 'en') print ' selected'; ?>>English</option>
-					    <option value="fr"<?php if ($lng == 'fr') print ' selected'; ?>>French</option>
+					    <option value="en"<?php if ($lng == 'en') {
+	print ' selected';
+}
+?>>English</option>
+					    <option value="fr"<?php if ($lng == 'fr') {
+	print ' selected';
+}
+?>>French</option>
 					</select>
 				    </td>
 				    <td>
 					<select name="newstype[]">
-					    <option value="global"<?php if ($type == 'global') print ' selected'; ?>>Global</option>
-					    <option value="aircraft"<?php if ($type == 'aircraft') print ' selected'; ?>>Aircraft</option>
-					    <option value="marine"<?php if ($type == 'marine') print ' selected'; ?>>Marine</option>
-					    <option value="tracker"<?php if ($type == 'tracker') print ' selected'; ?>>Tracker</option>
-					    <option value="satellite"<?php if ($type == 'Satellite') print ' selected'; ?>>Satellite</option>
+					    <option value="global"<?php if ($type == 'global') {
+	print ' selected';
+}
+?>>Global</option>
+					    <option value="aircraft"<?php if ($type == 'aircraft') {
+	print ' selected';
+}
+?>>Aircraft</option>
+					    <option value="marine"<?php if ($type == 'marine') {
+	print ' selected';
+}
+?>>Marine</option>
+					    <option value="tracker"<?php if ($type == 'tracker') {
+	print ' selected';
+}
+?>>Tracker</option>
+					    <option value="satellite"<?php if ($type == 'Satellite') {
+	print ' selected';
+}
+?>>Satellite</option>
 					</select>
 				    </td>
 				    <td><input type="button" value="Delete" onclick="deleteRowNews(this)" /> <input type="button" value="Add" onclick="insRowNews()" /></td>
@@ -825,13 +1052,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>
 				-->
@@ -840,10 +1073,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>
@@ -853,11 +1092,17 @@ 
 						<b>FlightAware API Key</b>
 						<p>
 							<label for="flightawareusername">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">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>
 					<p class="help-block">Register an account on <a href="https://www.flightaware.com/">https://www.flightaware.com/</a></p>
@@ -874,10 +1119,22 @@ 
 				<p>
 					<label for="mapmatchingsource">Map Matching source</label>
 					<select name="mapmatchingsource" id="mapmatchingsource">
-						<option value="fam" <?php if ((isset($globalMapMatchingSource) && $globalMapMatchingSource == 'fam') || !isset($globalMatchingSource)) print 'selected="selected" '; ?>>FlightAirMap Map Matching</option>
-						<option value="graphhopper" <?php if (isset($globalMapMatchingSource) && $globalMapMatchingSource == 'graphhopper') print 'selected="selected" '; ?>>GraphHopper</option>
-						<option value="osmr" <?php if (isset($globalMapMatchingSource) && $globalMapMatchingSource == 'osmr') print 'selected="selected" '; ?>>OSMR</option>
-						<option value="mapbox" <?php if (isset($globalMapMatchingSource) && $globalMapMatchingSource == 'mapbox') print 'selected="selected" '; ?>>Mapbox</option>
+						<option value="fam" <?php if ((isset($globalMapMatchingSource) && $globalMapMatchingSource == 'fam') || !isset($globalMatchingSource)) {
+	print 'selected="selected" ';
+}
+?>>FlightAirMap Map Matching</option>
+						<option value="graphhopper" <?php if (isset($globalMapMatchingSource) && $globalMapMatchingSource == 'graphhopper') {
+	print 'selected="selected" ';
+}
+?>>GraphHopper</option>
+						<option value="osmr" <?php if (isset($globalMapMatchingSource) && $globalMapMatchingSource == 'osmr') {
+	print 'selected="selected" ';
+}
+?>>OSMR</option>
+						<option value="mapbox" <?php if (isset($globalMapMatchingSource) && $globalMapMatchingSource == 'mapbox') {
+	print 'selected="selected" ';
+}
+?>>Mapbox</option>
 					</select>
 					<p class="help-block">Mapbox need the API Key defined in map section.</p>
 					<p class="help-block">FlightAirMap Map Matching is free, without API key but limited to about 100 input points to keep fast results.</p>
@@ -885,7 +1142,10 @@ 
 				<br />
 				<p>
 					<label for="graphhopper">GraphHopper API Key</label>
-					<input type="text" name="graphhopper" id="graphhopper" value="<?php if (isset($globalGraphHopperKey)) print $globalGraphHopperKey; ?>" />
+					<input type="text" name="graphhopper" id="graphhopper" value="<?php if (isset($globalGraphHopperKey)) {
+	print $globalGraphHopperKey;
+}
+?>" />
 					<p class="help-block">Register an account on <a href="https://www.graphhopper.com/">https://www.graphhopper.com/</a></p>
 				</p>
 			</div>
@@ -903,7 +1163,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 />
@@ -919,14 +1182,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>
@@ -942,11 +1211,26 @@ 
 			<p>
 				<label for="geoid_source">Geoid Source</label>
 				<select name="geoid_source" id="geoid_source">
-					<option value="egm96-15"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm96-15') print ' selected="selected"'; ?>>EGM96 15' (2.1MB)</option>
-					<option value="egm96-5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm96-5') print ' selected="selected"'; ?>>EGM96 5' (19MB)</option>
-					<option value="egm2008-5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-5') print ' selected="selected"'; ?>>EGM2008 5' (19MB)</option>
-					<option value="egm2008-2_5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-2_5') print ' selected="selected"'; ?>>EGM2008 2.5' (75MB)</option>
-					<option value="egm2008-1"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-1') print ' selected="selected"'; ?>>EGM2008 1' (470MB)</option>
+					<option value="egm96-15"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm96-15') {
+	print ' selected="selected"';
+}
+?>>EGM96 15' (2.1MB)</option>
+					<option value="egm96-5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm96-5') {
+	print ' selected="selected"';
+}
+?>>EGM96 5' (19MB)</option>
+					<option value="egm2008-5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-5') {
+	print ' selected="selected"';
+}
+?>>EGM2008 5' (19MB)</option>
+					<option value="egm2008-2_5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-2_5') {
+	print ' selected="selected"';
+}
+?>>EGM2008 2.5' (75MB)</option>
+					<option value="egm2008-1"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-1') {
+	print ' selected="selected"';
+}
+?>>EGM2008 1' (470MB)</option>
 				</select>
 				<p class="help-block">The geoid is approximated by an "earth gravity model" (EGM).</p>
 			</p>
@@ -968,7 +1252,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 '1'; ?>" />
+				<input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) {
+	print $globalArchiveMonths;
+} else {
+	echo '1';
+}
+?>" />
 				<p class="help-block">0 to disable, delete old flight if <i>Archive all flights data</i> is disabled</p>
 			</p>
 			<p>
@@ -978,12 +1267,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 '1'; ?>" />
+				<input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) {
+	print $globalArchiveKeepMonths;
+} else {
+	echo '1';
+}
+?>" />
 				<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 '1'; ?>" />
+				<input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) {
+	print $globalArchiveKeepTrackMonths;
+} else {
+	echo '1';
+}
+?>" />
 				<p class="help-block">0 to disable, should be less or egal to <i>Keep flights data</i> value</p>
 			</p>
 			<br />
@@ -993,7 +1292,12 @@ 
 				<p class="help-block">Uncheck if the script is running as cron job. You should always run it as daemon when it's possible.</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>
@@ -1046,20 +1350,40 @@ 
 			<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>
 			<p>
 				<label for="minfetch">HTTP/file source fetch every xxx seconds</label>
-				<input type="number" name="minfetch" id="minfetch" value="<?php if (isset($globalMinFetch)) echo $globalMinFetch; else echo '20'; ?>" />
+				<input type="number" name="minfetch" id="minfetch" value="<?php if (isset($globalMinFetch)) {
+	echo $globalMinFetch;
+} else {
+	echo '20';
+}
+?>" />
 			</p>
 			<p>
 				<label for="bbox">Only display flights that we can see on screen (bounding box)</label>
@@ -1073,12 +1397,20 @@ 
 			<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>
@@ -1097,7 +1429,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')) {
 			?>
@@ -1115,14 +1452,27 @@ 
 			<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>
 			<br />
 			<p>
 				<label for="customcss">Custom CSS web path</label>
-				<input type="text" name="customcss" id="customcss" value="<?php if (isset($globalCustomCSS)) echo $globalCustomCSS; ?>" />
+				<input type="text" name="customcss" id="customcss" value="<?php if (isset($globalCustomCSS)) {
+	echo $globalCustomCSS;
+}
+?>" />
 			</p>
 		</fieldset>
 		<input type="submit" name="submit" value="Create/Update database & write setup" />
@@ -1149,8 +1499,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;
@@ -1218,15 +1572,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;
 
 	$newsurl = $_POST['newsurl'];
 	$newslng = $_POST['newslang'];
@@ -1239,7 +1601,9 @@ 
 		$lng = $newslng[$newskey];
 		if (isset($newsfeeds[$type][$lng])) {
 		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url));
-		} else $newsfeeds[$type][$lng] = array($url);
+		} else {
+			$newsfeeds[$type][$lng] = array($url);
+		}
 	    }
 	}
 	$settings = array_merge($settings,array('globalNewsFeeds' => $newsfeeds));
@@ -1263,17 +1627,29 @@ 
 	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
 
 	$globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING);
-	if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
+	if ($globalaircraft == 'aircraft') {
+		$settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
+	}
 	$globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING);
-	if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalTracker' => 'FALSE'));
+	if ($globaltracker == 'tracker') {
+		$settings = array_merge($settings,array('globalTracker' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalTracker' => 'FALSE'));
+	}
 	$globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING);
-	if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalMarine' => 'FALSE'));
+	if ($globalmarine == 'marine') {
+		$settings = array_merge($settings,array('globalMarine' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalMarine' => 'FALSE'));
+	}
 	$globalsatellite = filter_input(INPUT_POST,'globalsatellite',FILTER_SANITIZE_STRING);
-	if ($globalsatellite == 'satellite') $settings = array_merge($settings,array('globalSatellite' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalSatellite' => 'FALSE'));
+	if ($globalsatellite == 'satellite') {
+		$settings = array_merge($settings,array('globalSatellite' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalSatellite' => 'FALSE'));
+	}
 
 /*	
 	$globalSBS1Hosts = array();
@@ -1295,23 +1671,37 @@ 
 	$name = $_POST['name'];
 	$format = $_POST['format'];
 	$timezones = $_POST['timezones'];
-	if (isset($_POST['sourcestats'])) $sourcestats = $_POST['sourcestats'];
-	else $sourcestats = array();
-	if (isset($_POST['noarchive'])) $noarchive = $_POST['noarchive'];
-	else $noarchive = array();
+	if (isset($_POST['sourcestats'])) {
+		$sourcestats = $_POST['sourcestats'];
+	} else {
+		$sourcestats = array();
+	}
+	if (isset($_POST['noarchive'])) {
+		$noarchive = $_POST['noarchive'];
+	} else {
+		$noarchive = array();
+	}
 	$gSources = array();
 	$forcepilots = false;
 	foreach ($host as $key => $h) {
-		if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) $cov = 'TRUE';
-		else $cov = 'FALSE';
-		if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE';
-		else $arch = 'FALSE';
+		if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) {
+			$cov = 'TRUE';
+		} else {
+			$cov = 'FALSE';
+		}
+		if (isset($noarchive[$key]) && $noarchive[$key] == 1) {
+			$arch = 'TRUE';
+		} else {
+			$arch = 'FALSE';
+		}
 		if (strpos($format[$key],'_callback')) {
 			$gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE');
 		} elseif ($h != '' || $name[$key] != '') {
 			$gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE');
 		}
-		if ($format[$key] == 'airwhere') $forcepilots = true;
+		if ($format[$key] == 'airwhere') {
+			$forcepilots = true;
+		}
 	}
 	$settings = array_merge($settings,array('globalSources' => $gSources));
 
@@ -1342,7 +1732,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));
@@ -1383,7 +1775,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'));
+	}
 
 	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
 	if ($resetyearstats == 'resetyearstats') {
@@ -1426,37 +1820,56 @@ 
 	}
 */
 	$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'));
+	}
 	$va = false;
 	if ($globalivao == 'ivao') {
 		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
 		$va = 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'));
 		$va = 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'));
 		$va = 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'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
+	} else {
+		$settings = array_merge($settings,array('globalVAM' => 'FALSE'));
+	}
 	if ($va) {
 		$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'));
+	}
 	if ($globalva == 'va' || $va) {
 		$settings = array_merge($settings,array('globalVA' => 'TRUE'));
 		$settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
 	} else {
 		$settings = array_merge($settings,array('globalVA' => 'FALSE'));
-		if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
-		else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE'));
+		if ($forcepilots) {
+			$settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
+		} else {
+			$settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE'));
+		}
 	}
 	
 	
@@ -1679,7 +2092,9 @@ 
 	$graphhopper = filter_input(INPUT_POST,'graphhopper',FILTER_SANITIZE_STRING);
 	$settings = array_merge($settings,array('globalGraphHopperKey' => $graphhopper));
 
-	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)) {
@@ -1694,15 +2109,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 {
@@ -1739,10 +2162,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);
@@ -1753,7 +2184,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 +284 added lines, -284 removed lines

@@ -22,7 +22,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_once(dirname(__FILE__).'/../require/class.Common.php');
 require(dirname(__FILE__).'/header.php');
@@ -95,8 +95,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.";
 		}
 	/*
@@ -113,12 +113,12 @@ 
 	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(array('install/','install'),'search',str_replace('index.php','',$_SERVER["REQUEST_URI"])));
-			$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/','install'),'live/geojson?test',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(array('install/', 'install'), 'live/geojson?test', str_replace('index.php', '', $_SERVER["REQUEST_URI"])));
+			if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
 				print '<div class="alert alert-danger"><strong>Error</strong> Check your configuration, rewrite don\'t seems to work well. If using Apache, you need to desactivate MultiViews <a href="https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration">https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration</a></div>';
 			} else {
-				$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/','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(array('install/', 'install'), 'search', str_replace('index.php', '', $_SERVER["REQUEST_URI"])));
+				if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
 					print '<div class="alert alert-danger"><strong>Error</strong> Check your configuration, rewrite don\'t seems to work well. If using Apache, you need to desactivate MultiViews <a href="https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration">https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration</a></div>';
 				}
 			}
@@ -198,7 +198,7 @@ 
 				    if ((!isset($globalURL) || $globalURL == '') && (!isset($globalDBuser) || $globalDBuser == '')) {
 					if (isset($_SERVER['REQUEST_URI'])) {
 						$URL = $_SERVER['REQUEST_URI'];
-						$globalURL = str_replace('/install','',str_replace('/install/','',str_replace('/install/index.php','',$URL)));
+						$globalURL = str_replace('/install', '', str_replace('/install/', '', str_replace('/install/index.php', '', $URL)));
 					}
 				    }
 				?>
@@ -521,13 +521,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="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td>
 								<?php
 								    } else {
-									$hostport = explode(':',$source['host']);
+									$hostport = explode(':', $source['host']);
 									if (isset($hostport[1])) {
 										$host = $hostport[0];
 										$port = $hostport[1];
@@ -576,7 +576,7 @@ 
 									<select name="timezones[]" id="timezones">
 								<?php
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
-									foreach($timezonelist as $timezones){
+									foreach ($timezonelist as $timezones) {
 										if (isset($source['timezone']) && $source['timezone'] == $timezones) {
 											print '<option selected>'.$timezones.'</option>';
 										} elseif (!isset($source['timezone']) && $timezones == 'UTC') {
@@ -630,7 +630,7 @@ 
 									<select name="timezones[]" id="timezones">
 								<?php
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
-									foreach($timezonelist as $timezones){
+									foreach ($timezonelist as $timezones) {
 										if ($timezones == 'UTC') {
 											print '<option selected>'.$timezones.'</option>';
 										} else print '<option>'.$timezones.'</option>';
@@ -1084,7 +1084,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>
@@ -1146,14 +1146,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';
@@ -1173,49 +1173,49 @@ 
 	} 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);
-	$openweathermapkey = filter_input(INPUT_POST,'openweathermapkey',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,'globalOpenWeatherMapKey' => $openweathermapkey));
+	$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);
+	$openweathermapkey = filter_input(INPUT_POST, 'openweathermapkey', 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, 'globalOpenWeatherMapKey' => $openweathermapkey));
 	
-	$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'];
@@ -1229,8 +1229,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;
 
@@ -1239,16 +1239,16 @@ 
 	$newstype = $_POST['newstype'];
 	
 	$newsfeeds = array();
-	foreach($newsurl as $newskey => $url) {
+	foreach ($newsurl as $newskey => $url) {
 	    if ($url != '') {
 		$type = $newstype[$newskey];
 		$lng = $newslng[$newskey];
 		if (isset($newsfeeds[$type][$lng])) {
-		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url));
+		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng], array($url));
 		} else $newsfeeds[$type][$lng] = array($url);
 	    }
 	}
-	$settings = array_merge($settings,array('globalNewsFeeds' => $newsfeeds));
+	$settings = array_merge($settings, array('globalNewsFeeds' => $newsfeeds));
 
 	//$sbshost = filter_input(INPUT_POST,'sbshost',FILTER_SANITIZE_STRING);
 	//$sbsport = filter_input(INPUT_POST,'sbsport',FILTER_SANITIZE_NUMBER_INT);
@@ -1259,27 +1259,27 @@ 
 	$sbsurl = $_POST['sbsurl'];
 	*/
 
-	$globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING);
-	$globalva = filter_input(INPUT_POST,'globalva',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);
+	$globalva = filter_input(INPUT_POST, 'globalva', 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);
 
-	$globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING);
-	if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
-	$globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING);
-	if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalTracker' => 'FALSE'));
-	$globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING);
-	if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalMarine' => 'FALSE'));
-	$globalsatellite = filter_input(INPUT_POST,'globalsatellite',FILTER_SANITIZE_STRING);
-	if ($globalsatellite == 'satellite') $settings = array_merge($settings,array('globalSatellite' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalSatellite' => 'FALSE'));
+	$globalaircraft = filter_input(INPUT_POST, 'globalaircraft', FILTER_SANITIZE_STRING);
+	if ($globalaircraft == 'aircraft') $settings = array_merge($settings, array('globalAircraft' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalAircraft' => 'FALSE'));
+	$globaltracker = filter_input(INPUT_POST, 'globaltracker', FILTER_SANITIZE_STRING);
+	if ($globaltracker == 'tracker') $settings = array_merge($settings, array('globalTracker' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalTracker' => 'FALSE'));
+	$globalmarine = filter_input(INPUT_POST, 'globalmarine', FILTER_SANITIZE_STRING);
+	if ($globalmarine == 'marine') $settings = array_merge($settings, array('globalMarine' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalMarine' => 'FALSE'));
+	$globalsatellite = filter_input(INPUT_POST, 'globalsatellite', FILTER_SANITIZE_STRING);
+	if ($globalsatellite == 'satellite') $settings = array_merge($settings, array('globalSatellite' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalSatellite' => 'FALSE'));
 
 /*	
 	$globalSBS1Hosts = array();
@@ -1295,7 +1295,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'];
@@ -1312,115 +1312,115 @@ 
 		else $cov = 'FALSE';
 		if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE';
 		else $arch = 'FALSE';
-		if (strpos($format[$key],'_callback')) {
-			$gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE');
+		if (strpos($format[$key], '_callback')) {
+			$gSources[] = array('host' => $h, 'pass' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'TRUE');
 		} elseif ($h != '' || $name[$key] != '') {
-			$gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE');
+			$gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'FALSE');
 		}
 		if ($format[$key] == 'airwhere') $forcepilots = true;
 	}
-	$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));
 
-	$customcss = filter_input(INPUT_POST,'customcss',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalCustomCSS' => $customcss));
+	$customcss = filter_input(INPUT_POST, 'customcss', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalCustomCSS' => $customcss));
 
-	$map3dtile = filter_input(INPUT_POST,'map3dtileset',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalMap3DTiles' => $map3dtile));
+	$map3dtile = filter_input(INPUT_POST, 'map3dtileset', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalMap3DTiles' => $map3dtile));
 
-	$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));
-	$minfetch = filter_input(INPUT_POST,'minfetch',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalMinFetch' => $minfetch));
-	$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));
+	$minfetch = filter_input(INPUT_POST, 'minfetch', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalMinFetch' => $minfetch));
+	$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'));
 
-	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
+	$resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING);
 	if ($resetyearstats == 'resetyearstats') {
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE'));
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE'));
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE'));
 	}
 
-	$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'));
 	}
-	$archiveresults = filter_input(INPUT_POST,'archiveresults',FILTER_SANITIZE_STRING);
+	$archiveresults = filter_input(INPUT_POST, 'archiveresults', FILTER_SANITIZE_STRING);
 	if ($archiveresults == 'archiveresults') {
-		$settings = array_merge($settings,array('globalArchiveResults' => 'TRUE'));
+		$settings = array_merge($settings, array('globalArchiveResults' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalArchiveResults' => 'FALSE'));
+		$settings = array_merge($settings, array('globalArchiveResults' => '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'));
 	}
 
 /*
@@ -1431,274 +1431,274 @@ 
 		$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'));
 	$va = false;
 	if ($globalivao == 'ivao') {
-		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
+		$settings = array_merge($settings, array('globalIVAO' => 'TRUE'));
 		$va = 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'));
+		$settings = array_merge($settings, array('globalVATSIM' => 'TRUE'));
 		$va = 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'));
+		$settings = array_merge($settings, array('globalphpVMS' => 'TRUE'));
 		$va = 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'));
+		$settings = array_merge($settings, array('globalVAM' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalVAM' => 'FALSE'));
 	if ($va) {
-		$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'));
 	if ($globalva == 'va' || $va) {
-		$settings = array_merge($settings,array('globalVA' => 'TRUE'));
-		$settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
+		$settings = array_merge($settings, array('globalVA' => 'TRUE'));
+		$settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
 	} else {
-		$settings = array_merge($settings,array('globalVA' => 'FALSE'));
-		if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
-		else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE'));
+		$settings = array_merge($settings, array('globalVA' => 'FALSE'));
+		if ($forcepilots) $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
+		else $settings = array_merge($settings, array('globalUsePilot' => 'FALSE', 'globalUseOwner' => 'TRUE'));
 	}
 	
 	
-	$mapoffline = filter_input(INPUT_POST,'mapoffline',FILTER_SANITIZE_STRING);
+	$mapoffline = filter_input(INPUT_POST, 'mapoffline', FILTER_SANITIZE_STRING);
 	if ($mapoffline == 'mapoffline') {
-		$settings = array_merge($settings,array('globalMapOffline' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapOffline' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapOffline' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapOffline' => 'FALSE'));
 	}
-	$globaloffline = filter_input(INPUT_POST,'globaloffline',FILTER_SANITIZE_STRING);
+	$globaloffline = filter_input(INPUT_POST, 'globaloffline', FILTER_SANITIZE_STRING);
 	if ($globaloffline == 'globaloffline') {
-		$settings = array_merge($settings,array('globalOffline' => 'TRUE'));
+		$settings = array_merge($settings, array('globalOffline' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalOffline' => 'FALSE'));
+		$settings = array_merge($settings, array('globalOffline' => 'FALSE'));
 	}
 
-	$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'));
 	}
-	$crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING);
+	$crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING);
 	if ($crash == 'crash') {
-		$settings = array_merge($settings,array('globalAccidents' => 'TRUE'));
+		$settings = array_merge($settings, array('globalAccidents' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalAccidents' => 'FALSE'));
+		$settings = array_merge($settings, array('globalAccidents' => 'FALSE'));
 	}
-	$fires = filter_input(INPUT_POST,'fires',FILTER_SANITIZE_STRING);
+	$fires = filter_input(INPUT_POST, 'fires', FILTER_SANITIZE_STRING);
 	if ($fires == 'fires') {
-		$settings = array_merge($settings,array('globalMapFires' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapFires' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapFires' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapFires' => 'FALSE'));
 	}
-	$firessupport = filter_input(INPUT_POST,'firessupport',FILTER_SANITIZE_STRING);
+	$firessupport = filter_input(INPUT_POST, 'firessupport', FILTER_SANITIZE_STRING);
 	if ($firessupport == 'firessupport') {
-		$settings = array_merge($settings,array('globalFires' => 'TRUE'));
+		$settings = array_merge($settings, array('globalFires' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalFires' => 'FALSE'));
+		$settings = array_merge($settings, array('globalFires' => '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'));
 	}
-	$map3dliveries = filter_input(INPUT_POST,'map3dliveries',FILTER_SANITIZE_STRING);
+	$map3dliveries = filter_input(INPUT_POST, 'map3dliveries', FILTER_SANITIZE_STRING);
 	if ($map3dliveries == 'map3dliveries') {
-		$settings = array_merge($settings,array('globalMap3DLiveries' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMap3DLiveries' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMap3DLiveries' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMap3DLiveries' => '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'));
 	}
-	$maptooltip = filter_input(INPUT_POST,'maptooltip',FILTER_SANITIZE_STRING);
+	$maptooltip = filter_input(INPUT_POST, 'maptooltip', FILTER_SANITIZE_STRING);
 	if ($maptooltip == 'maptooltip') {
-		$settings = array_merge($settings,array('globalMapTooltip' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapTooltip' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapTooltip' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapTooltip' => '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'));
 	}
-	$flightremainingroute = filter_input(INPUT_POST,'flightremainingroute',FILTER_SANITIZE_STRING);
+	$flightremainingroute = filter_input(INPUT_POST, 'flightremainingroute', FILTER_SANITIZE_STRING);
 	if ($flightremainingroute == 'flightremainingroute') {
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'FALSE'));
 	}
-	$allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING);
+	$allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING);
 	if ($allflights == 'allflights') {
-		$settings = array_merge($settings,array('globalAllFlights' => 'TRUE'));
+		$settings = array_merge($settings, array('globalAllFlights' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalAllFlights' => 'FALSE'));
+		$settings = array_merge($settings, array('globalAllFlights' => 'FALSE'));
 	}
-	$bbox = filter_input(INPUT_POST,'bbox',FILTER_SANITIZE_STRING);
+	$bbox = filter_input(INPUT_POST, 'bbox', FILTER_SANITIZE_STRING);
 	if ($bbox == 'bbox') {
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'FALSE'));
 	}
-	$groundaltitude = filter_input(INPUT_POST,'groundaltitude',FILTER_SANITIZE_STRING);
+	$groundaltitude = filter_input(INPUT_POST, 'groundaltitude', FILTER_SANITIZE_STRING);
 	if ($groundaltitude == 'groundaltitude') {
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'TRUE'));
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'FALSE'));
+		$settings = array_merge($settings, array('globalGroundAltitude' => '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'));
 	}
-	$geoid = filter_input(INPUT_POST,'geoid',FILTER_SANITIZE_STRING);
+	$geoid = filter_input(INPUT_POST, 'geoid', FILTER_SANITIZE_STRING);
 	if ($geoid == 'geoid') {
-		$settings = array_merge($settings,array('globalGeoid' => 'TRUE'));
+		$settings = array_merge($settings, array('globalGeoid' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalGeoid' => 'FALSE'));
+		$settings = array_merge($settings, array('globalGeoid' => 'FALSE'));
 	}
-	$geoid_source = filter_input(INPUT_POST,'geoid_source',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalGeoidSource' => $geoid_source));
+	$geoid_source = filter_input(INPUT_POST, 'geoid_source', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalGeoidSource' => $geoid_source));
 
-	$noairlines = filter_input(INPUT_POST,'noairlines',FILTER_SANITIZE_STRING);
+	$noairlines = filter_input(INPUT_POST, 'noairlines', FILTER_SANITIZE_STRING);
 	if ($noairlines == 'noairlines') {
-		$settings = array_merge($settings,array('globalNoAirlines' => 'TRUE'));
+		$settings = array_merge($settings, array('globalNoAirlines' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalNoAirlines' => 'FALSE'));
+		$settings = array_merge($settings, array('globalNoAirlines' => 'FALSE'));
 	}
 
-	$tsk = filter_input(INPUT_POST,'tsk',FILTER_SANITIZE_STRING);
+	$tsk = filter_input(INPUT_POST, 'tsk', FILTER_SANITIZE_STRING);
 	if ($tsk == 'tsk') {
-		$settings = array_merge($settings,array('globalTSK' => 'TRUE'));
+		$settings = array_merge($settings, array('globalTSK' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalTSK' => 'FALSE'));
+		$settings = array_merge($settings, array('globalTSK' => 'FALSE'));
 	}
-	$mapmatching = filter_input(INPUT_POST,'mapmatching',FILTER_SANITIZE_STRING);
+	$mapmatching = filter_input(INPUT_POST, 'mapmatching', FILTER_SANITIZE_STRING);
 	if ($mapmatching == 'mapmatching') {
-		$settings = array_merge($settings,array('globalMapMatching' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapMatching' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapMatching' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapMatching' => 'FALSE'));
 	}
-	$mapmatchingsource = filter_input(INPUT_POST,'mapmatchingsource',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalMapMatchingSource' => $mapmatchingsource));
-	$graphhopper = filter_input(INPUT_POST,'graphhopper',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalGraphHopperKey' => $graphhopper));
+	$mapmatchingsource = filter_input(INPUT_POST, 'mapmatchingsource', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalMapMatchingSource' => $mapmatchingsource));
+	$graphhopper = filter_input(INPUT_POST, 'graphhopper', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalGraphHopperKey' => $graphhopper));
 
-	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.TrackerImport.php

Indentation +174 added lines, -174 removed lines

@@ -7,16 +7,16 @@ 
 require_once(dirname(__FILE__).'/class.Source.php');
 
 class TrackerImport {
-    private $all_tracked = array();
-    private $last_delete_hourly = 0;
-    private $last_delete = 0;
-    private $stats = array();
-    private $tmd = 0;
-    private $source_location = array();
-    public $db = null;
-    public $nb = 0;
+	private $all_tracked = array();
+	private $last_delete_hourly = 0;
+	private $last_delete = 0;
+	private $stats = array();
+	private $tmd = 0;
+	private $source_location = array();
+	public $db = null;
+	public $nb = 0;
 
-    public function __construct($dbc = null) {
+	public function __construct($dbc = null) {
 	global $globalBeta;
 	$Connection = new Connection($dbc);
 	$this->db = $Connection->db();
@@ -38,50 +38,50 @@ 
 	    }
 	}
 	*/
-    }
+	}
 
-    public function checkAll() {
+	public function checkAll() {
 	global $globalDebug;
 	if ($globalDebug) echo "Update last seen tracked data...\n";
 	foreach ($this->all_tracked as $key => $flight) {
-	    if (isset($this->all_tracked[$key]['id'])) {
+		if (isset($this->all_tracked[$key]['id'])) {
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
-    		$Tracker = new Tracker($this->db);
-        	$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
-            }
+			$Tracker = new Tracker($this->db);
+			$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
+			}
+	}
 	}
-    }
 
-    public function del() {
+	public function del() {
 	global $globalDebug;
 	// Delete old infos
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
 	foreach ($this->all_tracked as $key => $flight) {
-    	    if (isset($flight['lastupdate'])) {
-        	if ($flight['lastupdate'] < (time()-3000)) {
-            	    if (isset($this->all_tracked[$key]['id'])) {
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
+			if (isset($flight['lastupdate'])) {
+			if ($flight['lastupdate'] < (time()-3000)) {
+					if (isset($this->all_tracked[$key]['id'])) {
+					if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
 			/*
 			$TrackerLive = new TrackerLive();
             		$TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']);
 			$TrackerLive->db = null;
 			*/
-            		//$real_arrival = $this->arrival($key);
-            		$Tracker = new Tracker($this->db);
-            		if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
+					//$real_arrival = $this->arrival($key);
+					$Tracker = new Tracker($this->db);
+					if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
 				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']);
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			}
 			// Put in archive
 //			$Tracker->db = null;
-            	    }
-            	    unset($this->all_tracked[$key]);
-    	        }
-	    }
-        }
-    }
+					}
+					unset($this->all_tracked[$key]);
+				}
+		}
+		}
+	}
 
-    public function add($line) {
+	public function add($line) {
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChangeTracker, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked;
 	if (!isset($globalCoordMinChangeTracker) || $globalCoordMinChangeTracker == '') $globalCoordMinChangeTracker = '0.015';
 	date_default_timezone_set('UTC');
@@ -90,47 +90,47 @@ 
 	
 	// SBS format is CSV format
 	if(is_array($line) && isset($line['ident'])) {
-	    //print_r($line);
-  	    if (isset($line['ident'])) {
+		//print_r($line);
+  		if (isset($line['ident'])) {
 
 		
 		// Increment message number
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
-		    $current_date = date('Y-m-d');
-		    if (isset($line['source_name'])) $source = $line['source_name'];
-		    else $source = '';
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
+			$current_date = date('Y-m-d');
+			if (isset($line['source_name'])) $source = $line['source_name'];
+			else $source = '';
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
+				$this->stats[$current_date][$source]['msg']['date'] = time();
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
 		}
 		
 		
 		$Common = new Common();
-	        if (!isset($line['id'])) $id = trim($line['ident']);
-	        else $id = trim($line['id']);
+			if (!isset($line['id'])) $id = trim($line['ident']);
+			else $id = trim($line['id']);
 		
 		if (!isset($this->all_tracked[$id])) {
-		    $this->all_tracked[$id] = array();
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
-		    if (!isset($line['id'])) {
+			$this->all_tracked[$id] = array();
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
+			if (!isset($line['id'])) {
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
+			 } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
+			if ($globalAllTracked !== FALSE) $dataFound = true;
 		}
 		
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
-		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
+			if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
-		    } else {
+			} else {
 				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
 				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
 				return '';
-		    }
+			}
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
 			return '';
@@ -147,38 +147,38 @@ 
 		
 		//if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) {
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
-		    if ($this->all_tracked[$id]['addedTracker'] == 1) {
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
+			if ($this->all_tracked[$id]['addedTracker'] == 1) {
 			$timeelapsed = microtime(true);
-            		$Tracker = new Tracker($this->db);
-            		$fromsource = NULL;
-            		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
+					$Tracker = new Tracker($this->db);
+					$fromsource = NULL;
+					$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
 			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			$Tracker->db = null;
 			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-		    }
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
+			}
+			if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
 		}
 
 		if (isset($line['speed']) && $line['speed'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
 		} else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
-		    if ($distance > 100 && $distance < 10000) {
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
+			if ($distance > 100 && $distance < 10000) {
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
 			$speed = $speed*3.6;
 			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
-		    }
+			}
 		}
 
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
-	    	    else unset($timediff);
-	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 90 || ($timediff > 60 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
+				if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
+				else unset($timediff);
+				if ($this->tmd > 5 || !isset($timediff) || $timediff > 90 || ($timediff > 60 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
-			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.08)) {
+				if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.08)) {
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_tracked[$id]['putinarchive'] = true;
@@ -192,30 +192,30 @@ 
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 				$this->tmd = 0;
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
-			    }
+				}
 			}
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
-				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
-				    $dataFound = true;
-				    $this->all_tracked[$id]['time_last_coord'] = time();
+					$this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
+					$dataFound = true;
+					$this->all_tracked[$id]['time_last_coord'] = time();
 				}
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
-				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
-				    $dataFound = true;
-				    $this->all_tracked[$id]['time_last_coord'] = time();
+					$this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
+					$dataFound = true;
+					$this->all_tracked[$id]['time_last_coord'] = time();
 				}
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
 			}
 
-		    } else if ($globalDebug && $timediff > 20) {
+			} else if ($globalDebug && $timediff > 20) {
 			$this->tmd = $this->tmd + 1;
 			if ($line['latitude'] != $this->all_tracked[$id]['latitude'] && $line['longitude'] != $this->all_tracked[$id]['longitude']) {
 				echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
@@ -223,131 +223,131 @@ 
 				echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
 				echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
 			}
-		    }
+			}
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
+			if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
 		}
 		if (isset($line['source_name']) && $line['source_name'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
 		}
 		if (isset($line['comment']) && $line['comment'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment']));
-		    //$dataFound = true;
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment']));
+			//$dataFound = true;
 		}
 		if (isset($line['type']) && $line['type'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
-		    //$dataFound = true;
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
+			//$dataFound = true;
 		}
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
-		    //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
+			//if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
 			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude']));
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude']));
 			//$dataFound = true;
-		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
   		}
 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
-		    //$dataFound = true;
+			if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
+			//$dataFound = true;
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
-  		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
+  			$heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
+			if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
   		}
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
 
 		if ($dataFound === true && isset($this->all_tracked[$id]['ident'])) {
-		    $this->all_tracked[$id]['lastupdate'] = time();
-		    if ($this->all_tracked[$id]['addedTracker'] == 0) {
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
-			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
+			$this->all_tracked[$id]['lastupdate'] = time();
+			if ($this->all_tracked[$id]['addedTracker'] == 0) {
+				if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+				if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
 				if ($globalDebug) echo "Check if aircraft is already in DB...";
 				$timeelapsed = microtime(true);
 				$TrackerLive = new TrackerLive($this->db);
 				if (isset($line['id'])) {
-				    $recent_ident = $TrackerLive->checkIdRecent($line['id']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					$recent_ident = $TrackerLive->checkIdRecent($line['id']);
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 				} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
-				    $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					$recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 				} else $recent_ident = '';
 				$TrackerLive->db=null;
 
 				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
 				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
-			    } else {
+				} else {
 				$recent_ident = '';
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
-			    }
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
-			    if($recent_ident == "")
-			    {
+				}
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
+				if($recent_ident == "")
+				{
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
 				//adds the spotter data for the archive
-				    $highlight = '';
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
-				    $timeelapsed = microtime(true);
-				    $Tracker = new Tracker($this->db);
-				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
-				    $Tracker->db = null;
-				    if ($globalDebug && isset($result)) echo $result."\n";
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					$highlight = '';
+					if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
+					$timeelapsed = microtime(true);
+					$Tracker = new Tracker($this->db);
+					$result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
+					$Tracker->db = null;
+					if ($globalDebug && isset($result)) echo $result."\n";
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 				    
 				    
-				    // Add source stat in DB
-				    $Stats = new Stats($this->db);
-				    if (!empty($this->stats)) {
+					// Add source stat in DB
+					$Stats = new Stats($this->db);
+					if (!empty($this->stats)) {
 					if ($globalDebug) echo 'Add source stats : ';
-				        foreach($this->stats as $date => $data) {
-					    foreach($data as $source => $sourced) {
-					        //print_r($sourced);
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
-				    		if (isset($sourced['msg'])) {
-				    		    if (time() - $sourced['msg']['date'] > 10) {
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date);
-			    			        unset($this->stats[$date][$source]['msg']);
-			    			    }
-			    			}
-			    		    }
-			    		    if ($date != date('Y-m-d')) {
-			    			unset($this->stats[$date]);
-			    		    }
-				    	}
-				    	if ($globalDebug) echo 'Done'."\n";
+						foreach($this->stats as $date => $data) {
+						foreach($data as $source => $sourced) {
+							//print_r($sourced);
+								if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
+							if (isset($sourced['msg'])) {
+								if (time() - $sourced['msg']['date'] > 10) {
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
+									echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date);
+									unset($this->stats[$date][$source]['msg']);
+								}
+							}
+							}
+							if ($date != date('Y-m-d')) {
+							unset($this->stats[$date]);
+							}
+						}
+						if ($globalDebug) echo 'Done'."\n";
 
-				    }
-				    $Stats->db = null;
+					}
+					$Stats->db = null;
 				    
-				    $this->del();
+					$this->del();
 				//$ignoreImport = false;
 				$this->all_tracked[$id]['addedTracker'] = 1;
 				//print_r($this->all_tracked[$id]);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
-				    //TrackerLive->deleteLiveTrackerDataNotUpdated();
-				    $TrackerLive = new TrackerLive($this->db);
-				    $TrackerLive->deleteLiveTrackerData();
-				    $TrackerLive->db=null;
-				    if ($globalDebug) echo " Done\n";
-				    $this->last_delete = time();
+					if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
+					//TrackerLive->deleteLiveTrackerDataNotUpdated();
+					$TrackerLive = new TrackerLive($this->db);
+					$TrackerLive->deleteLiveTrackerData();
+					$TrackerLive->db=null;
+					if ($globalDebug) echo " Done\n";
+					$this->last_delete = time();
 				}
-			    } else {
+				} else {
 				$this->all_tracked[$id]['id'] = $recent_ident;
 				$this->all_tracked[$id]['addedTracker'] = 1;
 				if (isset($globalDaemon) && !$globalDaemon) {
@@ -356,16 +356,16 @@ 
 					$Tracker->db = null;
 				}
 				
-			    }
+				}
 			}
-		    }
-		    //adds the spotter LIVE data
-		    if ($globalDebug) {
+			}
+			//adds the spotter LIVE data
+			if ($globalDebug) {
 			echo 'DATA : ident : '.$this->all_tracked[$id]['ident'].' - type : '.$this->all_tracked[$id]['type'].' - Latitude : '.$this->all_tracked[$id]['latitude'].' - Longitude : '.$this->all_tracked[$id]['longitude'].' - Altitude : '.$this->all_tracked[$id]['altitude'].' - Heading : '.$this->all_tracked[$id]['heading'].' - Speed : '.$this->all_tracked[$id]['speed']."\n";
-		    }
-		    $ignoreImport = false;
+			}
+			$ignoreImport = false;
 
-		    if (!$ignoreImport) {
+			if (!$ignoreImport) {
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
 				$timeelapsed = microtime(true);
@@ -403,7 +403,7 @@ 
 					if ($stats_heading == 16) $stats_heading = 0;
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
 						for ($i=0;$i<=15;$i++) {
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
 					} else {
@@ -416,11 +416,11 @@ 
 					//var_dump($this->stats);
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
-						    end($this->stats[$current_date][$source]['hist']);
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
+							end($this->stats[$current_date][$source]['hist']);
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
 						} else $mini = 0;
 						for ($i=$mini;$i<=$distance;$i+=10) {
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
 					} else {
@@ -436,22 +436,22 @@ 
 			
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
-			    if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
-			    $TrackerLive = new TrackerLive($this->db);
-			    $TrackerLive->deleteLiveTrackerDataNotUpdated();
-			    $TrackerLive->db = null;
-			    //TrackerLive->deleteLiveTrackerData();
-			    if ($globalDebug) echo " Done\n";
-			    $this->last_delete_hourly = time();
+				if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
+				$TrackerLive = new TrackerLive($this->db);
+				$TrackerLive->deleteLiveTrackerDataNotUpdated();
+				$TrackerLive->db = null;
+				//TrackerLive->deleteLiveTrackerData();
+				if ($globalDebug) echo " Done\n";
+				$this->last_delete_hourly = time();
 			}
 			
-		    }
-		    //$ignoreImport = false;
+			}
+			//$ignoreImport = false;
 		}
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
 		if ($send) return $this->all_tracked[$id];
-	    }
+		}
+	}
 	}
-    }
 }
 ?>

Spacing +74 added lines, -74 removed lines

@@ -47,7 +47,7 @@ 
 	    if (isset($this->all_tracked[$key]['id'])) {
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
     		$Tracker = new Tracker($this->db);
-        	$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
+        	$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['altitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']);
             }
 	}
     }
@@ -58,7 +58,7 @@ 
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
 	foreach ($this->all_tracked as $key => $flight) {
     	    if (isset($flight['lastupdate'])) {
-        	if ($flight['lastupdate'] < (time()-3000)) {
+        	if ($flight['lastupdate'] < (time() - 3000)) {
             	    if (isset($this->all_tracked[$key]['id'])) {
             		if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
 			/*
@@ -69,7 +69,7 @@ 
             		//$real_arrival = $this->arrival($key);
             		$Tracker = new Tracker($this->db);
             		if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
-				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']);
+				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['altitude'], $this->all_tracked[$key]['speed']);
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			}
 			// Put in archive
@@ -89,7 +89,7 @@ 
 	$send = false;
 	
 	// SBS format is CSV format
-	if(is_array($line) && isset($line['ident'])) {
+	if (is_array($line) && isset($line['ident'])) {
 	    //print_r($line);
   	    if (isset($line['ident'])) {
 
@@ -113,33 +113,33 @@ 
 		
 		if (!isset($this->all_tracked[$id])) {
 		    $this->all_tracked[$id] = array();
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('addedTracker' => 0));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '', 'source_name' => '', 'comment'=> '', 'type' => '', 'noarchive' => false, 'putinarchive' => true, 'over_country' => ''));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('lastupdate' => time()));
 		    if (!isset($line['id'])) {
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $id.'-'.date('YmdHi')));
+		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $line['id']));
 		    if ($globalAllTracked !== FALSE) $dataFound = true;
 		}
 		
-		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
+		if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) {
 		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => $line['datetime']));
 		    } else {
 				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
 				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
 				return '';
 		    }
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) {
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
 			return '';
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) {
 			if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
 			return '';
 		} elseif (!isset($line['datetime'])) {
 			date_default_timezone_set('UTC');
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => date('Y-m-d H:i:s')));
 		} else {
 			if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
 			return '';
@@ -147,38 +147,38 @@ 
 		
 		//if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) {
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => trim($line['ident'])));
 		    if ($this->all_tracked[$id]['addedTracker'] == 1) {
 			$timeelapsed = microtime(true);
             		$Tracker = new Tracker($this->db);
             		$fromsource = NULL;
-            		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
+            		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $fromsource);
 			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			$Tracker->db = null;
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 		    }
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
+		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident']));
 		}
 
 		if (isset($line['speed']) && $line['speed'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($line['speed'])));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed_fromsrc' => true));
 		} else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
+		    $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm');
 		    if ($distance > 100 && $distance < 10000) {
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
 			$speed = $speed*3.6;
-			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
+			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($speed)));
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
 		    }
 		}
 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
+	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time() - $this->all_tracked[$id]['time_last_coord']);
 	    	    else unset($timediff);
-	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 90 || ($timediff > 60 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
+	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 90 || ($timediff > 60 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')))) {
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
-			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.08)) {
+			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['livedb_latitude'], $this->all_tracked[$id]['livedb_longitude'], $line['latitude'], $line['longitude'], 0.08)) {
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_tracked[$id]['putinarchive'] = true;
@@ -186,10 +186,10 @@ 
 				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
 				$timeelapsed = microtime(true);
 				$Tracker = new Tracker($this->db);
-				$all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
+				$all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']);
 				if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
 				$Tracker->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				$this->tmd = 0;
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
 			    }
@@ -197,75 +197,75 @@ 
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
-				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
+				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
 				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
 				    $dataFound = true;
 				    $this->all_tracked[$id]['time_last_coord'] = time();
 				}
-				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('latitude' => $line['latitude']));
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
 			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
-				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
+				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
 				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
 				    $dataFound = true;
 				    $this->all_tracked[$id]['time_last_coord'] = time();
 				}
-				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('longitude' => $line['longitude']));
 			}
 
 		    } else if ($globalDebug && $timediff > 20) {
 			$this->tmd = $this->tmd + 1;
 			if ($line['latitude'] != $this->all_tracked[$id]['latitude'] && $line['longitude'] != $this->all_tracked[$id]['longitude']) {
 				echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
-				echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -";
-				echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
+				echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')."m -";
+				echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - ";
 				echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
 			}
 		    }
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
 		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('last_update' => $line['last_update']));
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('format_source' => $line['format_source']));
 		}
 		if (isset($line['source_name']) && $line['source_name'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('source_name' => $line['source_name']));
 		}
 		if (isset($line['comment']) && $line['comment'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('comment' => $line['comment']));
 		    //$dataFound = true;
 		}
 		if (isset($line['type']) && $line['type'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $line['type']));
 		    //$dataFound = true;
 		}
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
 		    //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
-			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude']));
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude']));
+			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100) - $this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('altitude' => $line['altitude']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('altitude_real' => $line['altitude']));
 			//$dataFound = true;
 		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
   		}
 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('noarchive' => true));
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
+		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading'] - round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($line['heading'])));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading_fromsrc' => true));
 		    //$dataFound = true;
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
-  		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+  		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']);
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($heading)));
+		    if (abs($this->all_tracked[$id]['heading'] - round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
   		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
   		}
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
@@ -273,54 +273,54 @@ 
 		if ($dataFound === true && isset($this->all_tracked[$id]['ident'])) {
 		    $this->all_tracked[$id]['lastupdate'] = time();
 		    if ($this->all_tracked[$id]['addedTracker'] == 0) {
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
 				if ($globalDebug) echo "Check if aircraft is already in DB...";
 				$timeelapsed = microtime(true);
 				$TrackerLive = new TrackerLive($this->db);
 				if (isset($line['id'])) {
 				    $recent_ident = $TrackerLive->checkIdRecent($line['id']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
 				    $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				} else $recent_ident = '';
-				$TrackerLive->db=null;
+				$TrackerLive->db = null;
 
 				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
 				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
 			    } else {
 				$recent_ident = '';
-				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('forcenew' => 0));
 			    }
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
-			    if($recent_ident == "")
+			    if ($recent_ident == "")
 			    {
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
 				//adds the spotter data for the archive
 				    $highlight = '';
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
+				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
 				    $timeelapsed = microtime(true);
 				    $Tracker = new Tracker($this->db);
-				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
+				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name']);
 				    $Tracker->db = null;
 				    if ($globalDebug && isset($result)) echo $result."\n";
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				    
 				    
 				    // Add source stat in DB
 				    $Stats = new Stats($this->db);
 				    if (!empty($this->stats)) {
 					if ($globalDebug) echo 'Add source stats : ';
-				        foreach($this->stats as $date => $data) {
-					    foreach($data as $source => $sourced) {
+				        foreach ($this->stats as $date => $data) {
+					    foreach ($data as $source => $sourced) {
 					        //print_r($sourced);
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
+				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar_tracker', $date);
+				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist_tracker', $date);
 				    		if (isset($sourced['msg'])) {
 				    		    if (time() - $sourced['msg']['date'] > 10) {
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date);
+				    		        echo $Stats->addStatSource($nbmsg, $source, 'msg_tracker', $date);
 			    			        unset($this->stats[$date][$source]['msg']);
 			    			    }
 			    			}
@@ -343,7 +343,7 @@ 
 				    //TrackerLive->deleteLiveTrackerDataNotUpdated();
 				    $TrackerLive = new TrackerLive($this->db);
 				    $TrackerLive->deleteLiveTrackerData();
-				    $TrackerLive->db=null;
+				    $TrackerLive->db = null;
 				    if ($globalDebug) echo " Done\n";
 				    $this->last_delete = time();
 				}
@@ -352,7 +352,7 @@ 
 				$this->all_tracked[$id]['addedTracker'] = 1;
 				if (isset($globalDaemon) && !$globalDaemon) {
 					$Tracker = new Tracker($this->db);
-					$Tracker->updateLatestTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['altitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']);
+					$Tracker->updateLatestTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime']);
 					$Tracker->db = null;
 				}
 				
@@ -366,14 +366,14 @@ 
 		    $ignoreImport = false;
 
 		    if (!$ignoreImport) {
-			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
 				$timeelapsed = microtime(true);
 				$TrackerLive = new TrackerLive($this->db);
-				$result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
+				$result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['comment'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']);
 				$TrackerLive->db = null;
 				$this->all_tracked[$id]['putinarchive'] = false;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 
 				// Put statistics in $this->stats variable
 				
@@ -390,19 +390,19 @@ 
 							$latitude = $globalCenterLatitude;
 							$longitude = $globalCenterLongitude;
 						}
-						$this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude);
+						$this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude);
 					} else {
 						$latitude = $this->source_location[$source]['latitude'];
 						$longitude = $this->source_location[$source]['longitude'];
 					}
-					$stats_heading = $Common->getHeading($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
+					$stats_heading = $Common->getHeading($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']);
 					//$stats_heading = $stats_heading%22.5;
 					$stats_heading = round($stats_heading/22.5);
-					$stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
+					$stats_distance = $Common->distance($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']);
 					$current_date = date('Y-m-d');
 					if ($stats_heading == 16) $stats_heading = 0;
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
-						for ($i=0;$i<=15;$i++) {
+						for ($i = 0; $i <= 15; $i++) {
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
@@ -417,9 +417,9 @@ 
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
 						    end($this->stats[$current_date][$source]['hist']);
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
+						    $mini = key($this->stats[$current_date][$source]['hist']) + 10;
 						} else $mini = 0;
-						for ($i=$mini;$i<=$distance;$i+=10) {
+						for ($i = $mini; $i <= $distance; $i += 10) {
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
@@ -431,7 +431,7 @@ 
 				$this->all_tracked[$id]['lastupdate'] = time();
 				if ($this->all_tracked[$id]['putinarchive']) $send = true;
 				if ($globalDebug) echo $result."\n";
-			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n";
 			//$this->del();
 			
 			

Braces +190 added lines, -65 removed lines

@@ -42,7 +42,9 @@ 
 
     public function checkAll() {
 	global $globalDebug;
-	if ($globalDebug) echo "Update last seen tracked data...\n";
+	if ($globalDebug) {
+		echo "Update last seen tracked data...\n";
+	}
 	foreach ($this->all_tracked as $key => $flight) {
 	    if (isset($this->all_tracked[$key]['id'])) {
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
@@ -55,12 +57,16 @@ 
     public function del() {
 	global $globalDebug;
 	// Delete old infos
-	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
+	if ($globalDebug) {
+		echo 'Delete old values and update latest data...'."\n";
+	}
 	foreach ($this->all_tracked as $key => $flight) {
     	    if (isset($flight['lastupdate'])) {
         	if ($flight['lastupdate'] < (time()-3000)) {
             	    if (isset($this->all_tracked[$key]['id'])) {
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
+            		if ($globalDebug) {
+            			echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
+            		}
 			/*
 			$TrackerLive = new TrackerLive();
             		$TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']);
@@ -70,7 +76,9 @@ 
             		$Tracker = new Tracker($this->db);
             		if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
 				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']);
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+				if ($globalDebug && $result != 'success') {
+					echo '!!! ERROR : '.$result."\n";
+				}
 			}
 			// Put in archive
 //			$Tracker->db = null;
@@ -83,7 +91,9 @@ 
 
     public function add($line) {
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChangeTracker, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked;
-	if (!isset($globalCoordMinChangeTracker) || $globalCoordMinChangeTracker == '') $globalCoordMinChangeTracker = '0.015';
+	if (!isset($globalCoordMinChangeTracker) || $globalCoordMinChangeTracker == '') {
+		$globalCoordMinChangeTracker = '0.015';
+	}
 	date_default_timezone_set('UTC');
 	$dataFound = false;
 	$send = false;
@@ -97,19 +107,29 @@ 
 		// Increment message number
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
 		    $current_date = date('Y-m-d');
-		    if (isset($line['source_name'])) $source = $line['source_name'];
-		    else $source = '';
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
+		    if (isset($line['source_name'])) {
+		    	$source = $line['source_name'];
+		    } else {
+		    	$source = '';
+		    }
+		    if ($source == '' || $line['format_source'] == 'aprs') {
+		    	$source = $line['format_source'];
+		    }
 		    if (!isset($this->stats[$current_date][$source]['msg'])) {
 		    	$this->stats[$current_date][$source]['msg']['date'] = time();
 		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    } else {
+		    	$this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    }
 		}
 		
 		
 		$Common = new Common();
-	        if (!isset($line['id'])) $id = trim($line['ident']);
-	        else $id = trim($line['id']);
+	        if (!isset($line['id'])) {
+	        	$id = trim($line['ident']);
+	        } else {
+	        	$id = trim($line['id']);
+	        }
 		
 		if (!isset($this->all_tracked[$id])) {
 		    $this->all_tracked[$id] = array();
@@ -117,31 +137,46 @@ 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
 		    if (!isset($line['id'])) {
-			if (!isset($globalDaemon)) $globalDaemon = TRUE;
+			if (!isset($globalDaemon)) {
+				$globalDaemon = TRUE;
+			}
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
+		     } else {
+		     	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
+		     }
+		    if ($globalAllTracked !== FALSE) {
+		    	$dataFound = true;
+		    }
 		}
 		
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
 		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
 		    } else {
-				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
-				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
+				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
+					echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
+				} elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
+					echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
+				}
 				return '';
 		    }
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
-			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
+			if ($globalDebug) {
+				echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
+			}
 			return '';
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
-			if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
+			if ($globalDebug) {
+				echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
+			}
 			return '';
 		} elseif (!isset($line['datetime'])) {
 			date_default_timezone_set('UTC');
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
 		} else {
-			if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
+			if ($globalDebug) {
+				echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
+			}
 			return '';
 		}
 		
@@ -153,11 +188,17 @@ 
             		$Tracker = new Tracker($this->db);
             		$fromsource = NULL;
             		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
-			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+			if ($globalDebug && $result != 'success') {
+				echo '!!! ERROR : '.$result."\n";
+			}
 			$Tracker->db = null;
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			if ($globalDebugTimeElapsed) {
+				echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			}
+		    }
+		    if (!isset($this->all_tracked[$id]['id'])) {
+		    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
 		    }
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
 		}
 
 		if (isset($line['speed']) && $line['speed'] != '') {
@@ -168,14 +209,21 @@ 
 		    if ($distance > 100 && $distance < 10000) {
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
 			$speed = $speed*3.6;
-			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
-  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
+			if ($speed < 1000) {
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
+			}
+  			if ($globalDebug) {
+  				echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
+  			}
 		    }
 		}
 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
-	    	    else unset($timediff);
+	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) {
+	    	    	$timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
+	    	    } else {
+	    	    	unset($timediff);
+	    	    }
 	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 90 || ($timediff > 60 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
 			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.08)) {
@@ -183,20 +231,30 @@ 
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_tracked[$id]['putinarchive'] = true;
 				
-				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+				if ($globalDebug) {
+					echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+				}
 				$timeelapsed = microtime(true);
 				$Tracker = new Tracker($this->db);
 				$all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
-				if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
+				if (!empty($all_country)) {
+					$this->all_tracked[$id]['over_country'] = $all_country['iso2'];
+				}
 				$Tracker->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
 				$this->tmd = 0;
-				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
+				if ($globalDebug) {
+					echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
+				}
 			    }
 			}
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
-				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
+				if (!isset($this->all_tracked[$id]['archive_latitude'])) {
+					$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
+				}
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
 				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
 				    $dataFound = true;
@@ -205,8 +263,12 @@ 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
-				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
+			    if ($line['longitude'] > 180) {
+			    	$line['longitude'] = $line['longitude'] - 360;
+			    }
+				if (!isset($this->all_tracked[$id]['archive_longitude'])) {
+					$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
+				}
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
 				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
 				    $dataFound = true;
@@ -226,7 +288,9 @@ 
 		    }
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
+		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) {
+		    	$dataFound = true;
+		    }
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
@@ -246,7 +310,9 @@ 
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
 		    //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
-			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
+			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) {
+				$this->all_tracked[$id]['putinarchive'] = true;
+			}
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude']));
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude']));
 			//$dataFound = true;
@@ -258,15 +324,21 @@ 
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) {
+		    	$this->all_tracked[$id]['putinarchive'] = true;
+		    }
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
 		    //$dataFound = true;
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
   		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
+		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) {
+		    	$this->all_tracked[$id]['putinarchive'] = true;
+		    }
+  		    if ($globalDebug) {
+  		    	echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
+  		    }
   		}
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
 
@@ -275,20 +347,31 @@ 
 		    if ($this->all_tracked[$id]['addedTracker'] == 0) {
 		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
-				if ($globalDebug) echo "Check if aircraft is already in DB...";
+				if ($globalDebug) {
+					echo "Check if aircraft is already in DB...";
+				}
 				$timeelapsed = microtime(true);
 				$TrackerLive = new TrackerLive($this->db);
 				if (isset($line['id'])) {
 				    $recent_ident = $TrackerLive->checkIdRecent($line['id']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
 				} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
 				    $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				} else $recent_ident = '';
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
+				} else {
+					$recent_ident = '';
+				}
 				$TrackerLive->db=null;
 
-				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
-				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
+				if ($globalDebug && $recent_ident == '') {
+					echo " Not in DB.\n";
+				} elseif ($globalDebug && $recent_ident != '') {
+					echo " Already in DB.\n";
+				}
 			    } else {
 				$recent_ident = '';
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
@@ -296,27 +379,41 @@ 
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
 			    if($recent_ident == "")
 			    {
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
+				if ($globalDebug) {
+					echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
+				}
 				//adds the spotter data for the archive
 				    $highlight = '';
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
+				    if (!isset($this->all_tracked[$id]['id'])) {
+				    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
+				    }
 				    $timeelapsed = microtime(true);
 				    $Tracker = new Tracker($this->db);
 				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
 				    $Tracker->db = null;
-				    if ($globalDebug && isset($result)) echo $result."\n";
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebug && isset($result)) {
+				    	echo $result."\n";
+				    }
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
 				    
 				    
 				    // Add source stat in DB
 				    $Stats = new Stats($this->db);
 				    if (!empty($this->stats)) {
-					if ($globalDebug) echo 'Add source stats : ';
+					if ($globalDebug) {
+						echo 'Add source stats : ';
+					}
 				        foreach($this->stats as $date => $data) {
 					    foreach($data as $source => $sourced) {
 					        //print_r($sourced);
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
+				    	        if (isset($sourced['polar'])) {
+				    	        	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
+				    	        }
+				    	        if (isset($sourced['hist'])) {
+				    	        	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
+				    	        }
 				    		if (isset($sourced['msg'])) {
 				    		    if (time() - $sourced['msg']['date'] > 10) {
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
@@ -329,7 +426,9 @@ 
 			    			unset($this->stats[$date]);
 			    		    }
 				    	}
-				    	if ($globalDebug) echo 'Done'."\n";
+				    	if ($globalDebug) {
+				    		echo 'Done'."\n";
+				    	}
 
 				    }
 				    $Stats->db = null;
@@ -339,12 +438,16 @@ 
 				$this->all_tracked[$id]['addedTracker'] = 1;
 				//print_r($this->all_tracked[$id]);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
+				    if ($globalDebug) {
+				    	echo "---- Deleting Live Tracker data older than 9 hours...";
+				    }
 				    //TrackerLive->deleteLiveTrackerDataNotUpdated();
 				    $TrackerLive = new TrackerLive($this->db);
 				    $TrackerLive->deleteLiveTrackerData();
 				    $TrackerLive->db=null;
-				    if ($globalDebug) echo " Done\n";
+				    if ($globalDebug) {
+				    	echo " Done\n";
+				    }
 				    $this->last_delete = time();
 				}
 			    } else {
@@ -367,19 +470,25 @@ 
 
 		    if (!$ignoreImport) {
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
+				if ($globalDebug) {
+					echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
+				}
 				$timeelapsed = microtime(true);
 				$TrackerLive = new TrackerLive($this->db);
 				$result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
 				$TrackerLive->db = null;
 				$this->all_tracked[$id]['putinarchive'] = false;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
 
 				// Put statistics in $this->stats variable
 				
 				if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
 					$source = $this->all_tracked[$id]['source_name'];
-					if ($source == '') $source = $this->all_tracked[$id]['format_source'];
+					if ($source == '') {
+						$source = $this->all_tracked[$id]['format_source'];
+					}
 					if (!isset($this->source_location[$source])) {
 						$Location = new Source($this->db);
 						$coord = $Location->getLocationInfobySourceName($source);
@@ -400,7 +509,9 @@ 
 					$stats_heading = round($stats_heading/22.5);
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
 					$current_date = date('Y-m-d');
-					if ($stats_heading == 16) $stats_heading = 0;
+					if ($stats_heading == 16) {
+						$stats_heading = 0;
+					}
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
 						for ($i=0;$i<=15;$i++) {
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
@@ -418,7 +529,9 @@ 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
 						    end($this->stats[$current_date][$source]['hist']);
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
-						} else $mini = 0;
+						} else {
+							$mini = 0;
+						}
 						for ($i=$mini;$i<=$distance;$i+=10) {
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
@@ -429,19 +542,29 @@ 
 				}
 
 				$this->all_tracked[$id]['lastupdate'] = time();
-				if ($this->all_tracked[$id]['putinarchive']) $send = true;
-				if ($globalDebug) echo $result."\n";
-			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+				if ($this->all_tracked[$id]['putinarchive']) {
+					$send = true;
+				}
+				if ($globalDebug) {
+					echo $result."\n";
+				}
+			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) {
+				echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+			}
 			//$this->del();
 			
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
-			    if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
+			    if ($globalDebug) {
+			    	echo "---- Deleting Live Tracker data Not updated since 2 hour...";
+			    }
 			    $TrackerLive = new TrackerLive($this->db);
 			    $TrackerLive->deleteLiveTrackerDataNotUpdated();
 			    $TrackerLive->db = null;
 			    //TrackerLive->deleteLiveTrackerData();
-			    if ($globalDebug) echo " Done\n";
+			    if ($globalDebug) {
+			    	echo " Done\n";
+			    }
 			    $this->last_delete_hourly = time();
 			}
 			
@@ -449,7 +572,9 @@ 
 		    //$ignoreImport = false;
 		}
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
-		if ($send) return $this->all_tracked[$id];
+		if ($send) {
+			return $this->all_tracked[$id];
+		}
 	    }
 	}
     }

require/class.MapMatching.php

Spacing +30 added lines, -30 removed lines

@@ -44,10 +44,10 @@ 
 		$gpx .= '<gpx xmlns="http://www.topografix.com/GPX/1/1" xmlns:gpsies="http://www.gpsies.com/GPX/1/0" creator="GPSies http://www.gpsies.com - Sendl.-O&amp;apos;sch-heim" version="1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd http://www.gpsies.com/GPX/1/0 http://www.gpsies.com/gpsies.xsd">';
 		$gpx .= '<trk>';
 		$gpx .= '<trkseg>';
-		foreach($spotter_history_array as $spotter_data) {
-			$gpx .= '<trkpt lat="'.sprintf("%.8f",$spotter_data['latitude']).'" lon="'.sprintf("%.8f",$spotter_data['longitude']).'">';
-			if (isset($spotter_data['altitude'])) $gpx .= '<ele>'.sprintf("%.6f",$spotter_data['altitude']).'</ele>';
-			$gpx .= '<time>'.date("Y-m-d\TH:i:s\Z",strtotime($spotter_data['date'])).'</time>';
+		foreach ($spotter_history_array as $spotter_data) {
+			$gpx .= '<trkpt lat="'.sprintf("%.8f", $spotter_data['latitude']).'" lon="'.sprintf("%.8f", $spotter_data['longitude']).'">';
+			if (isset($spotter_data['altitude'])) $gpx .= '<ele>'.sprintf("%.6f", $spotter_data['altitude']).'</ele>';
+			$gpx .= '<time>'.date("Y-m-d\TH:i:s\Z", strtotime($spotter_data['date'])).'</time>';
 			$gpx .= '</trkpt>';
 		}
 		$gpx .= '</trkseg>';
@@ -84,18 +84,18 @@ 
 		global $globalMapMatchingMaxPts, $globalTrackMatchingAppKey, $globalTrackMatchingAppId;
 		if (!isset($globalMapMatchingMaxPts)) $globalMapMatchingMaxPts = 100;
 		if (count($spotter_history_array) < 2) return $spotter_history_array;
-		if (count($spotter_history_array) > $globalMapMatchingMaxPts) $spotter_history_array = array_slice($spotter_history_array,-$globalMapMatchingMaxPts);
+		if (count($spotter_history_array) > $globalMapMatchingMaxPts) $spotter_history_array = array_slice($spotter_history_array, -$globalMapMatchingMaxPts);
 		$data = $this->create_gpx($spotter_history_array);
 		$url = 'https://test.roadmatching.com/rest/mapmatch/?app_id='.$globalTrackMatchingAppId.'&app_key='.$globalTrackMatchingAppKey.'&output.waypoints=true';
 		$Common = new Common();
-		$matching = $Common->getData($url,'post',$data,array('Content-Type: application/gpx+xml','Accept: application/json'));
-		$matching = json_decode($matching,true);
+		$matching = $Common->getData($url, 'post', $data, array('Content-Type: application/gpx+xml', 'Accept: application/json'));
+		$matching = json_decode($matching, true);
 		if (isset($matching['diary']['entries'][0]['route']['links'])) {
 			$spotter_history_array = array();
 			foreach ($matching['diary']['entries'][0]['route']['links'] as $match) {
 				if (isset($match['wpts'])) {
 					foreach ($match['wpts'] as $coord) {
-						$spotter_history_array[] = array('longitude' => $coord['x'],'latitude' => $coord['y']);
+						$spotter_history_array[] = array('longitude' => $coord['x'], 'latitude' => $coord['y']);
 					}
 				}
 			}
@@ -115,22 +115,22 @@ 
 		if (count($spotter_history_array) < 2) return $spotter_history_array;
 		$spotter_history_initial_array = array();
 		if (count($spotter_history_array) > $globalMapMatchingMaxPts) {
-			$spotter_history_array = array_slice($spotter_history_array,-$globalMapMatchingMaxPts);
-			$spotter_history_initial_array = array_slice($spotter_history_array,0,count($spotter_history_array)-$globalMapMatchingMaxPts);
+			$spotter_history_array = array_slice($spotter_history_array, -$globalMapMatchingMaxPts);
+			$spotter_history_initial_array = array_slice($spotter_history_array, 0, count($spotter_history_array) - $globalMapMatchingMaxPts);
 		}
 		$data = $this->create_gpx($spotter_history_array);
 		$url = 'https://graphhopper.com/api/1/match?vehicle=car&points_encoded=0&instructions=false&key='.$globalGraphHopperKey;
 		$Common = new Common();
-		$matching = $Common->getData($url,'post',$data,array('Content-Type: application/gpx+xml'));
-		$matching = json_decode($matching,true);
+		$matching = $Common->getData($url, 'post', $data, array('Content-Type: application/gpx+xml'));
+		$matching = json_decode($matching, true);
 		if (isset($matching['paths'][0]['points']['coordinates'])) {
 			$spotter_history_array = array();
 			foreach ($matching['paths'][0]['points']['coordinates'] as $match) {
 				$coord = $match;
-				$spotter_history_array[] = array('longitude' => $coord[0],'latitude' => $coord[1]);
+				$spotter_history_array[] = array('longitude' => $coord[0], 'latitude' => $coord[1]);
 			}
 		}
-		$spotter_history_array = array_merge($spotter_history_initial_array,$spotter_history_array);
+		$spotter_history_array = array_merge($spotter_history_initial_array, $spotter_history_array);
 		$spotter_history_array[0]['mapmatching_engine'] = 'graphhopper';
 		return $spotter_history_array;
 	}
@@ -146,23 +146,23 @@ 
 		if (count($spotter_history_array) < 2) return $spotter_history_array;
 		$spotter_history_initial_array = array();
 		if (count($spotter_history_array) > $globalMapMatchingMaxPts) {
-			$spotter_history_array = array_slice($spotter_history_array,-$globalMapMatchingMaxPts);
-			$spotter_history_initial_array = array_slice($spotter_history_array,0,count($spotter_history_array)-$globalMapMatchingMaxPts);
+			$spotter_history_array = array_slice($spotter_history_array, -$globalMapMatchingMaxPts);
+			$spotter_history_initial_array = array_slice($spotter_history_array, 0, count($spotter_history_array) - $globalMapMatchingMaxPts);
 		}
 		$data = $this->create_gpx($spotter_history_array);
 		$url = 'https://mapmatching.flightairmap.com/api/1/match?vehicle=car&points_encoded=0&instructions=false';
 		//$url = 'https://mapmatching.flightairmap.com/api/1/match?vehicle=car&points_encoded=0';
 		$Common = new Common();
-		$matching = $Common->getData($url,'post',$data,array('Content-Type: application/gpx+xml'));
-		$matching = json_decode($matching,true);
+		$matching = $Common->getData($url, 'post', $data, array('Content-Type: application/gpx+xml'));
+		$matching = json_decode($matching, true);
 		if (isset($matching['paths'][0]['points']['coordinates'])) {
 			$spotter_history_array = array();
 			foreach ($matching['paths'][0]['points']['coordinates'] as $match) {
 				$coord = $match;
-				$spotter_history_array[] = array('longitude' => $coord[0],'latitude' => $coord[1]);
+				$spotter_history_array[] = array('longitude' => $coord[0], 'latitude' => $coord[1]);
 			}
 		}
-		$spotter_history_array = array_merge($spotter_history_initial_array,$spotter_history_array);
+		$spotter_history_array = array_merge($spotter_history_initial_array, $spotter_history_array);
 		$spotter_history_array[0]['mapmatching_engine'] = 'fam';
 		return $spotter_history_array;
 	}
@@ -178,8 +178,8 @@ 
 		if (count($spotter_history_array) < 2) return $spotter_history_array;
 		$spotter_history_initial_array = array();
 		if (count($spotter_history_array) > $globalMapMatchingMaxPts) {
-			$spotter_history_array = array_slice($spotter_history_array,-$globalMapMatchingMaxPts);
-			$spotter_history_initial_array = array_slice($spotter_history_array,0,count($spotter_history_array)-$globalMapMatchingMaxPts);
+			$spotter_history_array = array_slice($spotter_history_array, -$globalMapMatchingMaxPts);
+			$spotter_history_initial_array = array_slice($spotter_history_array, 0, count($spotter_history_array) - $globalMapMatchingMaxPts);
 		}
 		$coord = '';
 		$ts = '';
@@ -195,15 +195,15 @@ 
 		$url = 'https://router.project-osrm.org/match/v1/driving/'.$coord.'?timestamps='.$ts.'&overview=full&geometries=geojson&tidy=true&gaps=ignore';
 		$Common = new Common();
 		$matching = $Common->getData($url);
-		$matching  = json_decode($matching,true);
+		$matching = json_decode($matching, true);
 		if (isset($matching['matchings'][0]['geometry']['coordinates'])) {
 			$spotter_history_array = array();
 			foreach ($matching['matchings'][0]['geometry']['coordinates'] as $match) {
 				$coord = $match;
-				$spotter_history_array[] = array('longitude' => $coord[0],'latitude' => $coord[1]);
+				$spotter_history_array[] = array('longitude' => $coord[0], 'latitude' => $coord[1]);
 			}
 		}
-		$spotter_history_array = array_merge($spotter_history_initial_array,$spotter_history_array);
+		$spotter_history_array = array_merge($spotter_history_initial_array, $spotter_history_array);
 		$spotter_history_array[0]['mapmatching_engine'] = 'osmr';
 		return $spotter_history_array;
 	}
@@ -219,8 +219,8 @@ 
 		if (count($spotter_history_array) < 2) return $spotter_history_array;
 		$spotter_history_initial_array = array();
 		if (count($spotter_history_array) > $globalMapMatchingMaxPts) {
-			$spotter_history_array = array_slice($spotter_history_array,-$globalMapMatchingMaxPts);
-			$spotter_history_initial_array = array_slice($spotter_history_array,0,count($spotter_history_array)-$globalMapMatchingMaxPts);
+			$spotter_history_array = array_slice($spotter_history_array, -$globalMapMatchingMaxPts);
+			$spotter_history_initial_array = array_slice($spotter_history_array, 0, count($spotter_history_array) - $globalMapMatchingMaxPts);
 		}
 		$coord = '';
 		$ts = '';
@@ -237,15 +237,15 @@ 
 		$url = 'https://api.mapbox.com/matching/v5/mapbox/driving/'.$coord.'?access_token='.$globalMapboxToken.'&timestamps='.$ts.'&overview=full&tidy=true&geometries=geojson';
 		$Common = new Common();
 		$matching = $Common->getData($url);
-		$matching  = json_decode($matching,true);
+		$matching = json_decode($matching, true);
 		if (isset($matching['matchings'][0]['geometry']['coordinates'])) {
 			$spotter_history_array = array();
 			foreach ($matching['matchings'][0]['geometry']['coordinates'] as $match) {
 				$coord = $match;
-				$spotter_history_array[] = array('longitude' => $coord[0],'latitude' => $coord[1]);
+				$spotter_history_array[] = array('longitude' => $coord[0], 'latitude' => $coord[1]);
 			}
 		}
-		$spotter_history_array = array_merge($spotter_history_initial_array,$spotter_history_array);
+		$spotter_history_array = array_merge($spotter_history_initial_array, $spotter_history_array);
 		$spotter_history_array[0]['mapmatching_engine'] = 'mapbox';
 		return $spotter_history_array;
 	}

Braces +54 added lines, -18 removed lines

@@ -46,7 +46,9 @@ 
 		$gpx .= '<trkseg>';
 		foreach($spotter_history_array as $spotter_data) {
 			$gpx .= '<trkpt lat="'.sprintf("%.8f",$spotter_data['latitude']).'" lon="'.sprintf("%.8f",$spotter_data['longitude']).'">';
-			if (isset($spotter_data['altitude'])) $gpx .= '<ele>'.sprintf("%.6f",$spotter_data['altitude']).'</ele>';
+			if (isset($spotter_data['altitude'])) {
+				$gpx .= '<ele>'.sprintf("%.6f",$spotter_data['altitude']).'</ele>';
+			}
 			$gpx .= '<time>'.date("Y-m-d\TH:i:s\Z",strtotime($spotter_data['date'])).'</time>';
 			$gpx .= '</trkpt>';
 		}
@@ -82,9 +84,15 @@ 
 
 	public function TrackMatching($spotter_history_array) {
 		global $globalMapMatchingMaxPts, $globalTrackMatchingAppKey, $globalTrackMatchingAppId;
-		if (!isset($globalMapMatchingMaxPts)) $globalMapMatchingMaxPts = 100;
-		if (count($spotter_history_array) < 2) return $spotter_history_array;
-		if (count($spotter_history_array) > $globalMapMatchingMaxPts) $spotter_history_array = array_slice($spotter_history_array,-$globalMapMatchingMaxPts);
+		if (!isset($globalMapMatchingMaxPts)) {
+			$globalMapMatchingMaxPts = 100;
+		}
+		if (count($spotter_history_array) < 2) {
+			return $spotter_history_array;
+		}
+		if (count($spotter_history_array) > $globalMapMatchingMaxPts) {
+			$spotter_history_array = array_slice($spotter_history_array,-$globalMapMatchingMaxPts);
+		}
 		$data = $this->create_gpx($spotter_history_array);
 		$url = 'https://test.roadmatching.com/rest/mapmatch/?app_id='.$globalTrackMatchingAppId.'&app_key='.$globalTrackMatchingAppKey.'&output.waypoints=true';
 		$Common = new Common();
@@ -111,8 +119,12 @@ 
 	*/
 	public function GraphHopper($spotter_history_array) {
 		global $globalMapMatchingMaxPts, $globalGraphHopperKey;
-		if (!isset($globalMapMatchingMaxPts)) $globalMapMatchingMaxPts = 100;
-		if (count($spotter_history_array) < 2) return $spotter_history_array;
+		if (!isset($globalMapMatchingMaxPts)) {
+			$globalMapMatchingMaxPts = 100;
+		}
+		if (count($spotter_history_array) < 2) {
+			return $spotter_history_array;
+		}
 		$spotter_history_initial_array = array();
 		if (count($spotter_history_array) > $globalMapMatchingMaxPts) {
 			$spotter_history_array = array_slice($spotter_history_array,-$globalMapMatchingMaxPts);
@@ -142,8 +154,12 @@ 
 	*/
 	public function FAMMapMatching($spotter_history_array) {
 		global $globalMapMatchingMaxPts, $globalGraphHopperKey;
-		if (!isset($globalMapMatchingMaxPts)) $globalMapMatchingMaxPts = 100;
-		if (count($spotter_history_array) < 2) return $spotter_history_array;
+		if (!isset($globalMapMatchingMaxPts)) {
+			$globalMapMatchingMaxPts = 100;
+		}
+		if (count($spotter_history_array) < 2) {
+			return $spotter_history_array;
+		}
 		$spotter_history_initial_array = array();
 		if (count($spotter_history_array) > $globalMapMatchingMaxPts) {
 			$spotter_history_array = array_slice($spotter_history_array,-$globalMapMatchingMaxPts);
@@ -174,8 +190,12 @@ 
 	*/
 	public function osmr($spotter_history_array) {
 		global $globalMapMatchingMaxPts;
-		if (!isset($globalMapMatchingMaxPts)) $globalMapMatchingMaxPts = 50;
-		if (count($spotter_history_array) < 2) return $spotter_history_array;
+		if (!isset($globalMapMatchingMaxPts)) {
+			$globalMapMatchingMaxPts = 50;
+		}
+		if (count($spotter_history_array) < 2) {
+			return $spotter_history_array;
+		}
 		$spotter_history_initial_array = array();
 		if (count($spotter_history_array) > $globalMapMatchingMaxPts) {
 			$spotter_history_array = array_slice($spotter_history_array,-$globalMapMatchingMaxPts);
@@ -185,11 +205,17 @@ 
 		$ts = '';
 		$rd = '';
 		foreach ($spotter_history_array as $spotter_data) {
-			if ($coord != '') $coord .= ';';
+			if ($coord != '') {
+				$coord .= ';';
+			}
 			$coord .= $spotter_data['longitude'].','.$spotter_data['latitude'];
-			if ($ts != '') $ts .= ';';
+			if ($ts != '') {
+				$ts .= ';';
+			}
 			$ts .= strtotime($spotter_data['date']);
-			if ($rd != '') $rd .= ';';
+			if ($rd != '') {
+				$rd .= ';';
+			}
 			$rd .= '20';
 		}
 		$url = 'https://router.project-osrm.org/match/v1/driving/'.$coord.'?timestamps='.$ts.'&overview=full&geometries=geojson&tidy=true&gaps=ignore';
@@ -215,8 +241,12 @@ 
 	*/
 	public function mapbox($spotter_history_array) {
 		global $globalMapMatchingMaxPts, $globalMapboxToken;
-		if (!isset($globalMapMatchingMaxPts)) $globalMapMatchingMaxPts = 60;
-		if (count($spotter_history_array) < 2) return $spotter_history_array;
+		if (!isset($globalMapMatchingMaxPts)) {
+			$globalMapMatchingMaxPts = 60;
+		}
+		if (count($spotter_history_array) < 2) {
+			return $spotter_history_array;
+		}
 		$spotter_history_initial_array = array();
 		if (count($spotter_history_array) > $globalMapMatchingMaxPts) {
 			$spotter_history_array = array_slice($spotter_history_array,-$globalMapMatchingMaxPts);
@@ -226,11 +256,17 @@ 
 		$ts = '';
 		$rd = '';
 		foreach ($spotter_history_array as $spotter_data) {
-			if ($coord != '') $coord .= ';';
+			if ($coord != '') {
+				$coord .= ';';
+			}
 			$coord .= $spotter_data['longitude'].','.$spotter_data['latitude'];
-			if ($ts != '') $ts .= ';';
+			if ($ts != '') {
+				$ts .= ';';
+			}
 			$ts .= strtotime($spotter_data['date']);
-			if ($rd != '') $rd .= ';';
+			if ($rd != '') {
+				$rd .= ';';
+			}
 			$rd .= '20';
 		}
 		//$url = 'https://api.mapbox.com/matching/v5/mapbox/driving/'.$coord.'?access_token='.$globalMapboxToken.'&timestamps='.$ts.'&overview=full&tidy=true&geometries=geojson&radiuses='.$rd;

live-geojson.php

Braces +321 added lines, -130 removed lines

@@ -12,7 +12,9 @@ 
 $tracker = false;
 $marine = false;
 $usecoord = false;
-if (isset($_GET['test'])) exit();
+if (isset($_GET['test'])) {
+	exit();
+}
 if (isset($_GET['tracker'])) {
     $tracker = true;
 }
@@ -57,28 +59,55 @@ 
 }
 header('Content-Type: text/javascript');
 
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 
 $from_archive = false;
 $min = true;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
-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_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],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($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],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','famaprs'));
+}
+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_mmsi']) && $_COOKIE['filter_mmsi'] != '') {
+	$filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],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($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') {
+	$filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
+}
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
-} else $min = false;
+} else {
+	$min = false;
+}
 
 $spotter_array = array();
 
@@ -189,24 +218,38 @@ 
 			$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
 		}
 	}
-	if ($flightcnt == '') $flightcnt = 0;
-} else $flightcnt = 0;
+	if ($flightcnt == '') {
+		$flightcnt = 0;
+	}
+	} else {
+	$flightcnt = 0;
+}
 
 $sqltime = round(microtime(true)-$begintime,2);
 
 $currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
-if ($currenttime != '') $currenttime = round($currenttime/1000);
+if ($currenttime != '') {
+	$currenttime = round($currenttime/1000);
+}
 
-if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) $usenextlatlon = false;
-else $usenextlatlon = true;
-if ($usenextlatlon === false) $currenttime = '';
+if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) {
+	$usenextlatlon = false;
+} else {
+	$usenextlatlon = true;
+}
+if ($usenextlatlon === false) {
+	$currenttime = '';
+}
 $j = 0;
 $prev_flightaware_id = '';
 $aircrafts_shadow = array();
 $output = '{';
 	$output .= '"type": "FeatureCollection",';
-		if ($min) $output .= '"minimal": "true",';
-		else $output .= '"minimal": "false",';
+		if ($min) {
+			$output .= '"minimal": "true",';
+		} else {
+			$output .= '"minimal": "false",';
+		}
 		//$output .= '"fc": "'.$flightcnt.'",';
 		$output .= '"sqt": "'.$sqltime.'",';
 
@@ -251,18 +294,29 @@ 
 						}
 						$output .= '"properties": {';
 						if (isset($spotter_item['flightaware_id'])) {
-							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'].'",';
+							}
 						} elseif (isset($spotter_item['famtrackid'])) {
-							if ($compress) $output .= '"fti": "'.$spotter_item['famtrackid'].'",';
-							else $output .= '"famtrackid": "'.$spotter_item['famtrackid'].'",';
+							if ($compress) {
+								$output .= '"fti": "'.$spotter_item['famtrackid'].'",';
+							} else {
+								$output .= '"famtrackid": "'.$spotter_item['famtrackid'].'",';
+							}
 						} elseif (isset($spotter_item['fammarine_id'])) {
-							if ($compress) $output .= '"fmi": "'.$spotter_item['fammarine_id'].'",';
-							else $output .= '"fammarineid": "'.$spotter_item['fammarine_id'].'",';
+							if ($compress) {
+								$output .= '"fmi": "'.$spotter_item['fammarine_id'].'",';
+							} else {
+								$output .= '"fammarineid": "'.$spotter_item['fammarine_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",';
@@ -270,14 +324,22 @@ 
 */
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
-							if ($compress) $output .= '"c": "'.str_replace('\\','',$spotter_item['ident']).'",';
-							else $output .= '"callsign": "'.str_replace('\\','',$spotter_item['ident']).'",';
+							if ($compress) {
+								$output .= '"c": "'.str_replace('\\','',$spotter_item['ident']).'",';
+							} else {
+								$output .= '"callsign": "'.str_replace('\\','',$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'])).'",';
@@ -290,16 +352,23 @@ 
 							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
 						}
 						if (!isset($spotter_item['aircraft_shadow']) && !$tracker) {
-							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = '';
-							else {
+							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') {
+								$spotter_item['aircraft_shadow'] = '';
+							} else {
 								$aircraft_icao = $spotter_item['aircraft_icao'];
-								if (isset($aircrafts_shadow[$aircraft_icao])) $spotter_item['aircraft_shadow'] = $aircrafts_shadow[$aircraft_icao];
-								else {
+								if (isset($aircrafts_shadow[$aircraft_icao])) {
+									$spotter_item['aircraft_shadow'] = $aircrafts_shadow[$aircraft_icao];
+								} else {
 									$aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']);
-									if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
-									elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') $spotter_item['aircraft_shadow'] = 'PA18.png';
-									elseif ($aircraft_icao == 'PARAGLIDER') $spotter_item['aircraft_shadow'] = 'PARAGLIDER.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';
+									} elseif ($aircraft_icao == 'PARAGLIDER') {
+										$spotter_item['aircraft_shadow'] = 'PARAGLIDER.png';
+									} else {
+										$spotter_item['aircraft_shadow'] = '';
+									}
 									$aircrafts_shadow[$aircraft_icao] = $spotter_item['aircraft_shadow'];
 								}
 							}
@@ -307,73 +376,139 @@ 
 						if (!isset($spotter_item['aircraft_shadow']) || $spotter_item['aircraft_shadow'] == '') {
 							if ($tracker) {
 								if (isset($spotter_item['type']) && $spotter_item['type'] == 'Ambulance') {
-									if ($compress) $output .= '"as": "ambulance.png",';
-									else $output .= '"aircraft_shadow": "ambulance.png",';
+									if ($compress) {
+										$output .= '"as": "ambulance.png",';
+									} else {
+										$output .= '"aircraft_shadow": "ambulance.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Police') {
-									if ($compress) $output .= '"as": "police.png",';
-									else $output .= '"aircraft_shadow": "police.png",';
+									if ($compress) {
+										$output .= '"as": "police.png",';
+									} else {
+										$output .= '"aircraft_shadow": "police.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Yacht (Sail)') {
-									if ($compress) $output .= '"as": "ship.png",';
-									else $output .= '"aircraft_shadow": "ship.png",';
+									if ($compress) {
+										$output .= '"as": "ship.png",';
+									} else {
+										$output .= '"aircraft_shadow": "ship.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Ship (Power Boat)') {
-									if ($compress) $output .= '"as": "ship.png",';
-									else $output .= '"aircraft_shadow": "ship.png",';
+									if ($compress) {
+										$output .= '"as": "ship.png",';
+									} else {
+										$output .= '"aircraft_shadow": "ship.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Shuttle') {
-									if ($compress) $output .= '"as": "ship.png",';
-									else $output .= '"aircraft_shadow": "ship.png",';
+									if ($compress) {
+										$output .= '"as": "ship.png",';
+									} else {
+										$output .= '"aircraft_shadow": "ship.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Truck') {
-									if ($compress) $output .= '"as": "truck.png",';
-									else $output .= '"aircraft_shadow": "truck.png",';
+									if ($compress) {
+										$output .= '"as": "truck.png",';
+									} else {
+										$output .= '"aircraft_shadow": "truck.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Truck (18 Wheeler)') {
-									if ($compress) $output .= '"as": "truck.png",';
-									else $output .= '"aircraft_shadow": "truck.png",';
+									if ($compress) {
+										$output .= '"as": "truck.png",';
+									} else {
+										$output .= '"aircraft_shadow": "truck.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Aircraft (small)') {
-									if ($compress) $output .= '"as": "aircraft.png",';
-									else $output .= '"aircraft_shadow": "aircraft.png",';
+									if ($compress) {
+										$output .= '"as": "aircraft.png",';
+									} else {
+										$output .= '"aircraft_shadow": "aircraft.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Large Aircraft') {
-									if ($compress) $output .= '"as": "aircraft.png",';
-									else $output .= '"aircraft_shadow": "aircraft.png",';
+									if ($compress) {
+										$output .= '"as": "aircraft.png",';
+									} else {
+										$output .= '"aircraft_shadow": "aircraft.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Helicopter') {
-									if ($compress) $output .= '"as": "helico.png",';
-									else $output .= '"aircraft_shadow": "helico.png",';
+									if ($compress) {
+										$output .= '"as": "helico.png",';
+									} else {
+										$output .= '"aircraft_shadow": "helico.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Railroad Engine') {
-									if ($compress) $output .= '"as": "rail.png",';
-									else $output .= '"aircraft_shadow": "rail.png",';
+									if ($compress) {
+										$output .= '"as": "rail.png",';
+									} else {
+										$output .= '"aircraft_shadow": "rail.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Firetruck') {
-									if ($compress) $output .= '"as": "firetruck.png",';
-									else $output .= '"aircraft_shadow": "firetruck.png",';
+									if ($compress) {
+										$output .= '"as": "firetruck.png",';
+									} else {
+										$output .= '"aircraft_shadow": "firetruck.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Bus') {
-									if ($compress) $output .= '"as": "bus.png",';
-									else $output .= '"aircraft_shadow": "bus.png",';
+									if ($compress) {
+										$output .= '"as": "bus.png",';
+									} else {
+										$output .= '"aircraft_shadow": "bus.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Phone') {
-									if ($compress) $output .= '"as": "phone.png",';
-									else $output .= '"aircraft_shadow": "phone.png",';
+									if ($compress) {
+										$output .= '"as": "phone.png",';
+									} else {
+										$output .= '"aircraft_shadow": "phone.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Jogger') {
-									if ($compress) $output .= '"as": "jogger.png",';
-									else $output .= '"aircraft_shadow": "jogger.png",';
+									if ($compress) {
+										$output .= '"as": "jogger.png",';
+									} else {
+										$output .= '"aircraft_shadow": "jogger.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Bike') {
-									if ($compress) $output .= '"as": "bike.png",';
-									else $output .= '"aircraft_shadow": "bike.png",';
+									if ($compress) {
+										$output .= '"as": "bike.png",';
+									} else {
+										$output .= '"aircraft_shadow": "bike.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Motorcycle') {
-									if ($compress) $output .= '"as": "motorcycle.png",';
-									else $output .= '"aircraft_shadow": "motorcycle.png",';
+									if ($compress) {
+										$output .= '"as": "motorcycle.png",';
+									} else {
+										$output .= '"aircraft_shadow": "motorcycle.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Balloon') {
-									if ($compress) $output .= '"as": "balloon.png",';
-									else $output .= '"aircraft_shadow": "balloon.png",';
+									if ($compress) {
+										$output .= '"as": "balloon.png",';
+									} else {
+										$output .= '"aircraft_shadow": "balloon.png",';
+									}
 								} else {
-									if ($compress) $output .= '"as": "car.png",';
-									else $output .= '"aircraft_shadow": "car.png",';
+									if ($compress) {
+										$output .= '"as": "car.png",';
+									} else {
+										$output .= '"aircraft_shadow": "car.png",';
+									}
 								}
 							} elseif ($marine) {
-								if ($compress) $output .= '"as": "ship.png",';
-								else $output .= '"aircraft_shadow": "ship.png",';
+								if ($compress) {
+									$output .= '"as": "ship.png",';
+								} else {
+									$output .= '"aircraft_shadow": "ship.png",';
+								}
 							} else {
-								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'].'",';
@@ -381,8 +516,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'].'",';
@@ -394,8 +532,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'].'",';
@@ -414,8 +555,11 @@ 
 						}
 						
 						if (isset($spotter_item['altitude'])) {
-							if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",';
-							else $output .= '"altitude": "'.$spotter_item['altitude'].'",';
+							if ($compress) {
+								$output .= '"a": "'.$spotter_item['altitude'].'",';
+							} else {
+								$output .= '"altitude": "'.$spotter_item['altitude'].'",';
+							}
 						}
 						
 						$heading = $spotter_item['heading'];
@@ -439,19 +583,24 @@ 
 							}
 						}
 						
-						if ($compress)$output .= '"h": "'.$heading.'",';
-						else $output .= '"heading": "'.$heading.'",';
+						if ($compress) {
+							$output .= '"h": "'.$heading.'",';
+						} else {
+							$output .= '"heading": "'.$heading.'",';
+						}
 						if ($currenttime != '') {
 							if (strtotime($spotter_item['date']) < $currenttime) {
 								if (isset($archivespeed)) {
 									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
 									$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
-									if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
-									else {
+									if (!isset($idistance) || $fdistance < $idistance) {
+										$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
+									} else {
 										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,$archivespeed,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
 										$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
-										if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
-										else {
+										if (!isset($idistance) || $fdistance < $idistance) {
+											$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
+										} else {
 											$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed);
 											$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 										}
@@ -459,12 +608,14 @@ 
 								} elseif ($usenextlatlon) {
 									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,1,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
 									$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
-									if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
-									else {
+									if (!isset($idistance) || $fdistance < $idistance) {
+										$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
+									} else {
 										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,1,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
 										$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
-										if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
-										else {
+										if (!isset($idistance) || $fdistance < $idistance) {
+											$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
+										} else {
 											$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading);
 											$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 										}
@@ -503,7 +654,9 @@ 
 							}
 						}
 
-						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']))).'",';
 						}
@@ -511,8 +664,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'].'",';
@@ -531,14 +687,23 @@ 
 						}
 						// type when not aircraft ?
 						if (isset($spotter_item['type'])) {
-							if ($compress) $output .= '"t": "'.$spotter_item['type'].'"';
-							else $output .= '"type": "'.$spotter_item['type'].'"';
+							if ($compress) {
+								$output .= '"t": "'.$spotter_item['type'].'"';
+							} else {
+								$output .= '"type": "'.$spotter_item['type'].'"';
+							}
 						} elseif ($marine) {
-							if ($compress) $output .= '"t": "ship"';
-							else $output .= '"type": "ship"';
+							if ($compress) {
+								$output .= '"t": "ship"';
+							} else {
+								$output .= '"type": "ship"';
+							}
 						} else {
-							if ($compress) $output .= '"t": "aircraft"';
-							else $output .= '"type": "aircraft"';
+							if ($compress) {
+								$output .= '"t": "aircraft"';
+							} else {
+								$output .= '"type": "aircraft"';
+							}
 						}
 						$output .= '},';
 						$output .= '"geometry": {';
@@ -546,15 +711,19 @@ 
 								$output .= '"coordinates": [';
 								if ($currenttime != '') {
 									if (strtotime($spotter_item['date']) < $currenttime) {
-										if (!isset($archivespeed)) $archivespeed = 1;
+										if (!isset($archivespeed)) {
+											$archivespeed = 1;
+										}
 										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed,($currenttime-strtotime($spotter_item['date'])));
 										$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
-										if (!isset($idistance) || $fdistance < $idistance) $output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
-										else {
+										if (!isset($idistance) || $fdistance < $idistance) {
+											$output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
+										} else {
 											$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,$archivespeed,($currenttime-strtotime($spotter_item['date'])));
 											$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
-											if (!isset($idistance) || $fdistance < $idistance) $output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
-											else {
+											if (!isset($idistance) || $fdistance < $idistance) {
+												$output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
+											} else {
 												$output .= $spotter_item['longitude'].', ';
 												$output .= $spotter_item['latitude'];
 											}
@@ -632,7 +801,9 @@ 
 			}
 */
 				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
-				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
+				if ($history == '' && isset($_COOKIE['history'])) {
+					$history = $_COOKIE['history'];
+				}
 				
 				if (
 				    (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
@@ -698,8 +869,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'].', ';
@@ -720,10 +894,15 @@ 
 							if ($d == false) {
 								if ($compress) {
 									$output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'",';
-									if (isset($spotter_history_array[0]['mapmatching_engine']) && $spotter_history_array[0]['mapmatching_engine'] == 'graphhopper') $output_history .= '"atr": "Powered by <a href=\"https://www.graphhopper.com/\">GraphHopper API</a>", Map matching engine use data from © <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>",';
-									elseif (isset($spotter_history_array[0]['mapmatching_engine'])) $output_history .= '"atr": "Map matching engine use data from © <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>",';
+									if (isset($spotter_history_array[0]['mapmatching_engine']) && $spotter_history_array[0]['mapmatching_engine'] == 'graphhopper') {
+										$output_history .= '"atr": "Powered by <a href=\"https://www.graphhopper.com/\">GraphHopper API</a>", Map matching engine use data from © <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>",';
+									} elseif (isset($spotter_history_array[0]['mapmatching_engine'])) {
+										$output_history .= '"atr": "Map matching engine use data from © <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>",';
+									}
 									$output_history .= '"t": "history"},"geometry": {"type": "LineString","coordinates": [';
-								} else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
+								} else {
+									$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
+								}
 								$d = true;
 							}
 							$output_history .= '[';
@@ -746,7 +925,9 @@ 
 							$output_historyd = '[';
 							$output_historyd .=  $spotter_item['longitude'].', ';
 							$output_historyd .=  $spotter_item['latitude'];
-							if (isset($spotter_history['altitude'])) $output_historyd .=  ','.$spotter_item['altitude']*30.48;
+							if (isset($spotter_history['altitude'])) {
+								$output_historyd .=  ','.$spotter_item['altitude']*30.48;
+							}
 							$output_historyd .= '],';
 							//$output_history = $output_historyd.$output_history;
 							$output_history = $output_history.$output_historyd;
@@ -773,8 +954,11 @@ 
 				        && $spotter_item['arrival_airport'] != 'NA' 
 				        && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") 
 				    	    || (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)))) {
-				    if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
-				    else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
+				    if ($compress) {
+				    	$output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
+				    } else {
+				    	$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') {
@@ -807,8 +991,11 @@ 
 				    	    || (!isset($_COOKIE['MapRemainingRoute']) && (!isset($globalMapRemainingRoute) 
 				    	    || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
 				    $havedata = false;
-				    if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
-				    else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
+				    if ($compress) {
+				    	$output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
+				    } else {
+				    	$output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
+				    }
 				    $output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
 
 				    if (isset($spotter_item['arrival_airport_latitude'])) {
@@ -823,7 +1010,9 @@ 
 				    }
 				    //$output_dest  = substr($output_dest, 0, -1);
 				    $output_dest .= ']}},';
-				    if ($havedata) $output .= $output_dest;
+				    if ($havedata) {
+				    	$output .= $output_dest;
+				    }
 				    unset($output_dest);
 				}
 			}
@@ -831,7 +1020,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": ';

Indentation +68 added lines, -68 removed lines

@@ -14,23 +14,23 @@ 
 $usecoord = false;
 if (isset($_GET['test'])) exit();
 if (isset($_GET['tracker'])) {
-    $tracker = true;
+	$tracker = true;
 }
 if (isset($_GET['marine'])) {
-    $marine = true;
+	$marine = true;
 }
 if ($tracker) {
-    require_once('require/class.Tracker.php');
-    require_once('require/class.TrackerLive.php');
-    require_once('require/class.TrackerArchive.php');
+	require_once('require/class.Tracker.php');
+	require_once('require/class.TrackerLive.php');
+	require_once('require/class.TrackerArchive.php');
 } elseif ($marine) {
-    require_once('require/class.Marine.php');
-    require_once('require/class.MarineLive.php');
-    require_once('require/class.MarineArchive.php');
+	require_once('require/class.Marine.php');
+	require_once('require/class.MarineLive.php');
+	require_once('require/class.MarineArchive.php');
 } else {
-    require_once('require/class.Spotter.php');
-    require_once('require/class.SpotterLive.php');
-    require_once('require/class.SpotterArchive.php');
+	require_once('require/class.Spotter.php');
+	require_once('require/class.SpotterLive.php');
+	require_once('require/class.SpotterArchive.php');
 }
 
 $begintime = microtime(true);
@@ -50,10 +50,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');
 
@@ -131,7 +131,7 @@ 
 	$usecoord = true;
 	$coord = explode(',',$_GET['coord']);
 	if (filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
-	    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0) {
+		&& $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0) {
 		if ($tracker) {
 			$spotter_array = $TrackerLive->getMinLiveTrackerDatabyCoord($coord,$filter);
 		} elseif ($marine) {
@@ -635,17 +635,17 @@ 
 				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
 				
 				if (
-				    (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
-				    || ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
+					(isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
+					|| ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
 				//    || (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))
 				//    || (isset($history) && $history != '' && $history != 'NA' && $history == $spotter_item['ident'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
-				    ) {
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
+					) {
 					if ($tracker) {
 						if ($from_archive || $globalArchive) {
 							$spotter_history_array = $TrackerArchive->getAllArchiveTrackerDataById($spotter_item['famtrackid']);
@@ -653,9 +653,9 @@ 
 							$spotter_history_array = $TrackerLive->getAllLiveTrackerDataById($spotter_item['famtrackid']);
 						}
 						if (((isset($_COOKIE['mapmatching']) && $_COOKIE['mapmatching'] == 'true') ||
-						    (!isset($_COOKIE['mapmatching']) && $globalMapMatching === TRUE)) && 
-						    isset($_GET['zoom']) && $_GET['zoom'] > 12 && 
-						    isset($spotter_item['type']) && (
+							(!isset($_COOKIE['mapmatching']) && $globalMapMatching === TRUE)) && 
+							isset($_GET['zoom']) && $_GET['zoom'] > 12 && 
+							isset($spotter_item['type']) && (
 							$spotter_item['type'] == 'Firetruck' ||
 							$spotter_item['type'] == 'Ambulance' ||
 							$spotter_item['type'] == 'Truck (18 Wheeler)' ||
@@ -667,7 +667,7 @@ 
 							$spotter_item['type'] == 'Jeep' ||
 							$spotter_item['type'] == 'Motorcycle' ||
 							$spotter_item['type'] == 'Car'
-						    )
+							)
 						) {
 							require(dirname(__FILE__).'/require/class.MapMatching.php');
 							$MapMatching = new MapMatching();
@@ -770,65 +770,65 @@ 
 				}
 				
 				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
-				     && (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) && $globalMapRoute)))) {
-				    if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
-				    else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
-				    if (isset($spotter_item['departure_airport_latitude'])) {
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
+					 && (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) && $globalMapRoute)))) {
+					if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
+					else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
+					if (isset($spotter_item['departure_airport_latitude'])) {
 					$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
-				    } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
+					} elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
 					$dairport = $Spotter->getAllAirportInfo($spotter_item['departure_airport']);
 					if (isset($dairport[0]['latitude'])) {
-					    $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
+						$output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
 					}
-				    }
-				    if (isset($spotter_item['arrival_airport_latitude'])) {
+					}
+					if (isset($spotter_item['arrival_airport_latitude'])) {
 					$output_air .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].'],';
-				    } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
+					} elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
 					$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
 					if (isset($aairport[0]['latitude'])) {
-					    $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].'],';
+						$output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].'],';
 					}
-				    }
-				    $output_air  = substr($output_air, 0, -1);
-				    $output_air .= ']}},';
-				    $output .= $output_air;
-				    unset($output_air);
+					}
+					$output_air  = substr($output_air, 0, -1);
+					$output_air .= ']}},';
+					$output .= $output_air;
+					unset($output_air);
 				}
 
 				//if (isset($history) && $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))))) {
 				//if (isset($history) && $history != '' && $history == $spotter_item['ident'] && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
 				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
-				     && (isset($spotter_item['arrival_airport']) 
-				        && $spotter_item['arrival_airport'] != 'NA' 
-				        && ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == "true") 
-				    	    || (!isset($_COOKIE['MapRemainingRoute']) && (!isset($globalMapRemainingRoute) 
-				    	    || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
-				    $havedata = false;
-				    if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
-				    else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
-				    $output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
+					 && (isset($spotter_item['arrival_airport']) 
+						&& $spotter_item['arrival_airport'] != 'NA' 
+						&& ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == "true") 
+							|| (!isset($_COOKIE['MapRemainingRoute']) && (!isset($globalMapRemainingRoute) 
+							|| (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
+					$havedata = false;
+					if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
+					else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
+					$output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
 
-				    if (isset($spotter_item['arrival_airport_latitude'])) {
+					if (isset($spotter_item['arrival_airport_latitude'])) {
 					$output_dest .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].']';
 					$havedata = true;
-				    } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
+					} elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
 					$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
 					if (isset($aairport[0]['latitude'])) {
-					    $output_dest .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
-					    $havedata = true;
+						$output_dest .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
+						$havedata = true;
 					}
-				    }
-				    //$output_dest  = substr($output_dest, 0, -1);
-				    $output_dest .= ']}},';
-				    if ($havedata) $output .= $output_dest;
-				    unset($output_dest);
+					}
+					//$output_dest  = substr($output_dest, 0, -1);
+					$output_dest .= ']}},';
+					if ($havedata) $output .= $output_dest;
+					unset($output_dest);
 				}
 			}
 			$output  = substr($output, 0, -1);

Spacing +82 added lines, -82 removed lines

@@ -64,17 +64,17 @@ 
 $min = true;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
-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_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],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($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],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', 'famaprs'));
+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_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'], 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($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'], FILTER_SANITIZE_STRING);
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
@@ -83,7 +83,7 @@ 
 $spotter_array = array();
 
 if (isset($_GET['ident'])) {
-	$ident = urldecode(filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING));
+	$ident = urldecode(filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING));
 	if ($tracker) {
 		$spotter_array = $TrackerLive->getLastLiveTrackerDataByIdent($ident);
 	} elseif ($marine) {
@@ -97,7 +97,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;
@@ -105,11 +105,11 @@ 
 	}
 	$allhistory = true;
 } elseif (isset($_GET['famtrack_id'])) {
-	$famtrack_id = urldecode(filter_input(INPUT_GET,'famtrack_id',FILTER_SANITIZE_STRING));
+	$famtrack_id = urldecode(filter_input(INPUT_GET, 'famtrack_id', FILTER_SANITIZE_STRING));
 	$spotter_array = $TrackerLive->getLastLiveTrackerDataById($famtrack_id);
 	$allhistory = true;
 } elseif (isset($_GET['fammarine_id'])) {
-	$fammarine_id = urldecode(filter_input(INPUT_GET,'fammarine_id',FILTER_SANITIZE_STRING));
+	$fammarine_id = urldecode(filter_input(INPUT_GET, 'fammarine_id', FILTER_SANITIZE_STRING));
 	$spotter_array = $MarineLive->getLastLiveMarineDataById($fammarine_id);
 	$allhistory = true;
 /*
@@ -129,15 +129,15 @@ 
 */
 } elseif (isset($globalMapUseBbox) && $globalMapUseBbox && isset($_GET['coord']) && $min) {
 	$usecoord = true;
-	$coord = explode(',',$_GET['coord']);
-	if (filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
+	$coord = explode(',', $_GET['coord']);
+	if (filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT) 
 	    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0) {
 		if ($tracker) {
-			$spotter_array = $TrackerLive->getMinLiveTrackerDatabyCoord($coord,$filter);
+			$spotter_array = $TrackerLive->getMinLiveTrackerDatabyCoord($coord, $filter);
 		} elseif ($marine) {
-			$spotter_array = $MarineLive->getMinLiveMarineDatabyCoord($coord,$filter);
+			$spotter_array = $MarineLive->getMinLiveMarineDatabyCoord($coord, $filter);
 		} else {
-			$spotter_array = $SpotterLive->getMinLiveSpotterDatabyCoord($coord,$filter);
+			$spotter_array = $SpotterLive->getMinLiveSpotterDatabyCoord($coord, $filter);
 		}
 	} else {
 		if ($tracker) {
@@ -152,12 +152,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->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) {
 	if ($tracker) {
 		$spotter_array = $TrackerLive->getMinLiveTrackerData($filter);
@@ -169,17 +169,17 @@ 
 #	$min = true;
 } else {
 	if ($tracker) {
-		$spotter_array = $TrackerLive->getLiveTrackerData('','',$filter);
+		$spotter_array = $TrackerLive->getLiveTrackerData('', '', $filter);
 	} elseif ($marine) {
-		$spotter_array = $marineLive->getLiveMarineData('','',$filter);
+		$spotter_array = $marineLive->getLiveMarineData('', '', $filter);
 	} else {
-		$spotter_array = $SpotterLive->getLiveSpotterData('','',$filter);
+		$spotter_array = $SpotterLive->getLiveSpotterData('', '', $filter);
 	}
 }
 
 if ($usecoord) {
 	if (isset($_GET['archive'])) {
-		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
+		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
 	} else {
 		if ($tracker) {
 			$flightcnt = $TrackerLive->getLiveTrackerCount($filter);
@@ -192,9 +192,9 @@ 
 	if ($flightcnt == '') $flightcnt = 0;
 } else $flightcnt = 0;
 
-$sqltime = round(microtime(true)-$begintime,2);
+$sqltime = round(microtime(true) - $begintime, 2);
 
-$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 if ($currenttime != '') $currenttime = round($currenttime/1000);
 
 if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) $usenextlatlon = false;
@@ -213,7 +213,7 @@ 
 		if (!empty($spotter_array) && is_array($spotter_array))
 		{
 			$output .= '"features": [';
-			foreach($spotter_array as $spotter_item)
+			foreach ($spotter_array as $spotter_item)
 			{
 				$j++;
 				unset($idistance);
@@ -270,8 +270,8 @@ 
 */
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
-							if ($compress) $output .= '"c": "'.str_replace('\\','',$spotter_item['ident']).'",';
-							else $output .= '"callsign": "'.str_replace('\\','',$spotter_item['ident']).'",';
+							if ($compress) $output .= '"c": "'.str_replace('\\', '', $spotter_item['ident']).'",';
+							else $output .= '"callsign": "'.str_replace('\\', '', $spotter_item['ident']).'",';
 							//"
 						} else {
 							if ($compress) $output .= '"c": "NA",';
@@ -280,7 +280,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) {
@@ -423,15 +423,15 @@ 
 						if (isset($archivespeed) || $usenextlatlon) {
 							if (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
 								if (isset($spotter_item['arrival_airport_latitude'])) {
-									$cheading = $Common->getHeading($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['arrival_airport_latitude'],$spotter_item['arrival_airport_longitude']);
-									$idistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['arrival_airport_latitude'],$spotter_item['arrival_airport_longitude']);
+									$cheading = $Common->getHeading($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['arrival_airport_latitude'], $spotter_item['arrival_airport_longitude']);
+									$idistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['arrival_airport_latitude'], $spotter_item['arrival_airport_longitude']);
 									$farr_lat = $spotter_item['arrival_airport_latitude'];
 									$farr_lon = $spotter_item['arrival_airport_longitude'];
 								} else {
 									$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
 									if (isset($aairport[0]['latitude'])) {
-										$cheading = $Common->getHeading($spotter_item['latitude'],$spotter_item['longitude'],$aairport[0]['latitude'],$aairport[0]['longitude']);
-										$idistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$aairport[0]['latitude'],$aairport[0]['longitude']);
+										$cheading = $Common->getHeading($spotter_item['latitude'], $spotter_item['longitude'], $aairport[0]['latitude'], $aairport[0]['longitude']);
+										$idistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $aairport[0]['latitude'], $aairport[0]['longitude']);
 										$farr_lat = $aairport[0]['latitude'];
 										$farr_lon = $aairport[0]['longitude'];
 									}
@@ -444,59 +444,59 @@ 
 						if ($currenttime != '') {
 							if (strtotime($spotter_item['date']) < $currenttime) {
 								if (isset($archivespeed)) {
-									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
-									$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
+									$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading, $archivespeed, ($currenttime - strtotime($spotter_item['date']) + $globalMapRefresh));
+									$fdistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $nextcoord['latitude'], $nextcoord['longitude']);
 									if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 									else {
-										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,$archivespeed,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
-										$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
+										$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $cheading, $archivespeed, ($currenttime - strtotime($spotter_item['date']) + $globalMapRefresh));
+										$fdistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $nextcoord['latitude'], $nextcoord['longitude']);
 										if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 										else {
-											$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed);
+											$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading, $archivespeed);
 											$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 										}
 									}
 								} elseif ($usenextlatlon) {
-									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,1,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
-									$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
+									$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading, 1, ($currenttime - strtotime($spotter_item['date']) + $globalMapRefresh));
+									$fdistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $nextcoord['latitude'], $nextcoord['longitude']);
 									if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 									else {
-										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,1,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
-										$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
+										$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $cheading, 1, ($currenttime - strtotime($spotter_item['date']) + $globalMapRefresh));
+										$fdistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $nextcoord['latitude'], $nextcoord['longitude']);
 										if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 										else {
-											$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading);
+											$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading);
 											$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 										}
 									}
 								}
 							} else {
 								if (isset($archivespeed)) {
-									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed);
+									$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading, $archivespeed);
 									$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 								} elseif ($usenextlatlon) {
-									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading);
+									$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading);
 									$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 								}
 							}
 						} else {
 							if (isset($archivespeed)) {
-								$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed);
-								$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
+								$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading, $archivespeed);
+								$fdistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $nextcoord['latitude'], $nextcoord['longitude']);
 								if (!isset($idistance) || $fdistance < $idistance) {
 									$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 								} else {
-									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,$archivespeed);
+									$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $cheading, $archivespeed);
 									//$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
 									$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 								}
 							} elseif ($usenextlatlon) {
-								$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading);
-								$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
+								$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading);
+								$fdistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $nextcoord['latitude'], $nextcoord['longitude']);
 								if (!isset($idistance) || $fdistance < $idistance) {
 										$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 								} else {
-									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading);
+									$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $cheading);
 									//$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
 									$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 								}
@@ -505,7 +505,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']).'",';
@@ -527,7 +527,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 (isset($spotter_item['type'])) {
@@ -547,12 +547,12 @@ 
 								if ($currenttime != '') {
 									if (strtotime($spotter_item['date']) < $currenttime) {
 										if (!isset($archivespeed)) $archivespeed = 1;
-										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed,($currenttime-strtotime($spotter_item['date'])));
-										$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
+										$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $heading, $archivespeed, ($currenttime - strtotime($spotter_item['date'])));
+										$fdistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $nextcoord['latitude'], $nextcoord['longitude']);
 										if (!isset($idistance) || $fdistance < $idistance) $output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
 										else {
-											$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,$archivespeed,($currenttime-strtotime($spotter_item['date'])));
-											$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
+											$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $cheading, $archivespeed, ($currenttime - strtotime($spotter_item['date'])));
+											$fdistance = $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $nextcoord['latitude'], $nextcoord['longitude']);
 											if (!isset($idistance) || $fdistance < $idistance) $output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
 											else {
 												$output .= $spotter_item['longitude'].', ';
@@ -631,7 +631,7 @@ 
                 
 			}
 */
-				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
+				$history = filter_input(INPUT_GET, 'history', FILTER_SANITIZE_STRING);
 				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
 				
 				if (
@@ -639,11 +639,11 @@ 
 				    || ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
 				//    || (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))
 				//    || (isset($history) && $history != '' && $history != 'NA' && $history == $spotter_item['ident'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
+				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-', '', $history) == str_replace('-', '', $spotter_item['flightaware_id']))
 				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
+				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-', '', $history) == str_replace('-', '', $spotter_item['fammarine_id']))
 				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
+				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-', '', $history) == str_replace('-', '', $spotter_item['famtrackid']))
 				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
 				    ) {
 					if ($tracker) {
@@ -672,9 +672,9 @@ 
 							require(dirname(__FILE__).'/require/class.MapMatching.php');
 							$MapMatching = new MapMatching();
 							if (isset($spotter_item['date_iso_8601'])) {
-								$spotter_history_array_mm = array_merge($spotter_history_array,array(array('latitude' => $spotter_item['latitude'],'longitude' => $spotter_item['longitude'],'date' => date('c',strtotime($spotter_item['date_iso_8601'])))));
+								$spotter_history_array_mm = array_merge($spotter_history_array, array(array('latitude' => $spotter_item['latitude'], 'longitude' => $spotter_item['longitude'], 'date' => date('c', strtotime($spotter_item['date_iso_8601'])))));
 							} else {
-								$spotter_history_array_mm = array_merge($spotter_history_array,array(array('latitude' => $spotter_item['latitude'],'longitude' => $spotter_item['longitude'],'date' => date('c',strtotime($spotter_item['date'])))));
+								$spotter_history_array_mm = array_merge($spotter_history_array, array(array('latitude' => $spotter_item['latitude'], 'longitude' => $spotter_item['longitude'], 'date' => date('c', strtotime($spotter_item['date'])))));
 							}
 							$spotter_history_array = $MapMatching->match($spotter_history_array_mm);
 						}
@@ -706,9 +706,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 .= '],';
 							/*
 							if ($from_archive === false) {
@@ -731,8 +731,8 @@ 
 								$d = true;
 							}
 							$output_history .= '[';
-							$output_history .=  $spotter_history['longitude'].', ';
-							$output_history .=  $spotter_history['latitude'];
+							$output_history .= $spotter_history['longitude'].', ';
+							$output_history .= $spotter_history['latitude'];
 							$output_history .= '],';
 							/*
 							if ($from_archive === false) {
@@ -748,9 +748,9 @@ 
 						//echo $output_history;
 						if ($from_archive === false && !isset($spotter_history_array[0]['mapmatching_engine'])) {
 							$output_historyd = '[';
-							$output_historyd .=  $spotter_item['longitude'].', ';
-							$output_historyd .=  $spotter_item['latitude'];
-							if (isset($spotter_history['altitude'])) $output_historyd .=  ','.$spotter_item['altitude']*30.48;
+							$output_historyd .= $spotter_item['longitude'].', ';
+							$output_historyd .= $spotter_item['latitude'];
+							if (isset($spotter_history['altitude'])) $output_historyd .= ','.$spotter_item['altitude']*30.48;
 							$output_historyd .= '],';
 							//$output_history = $output_historyd.$output_history;
 							$output_history = $output_history.$output_historyd;
@@ -758,7 +758,7 @@ 
 							$last = array_pop($spotter_history_array);
 							$latitude = $last['latitude'];
 							$longitude = $last['longitude'];
-							$output = str_replace('"coordinates": ['.$spotter_item['longitude'].', '.$spotter_item['latitude'].']}','"coordinates": ['.$longitude.', '.$latitude.']}',$output);
+							$output = str_replace('"coordinates": ['.$spotter_item['longitude'].', '.$spotter_item['latitude'].']}', '"coordinates": ['.$longitude.', '.$latitude.']}', $output);
 						}
 						
 						$output_history  = substr($output_history, 0, -1);
@@ -769,7 +769,7 @@ 
 					}
 				}
 				
-				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
+				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-', '', $history) == str_replace('-', '', $spotter_item['flightaware_id']))
 				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
 				     && (isset($spotter_item['departure_airport']) 
 				        && $spotter_item['departure_airport'] != 'NA' 
@@ -803,7 +803,7 @@ 
 
 				//if (isset($history) && $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))))) {
 				//if (isset($history) && $history != '' && $history == $spotter_item['ident'] && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
-				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
+				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-', '', $history) == str_replace('-', '', $spotter_item['flightaware_id']))
 				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
 				     && (isset($spotter_item['arrival_airport']) 
 				        && $spotter_item['arrival_airport'] != 'NA' 
@@ -834,7 +834,7 @@ 
 			$output  = substr($output, 0, -1);
 			$output .= ']';
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
-			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
+			$output .= '"totaltime": "'.round(microtime(true) - $begintime, 2).'",';
 			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
 			$output .= '"fc": "'.$j.'"';
 		} else {