Ysurac / FlightAirMap

require/class.Accident.php

Spacing +55 added lines, -55 removed lines

@@ -28,20 +28,20 @@ 
 	* @param String $date get data for a date
 	* @return Array Return Accidents data in array
 	*/
-	public function getAccidentData($limit = '',$type = '',$date = '') {
+	public function getAccidentData($limit = '', $type = '', $date = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
 		$Spotter = new Spotter($this->db);
 		$Translation = new Translation($this->db);
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
 		date_default_timezone_set('UTC');
 		$result = array();
 		$limit_query = '';
 		if ($limit != "")
 		{
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -50,29 +50,29 @@ 
 
 		if ($type != '') {
 			if ($date != '') {
-				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) {
+				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) {
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 					//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
-					$query_values = array(':type' => $type,':date' => $date);
-				} elseif (preg_match("/^[0-9]{4}-[0-9]{2}$/",$date)) {
+					$query_values = array(':type' => $type, ':date' => $date);
+				} elseif (preg_match("/^[0-9]{4}-[0-9]{2}$/", $date)) {
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date BETWEEN :dated AND :datef GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
-					$query_values = array(':type' => $type,':dated' => $date.'-01', ':datef' => $date.'-31');
-				} elseif (preg_match("/^[0-9]{4}$/",$date)) {
+					$query_values = array(':type' => $type, ':dated' => $date.'-01', ':datef' => $date.'-31');
+				} elseif (preg_match("/^[0-9]{4}$/", $date)) {
 					if ($globalDBdriver == 'mysql') {
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND YEAR(date) = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 					} else {
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND EXTRACT(YEAR FROM date) = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 					}
-					$query_values = array(':type' => $type,':date' => $date);
+					$query_values = array(':type' => $type, ':date' => $date);
 				} else {
 					$date = $date.'%';
 					if ($globalDBdriver == 'mysql') {
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND DATE_FORMAT(date,'%Y-%m-%d') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
-						$query_values = array(':type' => $type,':date' => $date);
+						$query_values = array(':type' => $type, ':date' => $date);
 					} else {
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND to_char(date,'YYYY-MM-DD') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 						//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND to_char(date,'YYYY-MM-DD') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
-						$query_values = array(':type' => $type,':date' => $date);
+						$query_values = array(':type' => $type, ':date' => $date);
 					}
 				}
 			} else {
@@ -82,7 +82,7 @@ 
 			}
 		} else {
 			if ($date != '') {
-				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) {
+				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) {
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 					//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 				} else {
@@ -100,17 +100,17 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$i = 0;
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
-			if (preg_match('/^[\w\-]+$/',$row['registration'])) {
+			if (preg_match('/^[\w\-]+$/', $row['registration'])) {
 				$data = array();
 				if ($row['registration'] != '') {
 					$image_array = $Image->getSpotterImage($row['registration']);
-					if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-					else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+					if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
+					else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 					$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
 					$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
 					if (!empty($aircraft_info)) {
@@ -118,7 +118,7 @@ 
 						$data['aircraft_name'] = $aircraft_info[0]['type'];
 						$data['aircraft_manufacturer'] = $aircraft_info[0]['manufacturer'];
 					} else {
-						$data = array_merge($data,array('aircraft_type' => 'NA'));
+						$data = array_merge($data, array('aircraft_type' => 'NA'));
 					}
 					$owner_data = $Spotter->getAircraftOwnerByRegistration($row['registration']);
 					if (!empty($owner_data)) {
@@ -126,18 +126,18 @@ 
 						$data['aircraft_base'] = $owner_data['base'];
 						$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
 					}
-				} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				} else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 				if ($row['registration'] == '') $row['registration'] = 'NA';
 				if ($row['ident'] == '') $row['ident'] = 'NA';
-				$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
+				$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 3));
 				if (isset($identicao[0])) {
-					if (substr($row['ident'],0,2) == 'AF') {
-						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-						else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-					} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
-					$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
+					if (substr($row['ident'], 0, 2) == 'AF') {
+						if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
+						else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
+					} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
+					$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
 				} else $icao = $row['ident'];
-				$icao = $Translation->checkTranslation($icao,false);
+				$icao = $Translation->checkTranslation($icao, false);
 				//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
 				if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
 					//echo 'Check airline info... for '.$row['airline_name'].' ';
@@ -146,16 +146,16 @@ 
 					if (!empty($airline_info)) {
 						//echo 'data found !'."\n";
 						//print_r($airline_info);
-						$data = array_merge($data,$airline_info);
+						$data = array_merge($data, $airline_info);
 					} 
 					//else echo 'No data...'."\n";
 				}
-				$data = array_merge($row,$data);
+				$data = array_merge($row, $data);
 				if ($data['ident'] == null) $data['ident'] = $icao;
 				if ($data['title'] == null) {
 					$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
 				} else $data['message'] = strtolower($data['title']);
-				$ids = $Spotter->getAllIDByRegistration($data['registration'],true);
+				$ids = $Spotter->getAllIDByRegistration($data['registration'], true);
 				$date = $data['date'];
 				if (isset($ids[$date])) {
 					$data['spotted'] = TRUE;
@@ -187,7 +187,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "Error : ".$e->getMessage();
 		}
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -207,7 +207,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "Error : ".$e->getMessage();
 		}
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -222,15 +222,15 @@ 
 		if ($globalDebug) echo 'Import '.$file."\n";
 		$result = array();
 		if (file_exists($file)) {
-			if (($handle = fopen($file,'r')) !== FALSE) {
-				while (($data = fgetcsv($handle,2000,",")) !== FALSE) {
+			if (($handle = fopen($file, 'r')) !== FALSE) {
+				while (($data = fgetcsv($handle, 2000, ",")) !== FALSE) {
 					if (isset($data[1]) && $data[1] != '0000-00-00 00:00:00') {
-						$result[] = array('registration' => $data[0],'date' => strtotime($data[1]),'url' => $data[2],'country' => $data[3],'place' => $data[4],'title' => $data[5],'fatalities' => $data[6],'latitude' => $data[7],'longitude' => $data[8],'type' => $data[9],'ident' => $data[10],'aircraft_manufacturer' => $data[11],'aircraft_name' => $data[12],'operator' => $data[13],'source' => 'website_fam');
+						$result[] = array('registration' => $data[0], 'date' => strtotime($data[1]), 'url' => $data[2], 'country' => $data[3], 'place' => $data[4], 'title' => $data[5], 'fatalities' => $data[6], 'latitude' => $data[7], 'longitude' => $data[8], 'type' => $data[9], 'ident' => $data[10], 'aircraft_manufacturer' => $data[11], 'aircraft_name' => $data[12], 'operator' => $data[13], 'source' => 'website_fam');
 					}
 				}
 				fclose($handle);
 			}
-			if (!empty($result)) $this->add($result,true);
+			if (!empty($result)) $this->add($result, true);
 			elseif ($globalDebug) echo 'Nothing to import';
 		}
 	}
@@ -246,8 +246,8 @@ 
 		$all_md5_new = array();
 		if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) {
 			if ($this->check_accidents_nb() > 0) {
-				if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) {
-					while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) {
+					while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) {
 						if (isset($data[1])) {
 							$year = $data[0];
 							$all_md5[$year] = $data[1];
@@ -257,10 +257,10 @@ 
 				}
 			}
 		}
-		$Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5',dirname(__FILE__).'/../install/tmp/cr-all.md5');
+		$Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5', dirname(__FILE__).'/../install/tmp/cr-all.md5');
 		if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) {
-			if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) {
-				while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) {
+			if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) {
+				while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) {
 					if (isset($data[1])) {
 						$year = $data[0];
 						$all_md5_new[$year] = $data[1];
@@ -269,10 +269,10 @@ 
 				fclose($handle);
 			} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
 		} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
-		$result = $Common->arr_diff($all_md5_new,$all_md5);
+		$result = $Common->arr_diff($all_md5_new, $all_md5);
 		if (empty($result) && $globalDebug) echo 'Nothing to update';
 		foreach ($result as $file => $md5) {
-			$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
+			$Common->download('http://data.flightairmap.fr/data/cr/'.$file, dirname(__FILE__).'/../install/tmp/'.$file);
 			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
 			elseif ($globalDebug) echo 'Download '.$file.' failed';
 		}
@@ -282,7 +282,7 @@ 
 	* Add data to DB
 	* @param Array $crash An array with accidents/incidents data
 	*/
-	public function add($crash,$new = false) {
+	public function add($crash, $new = false) {
 		global $globalTransaction, $globalDebug;
 		require_once('class.Connection.php');
 		require_once('class.Image.php');
@@ -298,7 +298,7 @@ 
 			$sthd->execute(array(':source' => $crash[0]['source']));
 		}
 		if ($globalTransaction) $Connection->db->beginTransaction();
-		$initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
+		$initial_array = array('ident' => null, 'type' => 'accident', 'url' => null, 'registration' => null, 'date' => null, 'place' => null, 'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '', 'source' => '', 'aircraft_manufacturer' => null, 'aircraft_name' => null, 'operator' => null);
 		$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
 		$sth_check = $Connection->db->prepare($query_check);
 		$query = 'INSERT INTO accidents (aircraft_manufacturer,aircraft_name,ident,registration,date,url,country,place,title,fatalities,latitude,longitude,type,airline_name,source) VALUES (:aircraft_manufacturer,:aircraft_name,:ident,:registration,:date,:url,:country,:place,:title,:fatalities,:latitude,:longitude,:type,:airline_name,:source)';
@@ -311,15 +311,15 @@ 
 				$cr = array_map(function($value) {
 					return $value === "" ? NULL : $value;
 				}, $cr);
-				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
-					if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
-					$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
+				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/', $cr['registration'])) {
+					if (strpos($cr['registration'], '-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
+					$query_check_values = array(':registration' => $cr['registration'], ':date' => date('Y-m-d', $cr['date']), ':type' => $cr['type'], ':source' => $cr['source']);
 					$sth_check->execute($query_check_values);
 					$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
 					if ($result_check['nb'] == 0) {
-						$query_values = array(':registration' => trim($cr['registration']),':date' => date('Y-m-d',$cr['date']),':url' => $cr['url'],':country' => $cr['country'],':place' => $cr['place'],':title' => $cr['title'],':fatalities' => $cr['fatalities'],':latitude' => $cr['latitude'],':longitude' => $cr['longitude'],':type' => $cr['type'],':source' => $cr['source'],':ident' => $cr['ident'],':aircraft_manufacturer' => $cr['aircraft_manufacturer'],':aircraft_name' => $cr['aircraft_name'],':airline_name' => $cr['operator']);
+						$query_values = array(':registration' => trim($cr['registration']), ':date' => date('Y-m-d', $cr['date']), ':url' => $cr['url'], ':country' => $cr['country'], ':place' => $cr['place'], ':title' => $cr['title'], ':fatalities' => $cr['fatalities'], ':latitude' => $cr['latitude'], ':longitude' => $cr['longitude'], ':type' => $cr['type'], ':source' => $cr['source'], ':ident' => $cr['ident'], ':aircraft_manufacturer' => $cr['aircraft_manufacturer'], ':aircraft_name' => $cr['aircraft_name'], ':airline_name' => $cr['operator']);
 						$sth->execute($query_values);
-						if ($cr['date'] > time()-(30*86400)) {
+						if ($cr['date'] > time() - (30*86400)) {
 							$imgchk = $Image->getSpotterImage($cr['registration']);
 							if (empty($imgchk)) {
 								if ($globalDebug) echo "\t".'Get image for '.$cr['registration'].'...';
@@ -329,16 +329,16 @@ 
 							// elseif ($globalDebug) echo 'Image already in DB'."\n";
 						}
 						if ($cr['title'] == '') $cr['title'] = $cr['registration'].' '.$cr['type'];
-						$Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date']));
+						$Spotter->setHighlightFlightByRegistration($cr['registration'], $cr['title'], date('Y-m-d', $cr['date']));
 					}
 				}
-				if ($globalTransaction && $j % 1000 == 0) {
+				if ($globalTransaction && $j%1000 == 0) {
 					$Connection->db->commit();
 					$Connection->db->beginTransaction();
 				}
 			}
 			if ($globalTransaction) $Connection->db->commit();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			if ($globalTransaction) $Connection->db->rollBack();
 			echo $e->getMessage();
 		}
@@ -356,7 +356,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -374,7 +374,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -389,7 +389,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}

require/class.Common.php

Spacing +92 added lines, -92 removed lines

@@ -14,12 +14,12 @@ 
 	* @param Array $headers header to submit with the form
 	* @return String the result
 	*/
-	public function getData($url, $type = 'get', $data = '', $headers = '',$cookie = '',$referer = '',$timeout = '',$useragent = '', $sizelimit = false, $async = false) {
+	public function getData($url, $type = 'get', $data = '', $headers = '', $cookie = '', $referer = '', $timeout = '', $useragent = '', $sizelimit = false, $async = false) {
 		global $globalProxy, $globalForceIPv4;
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $url);
 		if (isset($globalForceIPv4) && $globalForceIPv4) {
-			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){
+			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) {
 				curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
 			}
 		}
@@ -29,7 +29,7 @@ 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 		curl_setopt($ch, CURLINFO_HEADER_OUT, true); 
-		curl_setopt($ch,CURLOPT_ENCODING , "gzip");
+		curl_setopt($ch, CURLOPT_ENCODING, "gzip");
 		//curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
 //		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Firefox/42.0');
 		if ($useragent == '') {
@@ -39,13 +39,13 @@ 
 		}
 		if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10); 
 		else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); 
-		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback"));
+		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common', "curlResponseHeaderCallback"));
 		if ($type == 'post') {
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
 			if (is_array($data)) {
 				curl_setopt($ch, CURLOPT_POST, count($data));
 				$data_string = '';
-				foreach($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; }
+				foreach ($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; }
 				rtrim($data_string, '&');
 				curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);
 			} else {
@@ -57,7 +57,7 @@ 
 		}
 		if ($cookie != '') {
 			if (is_array($cookie)) {
-				curl_setopt($ch, CURLOPT_COOKIE, implode($cookie,';'));
+				curl_setopt($ch, CURLOPT_COOKIE, implode($cookie, ';'));
 			} else {
 				curl_setopt($ch, CURLOPT_COOKIE, $cookie);
 			}
@@ -68,7 +68,7 @@ 
 		if ($sizelimit === true) {
 			curl_setopt($ch, CURLOPT_BUFFERSIZE, 128);
 			curl_setopt($ch, CURLOPT_NOPROGRESS, false);
-			curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curlr,$downloadsize, $downloaded, $uploadsize, $uploaded){
+			curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curlr, $downloadsize, $downloaded, $uploadsize, $uploaded) {
 				return ($downloaded > (3*1024)) ? 1 : 0;
 			});
 		}
@@ -79,13 +79,13 @@ 
 		$result = curl_exec($ch);
 		$info = curl_getinfo($ch);
 		curl_close($ch);
-		if ($info['http_code'] == '503' && strstr($result,'DDoS protection by CloudFlare')) {
+		if ($info['http_code'] == '503' && strstr($result, 'DDoS protection by CloudFlare')) {
 			echo "Cloudflare Detected\n";
 			require_once(dirname(__FILE__).'/libs/cloudflare-bypass/libraries/cloudflareClass.php');
 			$useragent = UAgent::random();
 			cloudflare::useUserAgent($useragent);
 			if ($clearanceCookie = cloudflare::bypass($url)) {
-				return $this->getData($url,'get',$data,$headers,$clearanceCookie,$referer,$timeout,$useragent);
+				return $this->getData($url, 'get', $data, $headers, $clearanceCookie, $referer, $timeout, $useragent);
 			}
 		} else {
 			return $result;
@@ -109,7 +109,7 @@ 
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
 		if (isset($globalForceIPv4) && $globalForceIPv4) {
-			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){
+			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) {
 				curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
 			}
 		}
@@ -124,20 +124,20 @@ 
 		fclose($fp);
 	}
 
-	public static function gunzip($in_file,$out_file_name = '') {
+	public static function gunzip($in_file, $out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
 		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); 
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
+			if (function_exists('gzopen')) $file = gzopen($in_file, 'rb');
+			elseif (function_exists('gzopen64')) $file = gzopen64($in_file, 'rb');
 			else {
 				echo 'gzopen not available';
 				die;
 			}
 			$out_file = fopen($out_file_name, 'wb'); 
-			while(!gzeof($file)) {
+			while (!gzeof($file)) {
 				fwrite($out_file, gzread($file, $buffer_size));
 			}  
 			fclose($out_file);
@@ -145,19 +145,19 @@ 
 		}
 	}
 
-	public static function bunzip2($in_file,$out_file_name = '') {
+	public static function bunzip2($in_file, $out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
 		if ($out_file_name == '') $out_file_name = str_replace('.bz2', '', $in_file); 
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('bzopen')) $file = bzopen($in_file,'rb');
+			if (function_exists('bzopen')) $file = bzopen($in_file, 'rb');
 			else {
 				echo 'bzopen not available';
 				die;
 			}
 			$out_file = fopen($out_file_name, 'wb'); 
-			while(!feof($file)) {
+			while (!feof($file)) {
 				fwrite($out_file, bzread($file, $buffer_size));
 			}  
 			fclose($out_file);
@@ -175,27 +175,27 @@ 
 		if ($data == '') return array();
 		$html = str_get_html($data);
 		if ($html === false) return array();
-		$tabledata=array();
-		foreach($html->find('tr') as $element)
+		$tabledata = array();
+		foreach ($html->find('tr') as $element)
 		{
 			$td = array();
-			foreach( $element->find('th') as $row)
+			foreach ($element->find('th') as $row)
 			{
 				$td [] = trim($row->plaintext);
 			}
-			$td=array_filter($td);
+			$td = array_filter($td);
 			$tabledata[] = $td;
 
 			$td = array();
 			$tdi = array();
-			foreach( $element->find('td') as $row)
+			foreach ($element->find('td') as $row)
 			{
 				$td [] = trim($row->plaintext);
 				$tdi [] = trim($row->innertext);
 			}
-			$td=array_filter($td);
-			$tdi=array_filter($tdi);
-			$tabledata[]=array_merge($td,$tdi);
+			$td = array_filter($td);
+			$tdi = array_filter($tdi);
+			$tabledata[] = array_merge($td, $tdi);
 		}
 		$html->clear();
 		unset($html);
@@ -210,8 +210,8 @@ 
 	public function text2array($data) {
 		$html = str_get_html($data);
 		if ($html === false) return array();
-		$tabledata=array();
-		foreach($html->find('p') as $element)
+		$tabledata = array();
+		foreach ($html->find('p') as $element)
 		{
 			$tabledata [] = trim($element->plaintext);
 		}
@@ -231,11 +231,11 @@ 
 	*/
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
 		if ($lat == $latc && $lon == $lonc) return 0;
-		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
+		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc))) + cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon) - floatval($lonc)))))*60*1.1515;
 		if ($unit == "km") {
-			return round($dist * 1.609344);
+			return round($dist*1.609344);
 		} elseif ($unit == "m") {
-			return round($dist * 1.609344 * 1000);
+			return round($dist*1.609344*1000);
 		} elseif ($unit == "mile" || $unit == "mi") {
 			return round($dist);
 		} elseif ($unit == "nm") {
@@ -252,8 +252,8 @@ 
 	* @param String $distance distance between two points in m
 	* @return Float plunge
 	*/
-	public function plunge($initial_altitude,$final_altitude,$distance) {
-		$plunge = rad2deg(asin(($final_altitude-$initial_altitude)/$distance));
+	public function plunge($initial_altitude, $final_altitude, $distance) {
+		$plunge = rad2deg(asin(($final_altitude - $initial_altitude)/$distance));
 		return $plunge;
 	}
 
@@ -268,8 +268,8 @@ 
 	public function azimuth($lat, $lon, $latc, $lonc) {
 		$dX = $latc - $lat;
 		$dY = $lonc - $lon;
-		$azimuth = rad2deg(atan2($dY,$dX));
-		if ($azimuth < 0) return $azimuth+360;
+		$azimuth = rad2deg(atan2($dY, $dX));
+		if ($azimuth < 0) return $azimuth + 360;
 		return $azimuth;
 	}
 	
@@ -280,7 +280,7 @@ 
 	* @param float $distance distance covered
 	* @return whether distance is realistic
 	*/
-	public function withinThreshold ($timeDifference, $distance) {
+	public function withinThreshold($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
 		if ($x == 0 || $d == 0) return true;
@@ -296,12 +296,12 @@ 
 		return ($array !== array_values($array));
 	}
 
-	public function isInteger($input){
+	public function isInteger($input) {
 	    return(ctype_digit(strval($input)));
 	}
 
 
-	public function convertDec($dms,$latlong) {
+	public function convertDec($dms, $latlong) {
 		if ($latlong == 'latitude') {
 			$deg = substr($dms, 0, 2);
 			$min = substr($dms, 2, 4);
@@ -309,10 +309,10 @@ 
 			$deg = substr($dms, 0, 3);
 			$min = substr($dms, 3, 5);
 		}
-		return $deg+(($min*60)/3600);
+		return $deg + (($min*60)/3600);
 	}
 	
-	public function convertDM($coord,$latlong) {
+	public function convertDM($coord, $latlong) {
 		if ($latlong == 'latitude') {
 			if ($coord < 0) $NSEW = 'S';
 			else $NSEW = 'N';
@@ -322,9 +322,9 @@ 
 		}
 		$coord = abs($coord);
 		$deg = floor($coord);
-		$coord = ($coord-$deg)*60;
+		$coord = ($coord - $deg)*60;
 		$min = $coord;
-		return array('deg' => $deg,'min' => $min,'NSEW' => $NSEW);
+		return array('deg' => $deg, 'min' => $min, 'NSEW' => $NSEW);
 	}
 	
 	/**
@@ -336,8 +336,8 @@ 
 	public function xcopy($source, $dest)
 	{
 		$files = glob($source.'*.*');
-		foreach($files as $file){
-			$file_to_go = str_replace($source,$dest,$file);
+		foreach ($files as $file) {
+			$file_to_go = str_replace($source, $dest, $file);
 			copy($file, $file_to_go);
 		}
 		return true;
@@ -348,9 +348,9 @@ 
 	* @param	String $url url to check
 	* @return	bool Return true on succes false on failure
 	*/
-	public function urlexist($url){
-		$headers=get_headers($url);
-		return stripos($headers[0],"200 OK")?true:false;
+	public function urlexist($url) {
+		$headers = get_headers($url);
+		return stripos($headers[0], "200 OK") ?true:false;
 	}
 	
 	/**
@@ -361,7 +361,7 @@ 
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
-		for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2)));
+		for ($i = 0; $i < $hexln; $i += 2) $str .= chr(hexdec(substr($hex, $i, 2)));
 		return $str;
 	}
 	
@@ -371,7 +371,7 @@ 
 	* @return	String Return result
 	*/
 	public function hex2rgb($hex) {
-		$hex = str_replace('#','',$hex);
+		$hex = str_replace('#', '', $hex);
 		return sscanf($hex, "%02x%02x%02x"); 
 	}
 	
@@ -379,33 +379,33 @@ 
 		//difference in longitudinal coordinates
 		$dLon = deg2rad($lon2) - deg2rad($lon1);
 		//difference in the phi of latitudinal coordinates
-		$dPhi = log(tan(deg2rad($lat2) / 2 + pi() / 4) / tan(deg2rad($lat1) / 2 + pi() / 4));
+		$dPhi = log(tan(deg2rad($lat2)/2 + pi()/4)/tan(deg2rad($lat1)/2 + pi()/4));
 		//we need to recalculate $dLon if it is greater than pi
-		if(abs($dLon) > pi()) {
-			if($dLon > 0) {
-				$dLon = (2 * pi() - $dLon) * -1;
+		if (abs($dLon) > pi()) {
+			if ($dLon > 0) {
+				$dLon = (2*pi() - $dLon)*-1;
 			} else {
-				$dLon = 2 * pi() + $dLon;
+				$dLon = 2*pi() + $dLon;
 			}
 		}
 		//return the angle, normalized
-		return (rad2deg(atan2($dLon, $dPhi)) + 360) % 360;
+		return (rad2deg(atan2($dLon, $dPhi)) + 360)%360;
 	}
 
-	public function checkLine($lat1,$lon1,$lat2,$lon2,$lat3,$lon3,$approx = 0.15) {
+	public function checkLine($lat1, $lon1, $lat2, $lon2, $lat3, $lon3, $approx = 0.15) {
 		//$a = ($lon2-$lon1)*$lat3+($lat2-$lat1)*$lon3+($lat1*$lon2+$lat2*$lon1);
-		$a = -($lon2-$lon1);
+		$a = -($lon2 - $lon1);
 		$b = $lat2 - $lat1;
-		$c = -($a*$lat1+$b*$lon1);
-		$d = $a*$lat3+$b*$lon3+$c;
+		$c = -($a*$lat1 + $b*$lon1);
+		$d = $a*$lat3 + $b*$lon3 + $c;
 		if ($d > -$approx && $d < $approx) return true;
 		else return false;
 	}
 	
 	public function array_merge_noappend() {
 		$output = array();
-		foreach(func_get_args() as $array) {
-			foreach($array as $key => $value) {
+		foreach (func_get_args() as $array) {
+			foreach ($array as $key => $value) {
 				$output[$key] = isset($output[$key]) ?
 				array_merge($output[$key], $value) : $value;
 			}
@@ -469,7 +469,7 @@ 
 		return $result;
 	}
 
-	public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1, $seconds = ''){
+	public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1, $seconds = '') {
 		global $globalMapRefresh;
 		if ($seconds == '') {
 			$distance = ($speed*0.514444*$globalMapRefresh*$archivespeed)/1000;
@@ -480,27 +480,27 @@ 
 		$latitude = deg2rad($latitude);
 		$longitude = deg2rad($longitude);
 		$bearing = deg2rad($heading); 
-		$latitude2 =  asin( (sin($latitude) * cos($distance/$r)) + (cos($latitude) * sin($distance/$r) * cos($bearing)) );
-		$longitude2 = $longitude + atan2( sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r)-(sin($latitude)*sin($latitude2)) );
-		return array('latitude' => number_format(rad2deg($latitude2),5,'.',''),'longitude' => number_format(rad2deg($longitude2),5,'.',''));
+		$latitude2 = asin((sin($latitude)*cos($distance/$r)) + (cos($latitude)*sin($distance/$r)*cos($bearing)));
+		$longitude2 = $longitude + atan2(sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r) - (sin($latitude)*sin($latitude2)));
+		return array('latitude' => number_format(rad2deg($latitude2), 5, '.', ''), 'longitude' => number_format(rad2deg($longitude2), 5, '.', ''));
 	}
 	
-	public function getCoordfromDistanceBearing($latitude,$longitude,$bearing,$distance) {
+	public function getCoordfromDistanceBearing($latitude, $longitude, $bearing, $distance) {
 		// distance in meter
 		$R = 6378.14;
-		$latitude1 = $latitude * (M_PI/180);
-		$longitude1 = $longitude * (M_PI/180);
-		$brng = $bearing * (M_PI/180);
+		$latitude1 = $latitude*(M_PI/180);
+		$longitude1 = $longitude*(M_PI/180);
+		$brng = $bearing*(M_PI/180);
 		$d = $distance;
 
 		$latitude2 = asin(sin($latitude1)*cos($d/$R) + cos($latitude1)*sin($d/$R)*cos($brng));
-		$longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1),cos($d/$R)-sin($latitude1)*sin($latitude2));
+		$longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1), cos($d/$R) - sin($latitude1)*sin($latitude2));
 
-		$latitude2 = $latitude2 * (180/M_PI);
-		$longitude2 = $longitude2 * (180/M_PI);
+		$latitude2 = $latitude2*(180/M_PI);
+		$longitude2 = $longitude2*(180/M_PI);
 
-		$flat = round ($latitude2,6);
-		$flong = round ($longitude2,6);
+		$flat = round($latitude2, 6);
+		$flong = round($longitude2, 6);
 /*
 		$dx = $distance*cos($bearing);
 		$dy = $distance*sin($bearing);
@@ -509,7 +509,7 @@ 
 		$flong = $longitude + $dlong;
 		$flat = $latitude + $dlat;
 */
-		return array('latitude' => $flat,'longitude' => $flong);
+		return array('latitude' => $flat, 'longitude' => $flong);
 	}
 
 	/**
@@ -523,14 +523,14 @@ 
 	 * @param integer $level GZIP compression level (default: 9)
 	 * @return string New filename (with .gz appended) if success, or false if operation fails
 	 */
-	public function gzCompressFile($source, $level = 9){ 
-		$dest = $source . '.gz'; 
-		$mode = 'wb' . $level; 
+	public function gzCompressFile($source, $level = 9) { 
+		$dest = $source.'.gz'; 
+		$mode = 'wb'.$level; 
 		$error = false; 
 		if ($fp_out = gzopen($dest, $mode)) { 
-			if ($fp_in = fopen($source,'rb')) { 
+			if ($fp_in = fopen($source, 'rb')) { 
 				while (!feof($fp_in)) 
-					gzwrite($fp_out, fread($fp_in, 1024 * 512)); 
+					gzwrite($fp_out, fread($fp_in, 1024*512)); 
 				fclose($fp_in); 
 			} else {
 				$error = true; 
@@ -546,7 +546,7 @@ 
 	} 
 	
 	public function remove_accents($string) {
-		if ( !preg_match('/[\x80-\xff]/', $string) ) return $string;
+		if (!preg_match('/[\x80-\xff]/', $string)) return $string;
 		$chars = array(
 		    // Decompositions for Latin-1 Supplement
 		    chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
@@ -603,7 +603,7 @@ 
 		    chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
 		    chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
 		    chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
-		    chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
+		    chr(196).chr(178) => 'IJ', chr(196).chr(179) => 'ij',
 		    chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
 		    chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
 		    chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
@@ -619,13 +619,13 @@ 
 		    chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
 		    chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
 		    chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
-		    chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
-		    chr(197).chr(148) => 'R',chr(197).chr(149) => 'r',
-		    chr(197).chr(150) => 'R',chr(197).chr(151) => 'r',
-		    chr(197).chr(152) => 'R',chr(197).chr(153) => 'r',
-		    chr(197).chr(154) => 'S',chr(197).chr(155) => 's',
-		    chr(197).chr(156) => 'S',chr(197).chr(157) => 's',
-		    chr(197).chr(158) => 'S',chr(197).chr(159) => 's',
+		    chr(197).chr(146) => 'OE', chr(197).chr(147) => 'oe',
+		    chr(197).chr(148) => 'R', chr(197).chr(149) => 'r',
+		    chr(197).chr(150) => 'R', chr(197).chr(151) => 'r',
+		    chr(197).chr(152) => 'R', chr(197).chr(153) => 'r',
+		    chr(197).chr(154) => 'S', chr(197).chr(155) => 's',
+		    chr(197).chr(156) => 'S', chr(197).chr(157) => 's',
+		    chr(197).chr(158) => 'S', chr(197).chr(159) => 's',
 		    chr(197).chr(160) => 'S', chr(197).chr(161) => 's',
 		    chr(197).chr(162) => 'T', chr(197).chr(163) => 't',
 		    chr(197).chr(164) => 'T', chr(197).chr(165) => 't',
@@ -659,7 +659,7 @@ 
 		for ($i = 0, $int = '', $concat_flag = true; $i < $length; $i++) {
 			if (is_numeric($string[$i]) && $concat_flag) {
 				$int .= $string[$i];
-			} elseif(!$concat && $concat_flag && strlen($int) > 0) {
+			} elseif (!$concat && $concat_flag && strlen($int) > 0) {
 				$concat_flag = false;
 			}
 		}
@@ -705,7 +705,7 @@ 
 			$slice = array_slice($arr, $offset + 1, $length);
 			return implode("", $slice);
 		} else {
-			return mb_substr($string,$offset,$length,'UTF-8');
+			return mb_substr($string, $offset, $length, 'UTF-8');
 		}
 	}
 
@@ -715,14 +715,14 @@ 
 		//NOTE: use a trailing slash for folders!!!
 		//see http://bugs.php.net/bug.php?id=27609
 		//see http://bugs.php.net/bug.php?id=30931
-		if ($path{strlen($path)-1}=='/') // recursively return a temporary file path
+		if ($path{strlen($path) - 1} == '/') // recursively return a temporary file path
 			return $this->is__writable($path.uniqid(mt_rand()).'.tmp');
 		else if (is_dir($path))
 			return $this->is__writable($path.'/'.uniqid(mt_rand()).'.tmp');
 		// check tmp file for read/write capabilities
 		$rm = file_exists($path);
 		$f = @fopen($path, 'a');
-		if ($f===false)
+		if ($f === false)
 			return false;
 		fclose($f);
 		if (!$rm)

header.php

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

require/class.Image.php

Spacing +114 added lines, -114 removed lines

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

require/class.METAR.php

Spacing +48 added lines, -48 removed lines

@@ -68,7 +68,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -87,7 +87,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -100,9 +100,9 @@ 
 	public function parse($data) {
 		//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
 		$codes = implode('|', array_keys($this->texts));
-		$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
+		$regWeather = '#^(\+|\-|VC)?('.$codes.')('.$codes.')?$#';
 		//$pieces = explode(' ',$data);
-		$pieces = preg_split('/\s/',$data);
+		$pieces = preg_split('/\s/', $data);
 		$pos = 0;
 		if ($pieces[0] == 'METAR') $pos++;
 		elseif ($pieces[0] == 'SPECI') $pos++;
@@ -112,25 +112,25 @@ 
 		$result['location'] = $pieces[$pos];
 		$pos++;
 		if (!isset($pieces[$pos])) return $result;
-		$result['dayofmonth'] = substr($pieces[$pos],0,2);
-		$result['time'] = substr($pieces[$pos],2,4);
+		$result['dayofmonth'] = substr($pieces[$pos], 0, 2);
+		$result['time'] = substr($pieces[$pos], 2, 4);
 		$c = count($pieces);
-		for($pos++; $pos < $c; $pos++) {
+		for ($pos++; $pos < $c; $pos++) {
 			$piece = $pieces[$pos];
 			if ($piece == 'RMK') break;
 			if ($piece == 'AUTO') $result['auto'] = true;
 			if ($piece == 'COR') $result['correction'] = true;
 			// Wind Speed
 			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
-				$result['wind']['direction'] = (float)$matches[1];
+				$result['wind']['direction'] = (float) $matches[1];
 				$result['wind']['unit'] = $matches[4];
-				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
-				$result['wind']['gust'] = (float)$matches[3];
+				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float) $matches[2])*0.51444444444, 2);
+				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float) $matches[2])*1000, 2);
+				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float) $matches[2]), 2);
+				$result['wind']['gust'] = (float) $matches[3];
 				$result['wind']['unit'] = $matches[4];
-				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
-				$result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0;
+				$result['wind']['min_variation'] = array_key_exists(5, $matches) ? $matches[5] : 0;
+				$result['wind']['max_variation'] = array_key_exists(6, $matches) ? $matches[6] : 0;
 			}
 
 /*    			if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) {
@@ -151,14 +151,14 @@ 
 
 			// Temperature
 			if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
-				$temp = (float)$matches[1];
+				$temp = (float) $matches[1];
 				if ($matches[1]{0} == 'M') {
-					$temp = ((float)substr($matches[1], 1)) * -1;
+					$temp = ((float) substr($matches[1], 1))*-1;
 				}
 				$result['temperature'] = $temp;
-				$dew = (float)$matches[2];
+				$dew = (float) $matches[2];
 				if ($matches[2]{0} == 'M') {
-					$dew = ((float)substr($matches[2], 1)) * -1;
+					$dew = ((float) substr($matches[2], 1))*-1;
 				}
 				$result['dew'] = $dew;
 			}
@@ -170,7 +170,7 @@ 
 					$result['QNH'] = $matches[2];
 				} else {
 					// inHg
-					$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
+					$result['QNH'] = round(($matches[2]/100)*33.86389, 2);
 				}
 				/*
     				$result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100);
@@ -191,12 +191,12 @@ 
     			// Visibility
 			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
 				if (isset($matches[3]) && strlen($matches[3]) > 0) {
-					$result['visibility'] = (float)$matches[3] * 1609.34;
+					$result['visibility'] = (float) $matches[3]*1609.34;
 				} else {
 					if ($matches[1] == '9999') {
 						$result['visibility'] = '> 10000';
 					} else {
-						$result['visibility'] = (float)$matches[1];
+						$result['visibility'] = (float) $matches[1];
 					}
 				}
 				if (preg_match('#^CAVOK$#', $piece, $matches)) {
@@ -218,7 +218,7 @@ 
 				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
 				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
 				$cloud['type_code'] = $type;
-				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
+				$cloud['level'] = round(((float) $matches[2])*100*0.3048);
 				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
 				$result['cloud'][] = $cloud;
 			}
@@ -228,8 +228,8 @@ 
 				$rvr['runway'] = $matches[1];
 				$rvr['assessment'] = $matches[2];
 				$rvr['rvr'] = $matches[3];
-				$rvr['rvr_max'] = array_key_exists(4,$matches) ? $matches[4] : 0;
-				$rvr['unit'] = array_key_exists(5,$matches) ? $matches[5] : '';
+				$rvr['rvr_max'] = array_key_exists(4, $matches) ? $matches[4] : 0;
+				$rvr['unit'] = array_key_exists(5, $matches) ? $matches[5] : '';
 				$result['RVR'] = $rvr;
 			}
 			//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
@@ -242,12 +242,12 @@ 
 				$result['RVR']['friction'] = $matches[5];
 			}
 			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
-				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+				if (isset($matches[5])) $range = array('exact' => (float) $matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+				else $range = array('exact' => (float) $matches[2], 'unit' => 'M');
 				if (isset($matches[3])) {
 					$range = Array(
-					    'from' => (float)$matches[2],
-					    'to'   => (float)$matches[4],
+					    'from' => (float) $matches[2],
+					    'to'   => (float) $matches[4],
 					    'unit' => $matches[5] ? 'FT' : 'M'
 					);
 				}
@@ -300,7 +300,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -316,19 +316,19 @@ 
 	 * @param String $metar METAR text
 	 * @param String $date date of the METAR
 	*/
-	public function addMETAR($location,$metar,$date) {
+	public function addMETAR($location, $metar, $date) {
 		global $globalDBdriver;
-		$date = date('Y-m-d H:i:s',strtotime($date));
+		$date = date('Y-m-d H:i:s', strtotime($date));
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO metar (metar_location,metar_date,metar) VALUES (:location,:date,:metar) ON DUPLICATE KEY UPDATE metar_date = :date, metar = :metar";
 		} else {
 			$query = "UPDATE metar SET metar_date = :date, metar = metar WHERE metar_location = :location;INSERT INTO metar (metar_location,metar_date,metar) SELECT :location,:date,:metar WHERE NOT EXISTS (SELECT 1 FROM metar WHERE metar_location = :location);";
 		}
-		$query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar));
+		$query_values = array(':location' => $location, ':date' => $date, ':metar' => utf8_encode($metar));
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -343,7 +343,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -356,7 +356,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -370,27 +370,27 @@ 
 		date_default_timezone_set("UTC");
 		$Common = new Common();
 		if (isset($globalIVAO) && $globalIVAO) {
-			$Common->download('http://wx.ivao.aero/metar.php',dirname(__FILE__).'/../install/tmp/ivaometar.txt');
-			$handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt',"r");
+			$Common->download('http://wx.ivao.aero/metar.php', dirname(__FILE__).'/../install/tmp/ivaometar.txt');
+			$handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt', "r");
 		} else {
-			$Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT',dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT');
-			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r");
+			$Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT', dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT');
+			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT', "r");
 		}
 		if ($handle) {
 			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
 			$date = '';
 			if ($globalTransaction) $this->db->beginTransaction();
-			while(($line = fgets($handle,4096)) !== false) {
-				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+			while (($line = fgets($handle, 4096)) !== false) {
+				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) {
 					$date = $line;
 				} elseif ($line != '') {
 					if ($date == '') $date = date('Y/m/d H:m');
 					$pos = 0;
-					$pieces = preg_split('/\s/',$line);
+					$pieces = preg_split('/\s/', $line);
 					if ($pieces[0] == 'METAR') $pos++;
 					if (strlen($pieces[$pos]) != 4) $pos++;
 					$location = $pieces[$pos];
-					echo $this->addMETAR($location,$line,$date);
+					echo $this->addMETAR($location, $line, $date);
 				}
 			}
 			fclose($handle);
@@ -409,22 +409,22 @@ 
 		if ($globalMETARurl == '') return array();
 		date_default_timezone_set("UTC");
 		$Common = new Common();
-		$url = str_replace('{icao}',$icao,$globalMETARurl);
+		$url = str_replace('{icao}', $icao, $globalMETARurl);
 		$cycle = $Common->getData($url);
 		$date = '';
-		foreach(explode("\n",$cycle) as $line) {
-			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+		foreach (explode("\n", $cycle) as $line) {
+			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) {
 				$date = $line;
 			} 
 			if ($line != '') {
 				if ($date == '') $date = date('Y/m/d H:m');
 				$pos = 0;
-				$pieces = preg_split('/\s/',$line);
+				$pieces = preg_split('/\s/', $line);
 				if ($pieces[0] == 'METAR') $pos++;
 				if (strlen($pieces[$pos]) != 4) $pos++;
 				$location = $pieces[$pos];
 				if (strlen($location == 4)) {
-					$this->addMETAR($location,$line,$date);
+					$this->addMETAR($location, $line, $date);
 					return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
 				} else return array();
 			}

require/class.TrackerImport.php

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 > 30 && 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 > 30 && 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();
 			
 			

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.APRS.php

Spacing +157 added lines, -158 removed lines

@@ -175,8 +175,7 @@ 
 		'\~' => 'TNC Stream SW');
 
 	private function urshift($n, $s) {
-		return ($n >= 0) ? ($n >> $s) :
-		    (($n & 0x7fffffff) >> $s) | 
+		return ($n >= 0) ? ($n >> $s) : (($n&0x7fffffff) >> $s)| 
 		    (0x40000000 >> ($s - 1));
 	}
 
@@ -192,7 +191,7 @@ 
 		$input_len = strlen($input);
 		
 		/* Find the end of header checking for NULL bytes while doing it. */
-		$splitpos = strpos($input,':');
+		$splitpos = strpos($input, ':');
 		
 		/* Check that end was found and body has at least one byte. */
 		if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
@@ -202,14 +201,14 @@ 
 		
 		if ($debug) echo 'input : '.$input."\n";
 		/* Save header and body. */
-		$body = substr($input,$splitpos+1,$input_len);
+		$body = substr($input, $splitpos + 1, $input_len);
 		$body_len = strlen($body);
-		$header = substr($input,0,$splitpos);
+		$header = substr($input, 0, $splitpos);
 		if ($debug) echo 'header : '.$header."\n";
 		
 		/* Parse source, target and path. */
 		//FLRDF0A52>APRS,qAS,LSTB
-		if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
+		if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/', $header, $matches)) {
 			$ident = $matches[1];
 			$all_elements = $matches[2];
 			if ($ident == 'AIRCRAFT') {
@@ -226,13 +225,13 @@ 
 			if ($debug) 'No ident'."\n";
 			return false;
 		}
-		$elements = explode(',',$all_elements);
+		$elements = explode(',', $all_elements);
 		$source = end($elements);
 		$result['source'] = $source;
 		foreach ($elements as $element) {
-			if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
+			if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/', $element)) {
 			//if ($element == 'TCPIP*') return false;
-			} elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
+			} elseif (!preg_match('/^([0-9A-F]{32})$/', $element)) {
 				if ($debug) echo 'element : '.$element."\n";
 				return false;
 			}
@@ -245,14 +244,14 @@ 
 			*/
 		}
 		
-		$type = substr($body,0,1);
+		$type = substr($body, 0, 1);
 		if ($debug) echo 'type : '.$type."\n";
 		if ($type == ';') {
 			if (isset($result['source_type']) && $result['source_type'] == 'modes') {
-				$result['address'] = trim(substr($body,1,9));
+				$result['address'] = trim(substr($body, 1, 9));
 			} elseif (isset($result['source_type']) && $result['source_type'] == 'ais') {
-				$result['mmsi'] = trim(substr($body,1,9));
-			} else $result['ident'] = trim(substr($body,1,9));
+				$result['mmsi'] = trim(substr($body, 1, 9));
+			} else $result['ident'] = trim(substr($body, 1, 9));
 		} elseif ($type == ',') {
 			// Invalid data or test data
 			return false;
@@ -260,20 +259,20 @@ 
 		
 		// Check for Timestamp
 		$find = false;
-		$body_parse = substr($body,1);
-		if (preg_match('/^;(.){9}\*/',$body,$matches)) {
-			$body_parse = substr($body_parse,10);
+		$body_parse = substr($body, 1);
+		if (preg_match('/^;(.){9}\*/', $body, $matches)) {
+			$body_parse = substr($body_parse, 10);
 			$find = true;
 		}
-		if (preg_match('/^`(.*)\//',$body,$matches)) {
-			$body_parse = substr($body_parse,strlen($matches[1])-1);
+		if (preg_match('/^`(.*)\//', $body, $matches)) {
+			$body_parse = substr($body_parse, strlen($matches[1]) - 1);
 			$find = true;
 		}
-		if (preg_match("/^'(.*)\//",$body,$matches)) {
-			$body_parse = substr($body_parse,strlen($matches[1])-1);
+		if (preg_match("/^'(.*)\//", $body, $matches)) {
+			$body_parse = substr($body_parse, strlen($matches[1]) - 1);
 			$find = true;
 		}
-		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
+		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/', $body_parse, $matches)) {
 			$find = true;
 			$timestamp = $matches[0];
 			if ($matches[4] == 'h') {
@@ -286,17 +285,17 @@ 
 				// This work or not ?
 				$timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]);
 			}
-			$body_parse = substr($body_parse,7);
+			$body_parse = substr($body_parse, 7);
 			$result['timestamp'] = $timestamp;
 		}
-		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) {
+		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $body_parse, $matches)) {
 			$find = true;
 			$timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
-			$body_parse = substr($body_parse,8);
+			$body_parse = substr($body_parse, 8);
 			$result['timestamp'] = $timestamp;
 		}
 		//if (strlen($body_parse) > 19) {
-		if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
+		if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/', $body_parse, $matches)) {
 			$find = true;
 			// 4658.70N/00707.78Ez
 			$sind = strtoupper($matches[3]);
@@ -318,11 +317,11 @@ 
 			    */
 			$latitude = $lat + floatval($lat_min)/60;
 			$longitude = $lon + floatval($lon_min)/60;
-			if ($sind == 'S') $latitude = 0-$latitude;
-			if ($wind == 'W') $longitude = 0-$longitude;
+			if ($sind == 'S') $latitude = 0 - $latitude;
+			if ($wind == 'W') $longitude = 0 - $longitude;
 			$result['latitude'] = $latitude;
 			$result['longitude'] = $longitude;
-			$body_parse = substr($body_parse,18);
+			$body_parse = substr($body_parse, 18);
 			$body_parse_len = strlen($body_parse);
 		}
 		$body_parse_len = strlen($body_parse);
@@ -349,22 +348,22 @@ 
 				//'
 				//if ($type != ';' && $type != '>') {
 				if ($type != '') {
-					$body_parse = substr($body_parse,1);
+					$body_parse = substr($body_parse, 1);
 					$body_parse_len = strlen($body_parse);
 					$result['symbol_code'] = $symbol_code;
 					if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
 					if ($symbol_code != '_') {
 					}
 					if ($body_parse_len >= 7) {
-						if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
-							$course = substr($body_parse,0,3);
+						if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/', $body_parse)) {
+							$course = substr($body_parse, 0, 3);
 							$tmp_s = intval($course);
 							if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
-							$speed = substr($body_parse,4,3);
+							$speed = substr($body_parse, 4, 3);
 							if ($speed != '...') {
 								$result['speed'] = intval($speed);
 							}
-							$body_parse = substr($body_parse,7);
+							$body_parse = substr($body_parse, 7);
 						}
 						// Check PHGR, PHG, RNG
 					} 
@@ -374,11 +373,11 @@ 
 					}
 					*/
 					if (strlen($body_parse) > 0) {
-						if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
+						if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/', $body_parse, $matches)) {
 							$altitude = intval($matches[1]);
 							$result['altitude'] = $altitude;
 							//$body_parse = trim(substr($body_parse,strlen($matches[0])));
-							$body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
+							$body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/', '', $body_parse));
 						}
 					}
 					// Telemetry
@@ -388,58 +387,58 @@ 
 					}
 					*/
 					// DAO
-					if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
+					if (preg_match('/^!([0-9A-Z]{3})/', $body_parse, $matches)) {
 						$dao = $matches[1];
-						if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
+						if (preg_match('/^([A-Z])([0-9]{2})/', $dao)) {
 							$dao_split = str_split($dao);
-							$lat_off = (($dao_split[1])-48.0)*0.001/60.0;
-							$lon_off = (($dao_split[2])-48.0)*0.001/60.0;
+							$lat_off = (($dao_split[1]) - 48.0)*0.001/60.0;
+							$lon_off = (($dao_split[2]) - 48.0)*0.001/60.0;
 							if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
 							else $result['latitude'] += $lat_off;
 							if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
 							else $result['longitude'] += $lon_off;
 						}
-						$body_parse = substr($body_parse,6);
+						$body_parse = substr($body_parse, 6);
 					}
-					if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) {
-						$result['ident'] = str_replace('_',' ',$matches[1]);
+					if (preg_match('/CS=([0-9A-Z_]*)/', $body_parse, $matches)) {
+						$result['ident'] = str_replace('_', ' ', $matches[1]);
 					}
-					if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
+					if (preg_match('/SQ=([0-9]{4})/', $body_parse, $matches)) {
 						$result['squawk'] = $matches[1];
 					}
-					if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
+					if (preg_match('/AI=([0-9A-Z]{4})/', $body_parse, $matches)) {
 						$result['aircraft_icao'] = $matches[1];
 					}
-					if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) {
+					if (preg_match('/VR=([0-9]*)/', $body_parse, $matches)) {
 						$result['verticalrate'] = $matches[1];
 					}
-					if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
+					if (preg_match('/TI=([0-9]*)/', $body_parse, $matches)) {
 						$result['typeid'] = $matches[1];
 					}
-					if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
+					if (preg_match('/SI=([0-9]*)/', $body_parse, $matches)) {
 						$result['statusid'] = $matches[1];
 					}
-					if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
+					if (preg_match('/IMO=([0-9]{7})/', $body_parse, $matches)) {
 						$result['imo'] = $matches[1];
 					}
-					if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
+					if (preg_match('/AD=([0-9]*)/', $body_parse, $matches)) {
 						$result['arrival_date'] = $matches[1];
 					}
-					if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) {
-						$result['arrival_code'] = str_replace('_',' ',$matches[1]);
+					if (preg_match('/AC=([0-9A-Z_]*)/', $body_parse, $matches)) {
+						$result['arrival_code'] = str_replace('_', ' ', $matches[1]);
 					}
 					// OGN comment
 					//if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
-					if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
+					if (preg_match('/^id([0-9A-F]{8})/', $body_parse, $matches)) {
 						$id = $matches[1];
 						//$mode = substr($id,0,2);
-						$address = substr($id,2);
-						$addressType = (intval(substr($id,0,2),16))&3;
+						$address = substr($id, 2);
+						$addressType = (intval(substr($id, 0, 2), 16))&3;
 						if ($addressType == 0) $result['addresstype'] = "RANDOM";
 						elseif ($addressType == 1) $result['addresstype'] = "ICAO";
 						elseif ($addressType == 2) $result['addresstype'] = "FLARM";
 						elseif ($addressType == 3) $result['addresstype'] = "OGN";
-						$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
+						$aircraftType = $this->urshift(((intval(substr($id, 0, 2), 16))&0b1111100), 2);
 						$result['aircrafttype_code'] = $aircraftType;
 						if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
 						elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
@@ -456,110 +455,110 @@ 
 						elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
 						elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
 						elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
-						$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
+						$stealth = (intval(substr($id, 0, 2), 16)&0b10000000) != 0;
 						$result['stealth'] = $stealth;
 						$result['address'] = $address;
 					}
 					//Comment
 					$result['comment'] = trim($body_parse);
 					// parse weather
-					if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+					if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
 						$result['wind_dir'] = intval($matches[1]);
-						$result['wind_speed'] = round(intval($matches[2])*1.60934,1);
-						$result['wind_gust'] = round(intval($matches[3])*1.60934,1);
-						$result['temp'] = round(5/9*((intval($matches[4]))-32),1);
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
-					} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+						$result['wind_speed'] = round(intval($matches[2])*1.60934, 1);
+						$result['wind_gust'] = round(intval($matches[3])*1.60934, 1);
+						$result['temp'] = round(5/9*((intval($matches[4])) - 32), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
+					} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
 						$result['wind_dir'] = intval($matches[1]);
-						$result['wind_speed'] = round($matches[2]*1.60934,1);
-						$result['wind_gust'] = round($matches[3]*1.60934,1);
-						$result['temp'] = round(5/9*(($matches[4])-32),1);
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
-					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+						$result['wind_speed'] = round($matches[2]*1.60934, 1);
+						$result['wind_gust'] = round($matches[3]*1.60934, 1);
+						$result['temp'] = round(5/9*(($matches[4]) - 32), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
+					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
 						$result['wind_dir'] = intval($matches[1]);
-						$result['wind_speed'] = round($matches[2]*1.60934,1);
-						$result['wind_gust'] = round($matches[3]*1.60934,1);
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
-					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
+						$result['wind_speed'] = round($matches[2]*1.60934, 1);
+						$result['wind_gust'] = round($matches[3]*1.60934, 1);
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
+					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/', $body_parse, $matches)) {
 						$result['wind_dir'] = intval($matches[1]);
-						$result['wind_speed'] = round($matches[2]*1.60934,1);
-						$result['wind_gust'] = round($matches[3]*1.60934,1);
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
+						$result['wind_speed'] = round($matches[2]*1.60934, 1);
+						$result['wind_gust'] = round($matches[3]*1.60934, 1);
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
 					}
 					// temperature
 					//g012t088r000p000P000h38b10110
 					//g011t086r000p000P000h29b10198
-					if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
+					if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
+						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1, 1);
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
+						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1, 1);
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
+						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
+						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1, 1);
 						if ($matches[7] != '...') $result['humidity'] = intval($matches[7]);
-						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
+						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1, 1);
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
 						if ($matches[5] != '...') $result['humidity'] = intval($matches[5]);
-						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
 						if ($matches[2] != '...') $result['humidity'] = intval($matches[3]);
-						if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
 						if ($matches[4] != '...') $result['humidity'] = intval($matches[4]);
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
+						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
 					}
 					$result['comment'] = trim($body_parse);
 				}
 			} else $result['comment'] = trim($body_parse);
 		}
-		if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
-		if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
+		if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'], 4);
+		if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'], 4);
 		if ($debug) print_r($result);
 		return $result;
 	}
@@ -568,34 +567,34 @@ 
 	 * Connect to APRS server
 	*/
 	public function connect() {
-		global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport;
+		global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass, $globalName, $globalServerAPRShost, $globalServerAPRSport;
 		$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($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid;
-		else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
+		else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
 		if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass;
 		else $aprs_pass = '-1';
-		$aprs_filter  = '';
+		$aprs_filter = '';
 		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
 		$Common = new Common();
-		$s = $Common->create_socket($globalServerAPRShost,$globalServerAPRSport,$errno,$errstr);
+		$s = $Common->create_socket($globalServerAPRShost, $globalServerAPRSport, $errno, $errstr);
 		if ($s !== false) {
 			echo 'Connected to APRS server! '."\n";
 			$authstart = time();
 			$this->socket = $s;
-			$send = socket_send( $this->socket  , $aprs_login , strlen($aprs_login) , 0 );
-			socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE,1);
-			while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) {
+			$send = socket_send($this->socket, $aprs_login, strlen($aprs_login), 0);
+			socket_set_option($this->socket, SOL_SOCKET, SO_KEEPALIVE, 1);
+			while ($msgin = socket_read($this->socket, 1000, PHP_NORMAL_READ)) {
 				if (strpos($msgin, "$aprs_ssid verified") !== FALSE) {
 					echo 'APRS user verified !'."\n";
 					$this->connected = true;
 					return true;
 					break;
 				}
-				if (time()-$authstart > 5) {
+				if (time() - $authstart > 5) {
 					echo 'APRS timeout'."\n";
 					break;
 				}
@@ -617,7 +616,7 @@ 
 	public function send($data) {
 		global $globalDebug;
 		if ($this->connected === false) $this->connect();
-		$send = socket_send( $this->socket  , $data , strlen($data),0);
+		$send = socket_send($this->socket, $data, strlen($data), 0);
 		if ($send === FALSE) {
 			if ($globalDebug) echo 'Reconnect...';
 			socket_close($this->socket);
@@ -627,17 +626,17 @@ 
 }
 
 class APRSSpotter extends APRS {
-	public function addLiveSpotterData($id,$ident,$aircraft_icao,$departure_airport,$arrival_airport,$latitude,$longitude,$waypoints,$altitude,$altitude_real,$heading,$speed,$datetime,$departure_airport_time,$arrival_airport_time,$squawk,$route_stop,$hex,$putinarchive,$registration,$pilot_id,$pilot_name, $verticalrate, $noarchive, $ground,$format_source,$source_name,$over_country) {
+	public function addLiveSpotterData($id, $ident, $aircraft_icao, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $altitude_real, $heading, $speed, $datetime, $departure_airport_time, $arrival_airport_time, $squawk, $route_stop, $hex, $putinarchive, $registration, $pilot_id, $pilot_name, $verticalrate, $noarchive, $ground, $format_source, $source_name, $over_country) {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
 		if ($latitude != '' && $longitude != '') {
 			$lat = $latitude;
 			$long = $longitude;
-			$latitude = $Common->convertDM($latitude,'latitude');
-			$longitude = $Common->convertDM($longitude,'longitude');
-			$coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW'];
-			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000));
-			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000));
+			$latitude = $Common->convertDM($latitude, 'latitude');
+			$longitude = $Common->convertDM($longitude, 'longitude');
+			$coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW'];
+			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000));
+			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000));
 			$w = $w1.$w2;
 			//$w = '00';
 			$custom = '';
@@ -664,26 +663,26 @@ 
 			$geoid= round($GeoidClass->get($lat,$long)*3.28084,2);
 			$altitude_real = round($altitude_real + $geoid);
 			*/
-			$this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.'   *'.date('His',strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude_real,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
+			$this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.'   *'.date('His', strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude_real, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
 		}
 	}
 }
 class APRSMarine extends APRS {
-	public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed,$datetime, $putinarchive,$mmsi,$type,$typeid,$imo,$callsign,$arrival_code,$arrival_date,$status,$statusid,$noarchive,$format_source,$source_name,$over_country) {
+	public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed, $datetime, $putinarchive, $mmsi, $type, $typeid, $imo, $callsign, $arrival_code, $arrival_date, $status, $statusid, $noarchive, $format_source, $source_name, $over_country) {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
 		if ($latitude != '' && $longitude != '') {
-			$latitude = $Common->convertDM($latitude,'latitude');
-			$longitude = $Common->convertDM($longitude,'longitude');
-			$coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW'];
-			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000));
-			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000));
+			$latitude = $Common->convertDM($latitude, 'latitude');
+			$longitude = $Common->convertDM($longitude, 'longitude');
+			$coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW'];
+			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000));
+			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000));
 			$w = $w1.$w2;
 			//$w = '00';
 			$custom = '';
 			if ($ident != '') {
 				if ($custom != '') $custom .= '/';
-				$custom .= 'CS='.str_replace(' ','_',$ident);
+				$custom .= 'CS='.str_replace(' ', '_', $ident);
 			}
 			if ($typeid != '') {
 				if ($custom != '') $custom .= '/';
@@ -703,11 +702,11 @@ 
 			}
 			if ($arrival_code != '') {
 				if ($custom != '') $custom .= '/';
-				$custom .= 'AC='.str_replace(' ','_',$arrival_code);
+				$custom .= 'AC='.str_replace(' ', '_', $arrival_code);
 			}
 			if ($custom != '') $custom = ' '.$custom;
 			$altitude = 0;
-			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
+			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His', strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
 		}
 	}
 }

require/class.ATC.php

Spacing +31 added lines, -31 removed lines

@@ -26,22 +26,22 @@ 
 	* @param Array $filter the filter
 	* @return Array the SQL part
 	*/
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
-				foreach($globalStatsFilters[$globalFilterName] as $source) {
+				foreach ($globalStatsFilters[$globalFilterName] as $source) {
 					if (isset($source['source'])) $filter['source'][] = $source['source'];
 				}
 			} else {
 				$filter = $globalStatsFilters[$globalFilterName];
 			}
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
@@ -60,7 +60,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -73,13 +73,13 @@ 
 	 * @return Array Return ATC
 	*/
 	public function getById($id) {
-		$filter_query = $this->getFilter(array(),true,true);
+		$filter_query = $this->getFilter(array(), true, true);
 		$query = "SELECT * FROM atc".$filter_query." atc_id = :id";
 		$query_values = array(':id' => $id);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -92,19 +92,19 @@ 
 	 * @param String $format_source Format source
 	 * @return Array Return ATC
 	*/
-	public function getByIdent($ident,$format_source = '') {
-		$filter_query = $this->getFilter(array(),true,true);
+	public function getByIdent($ident, $format_source = '') {
+		$filter_query = $this->getFilter(array(), true, true);
 		if ($format_source == '') {
 			$query = "SELECT * FROM atc".$filter_query." ident = :ident";
 			$query_values = array(':ident' => $ident);
 		} else {
 			$query = "SELECT * FROM atc".$filter_query." ident = :ident AND format_source = :format_source";
-			$query_values = array(':ident' => $ident,':format_source' => $format_source);
+			$query_values = array(':ident' => $ident, ':format_source' => $format_source);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -126,18 +126,18 @@ 
 	 * @param String $format_source Format source
 	 * @param String $source_name Source name
 	*/
-	public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
-		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
-		$info = str_replace('^','<br />',$info);
-		$info = str_replace('&amp;sect;','',$info);
-		$info = str_replace('"','',$info);
+	public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') {
+		$info = preg_replace('/[^(\x20-\x7F)]*/', '', $info);
+		$info = str_replace('^', '<br />', $info);
+		$info = str_replace('&amp;sect;', '', $info);
+		$info = str_replace('"', '', $info);
 		if ($type == '') $type = NULL;
 		$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
-		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
+		$query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -157,18 +157,18 @@ 
 	 * @param String $format_source Format source
 	 * @param String $source_name Source name
 	*/
-	public function update($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
-		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
-		$info = str_replace('^','<br />',$info);
-		$info = str_replace('&amp;sect;','',$info);
-		$info = str_replace('"','',$info);
+	public function update($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') {
+		$info = preg_replace('/[^(\x20-\x7F)]*/', '', $info);
+		$info = str_replace('^', '<br />', $info);
+		$info = str_replace('&amp;sect;', '', $info);
+		$info = str_replace('"', '', $info);
 		if ($type == '') $type = NULL;
 		$query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name";
-		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
+		$query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -183,7 +183,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -193,13 +193,13 @@ 
 	 * @param String $ident Flight ident
 	 * @param String $format_source Format source
 	*/
-	public function deleteByIdent($ident,$format_source) {
+	public function deleteByIdent($ident, $format_source) {
 		$query = "DELETE FROM atc WHERE ident = :ident AND format_source = :format_source";
-		$query_values = array(':ident' => $ident,':format_source' => $format_source);
+		$query_values = array(':ident' => $ident, ':format_source' => $format_source);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -213,7 +213,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -231,7 +231,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 		return "success";