Ysurac / FlightAirMap

require/class.Elevation.php

Spacing +28 added lines, -28 removed lines

@@ -41,7 +41,7 @@ 
 			default:
 				throw new \Exception("bad resolution can be only one of 1,3");
 		}
-		register_shutdown_function(function () {
+		register_shutdown_function(function() {
 			$this->closeAllFiles();
 		});
 	}
@@ -55,10 +55,10 @@ 
 
 	private function getElevationAtPosition($fileName, $row, $column) {
 		if (!array_key_exists($fileName, $this->openedFiles)) {
-			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
+			if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
 				throw new \Exception("File '{$fileName}' not exists.");
 			}
-			$file = fopen($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName, "r");
+			$file = fopen($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName, "r");
 			if ($file === false) {
 				throw new \Exception("Cant open file '{$fileName}' for reading.");
 			}
@@ -72,7 +72,7 @@ 
 			throw new \Exception("Not implemented yet");
 		}
 		$aRow     = $this->measPerDeg - $row;
-		$position = ($this->measPerDeg * ($aRow - 1)) + $column;
+		$position = ($this->measPerDeg*($aRow - 1)) + $column;
 		$position *= 2;
 		fseek($file, $position);
 		$short  = fread($file, 2);
@@ -100,8 +100,8 @@ 
 		$latSec = $this->getSec($lat);
 		$lonSec = $this->getSec($lon);
 
-		$Xn = round($latSec / $this->resolution, 3);
-		$Yn = round($lonSec / $this->resolution, 3);
+		$Xn = round($latSec/$this->resolution, 3);
+		$Yn = round($lonSec/$this->resolution, 3);
 
 		$a1 = round($Xn);
 		$a2 = round($Yn);
@@ -133,55 +133,55 @@ 
 		$b3 = $this->getElevationAtPosition($fName, $b1, $b2);
 		$c3 = $this->getElevationAtPosition($fName, $c1, $c2);
 
-		$n1 = ($c2 - $a2) * ($b3 - $a3) - ($c3 - $a3) * ($b2 - $a2);
-		$n2 = ($c3 - $a3) * ($b1 - $a1) - ($c1 - $a1) * ($b3 - $a3);
-		$n3 = ($c1 - $a1) * ($b2 - $a2) - ($c2 - $a2) * ($b1 - $a1);
+		$n1 = ($c2 - $a2)*($b3 - $a3) - ($c3 - $a3)*($b2 - $a2);
+		$n2 = ($c3 - $a3)*($b1 - $a1) - ($c1 - $a1)*($b3 - $a3);
+		$n3 = ($c1 - $a1)*($b2 - $a2) - ($c2 - $a2)*($b1 - $a1);
 
-		$d  = -$n1 * $a1 - $n2 * $a2 - $n3 * $a3;
-		$zN = (-$n1 * $Xn - $n2 * $Yn - $d) / $n3;
+		$d  = -$n1*$a1 - $n2*$a2 - $n3*$a3;
+		$zN = (-$n1*$Xn - $n2*$Yn - $d)/$n3;
 
 		return $zN;
 	}
 
 	private function getDeg($deg, $numPrefix) {
 		$deg = abs($deg);
-		$d   = floor($deg);     // round degrees
+		$d   = floor($deg); // round degrees
 		if ($numPrefix >= 3) {
 			if ($d < 100) {
-				$d = '0' . $d;
+				$d = '0'.$d;
 			}
 		} // pad with leading zeros
 		if ($d < 10) {
-			$d = '0' . $d;
+			$d = '0'.$d;
 		}
 		return $d;
 	}
 
 	private function getSec($deg) {
 		$deg = abs($deg);
-		$sec = round($deg * 3600, 4);
-		$m   = fmod(floor($sec / 60), 60);
+		$sec = round($deg*3600, 4);
+		$m   = fmod(floor($sec/60), 60);
 		$s   = round(fmod($sec, 60), 4);
-		return ($m * 60) + $s;
+		return ($m*60) + $s;
 	}
 
-	public function download($lat,$lon, $debug = false) {
+	public function download($lat, $lon, $debug = false) {
 		$N      = $this->getDeg($lat, 2);
 		$E      = $this->getDeg($lon, 3);
-		$fileName  = "N{$N}E{$E}.hgt";
-		if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
+		$fileName = "N{$N}E{$E}.hgt";
+		if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
 			$Common = new Common();
 			if ($debug) echo 'Downloading '.$fileName.'.gz ...';
-			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
-			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz')) {
+			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
+			if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz')) {
 				if ($debug) echo "File '{$fileName}.gz' not exists.";
 				return false;
 			}
 			if ($debug) echo 'Done'."\n";
 			if ($debug) echo 'Decompress '.$fileName.' ....';
-			$Common->gunzip($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName);
+			$Common->gunzip($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName);
 			if ($debug) echo 'Done'."\n";
-			unlink($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
+			unlink($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
 		}
 		return true;
 	}
@@ -194,11 +194,11 @@ 
 		try {
 			$sth = $db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
-			$this->download($data['latitude'],$data['longitude'],true);
+			$this->download($data['latitude'], $data['longitude'], true);
 		}
 		$db = $Connection->db;
 		$query = 'SELECT latitude, longitude FROM tracker_output WHERE latitude <> 0 AND longitude <> 0 ORDER BY date DESC LIMIT 100';
@@ -206,11 +206,11 @@ 
 		try {
 			$sth = $db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
-			$this->download($data['latitude'],$data['longitude'],true);
+			$this->download($data['latitude'], $data['longitude'], true);
 		}
 	}
 }

require/class.Common.php

Spacing +83 added lines, -83 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 = '') {
+	public function getData($url, $type = 'get', $data = '', $headers = '', $cookie = '', $referer = '', $timeout = '', $useragent = '') {
 		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);
 			}
@@ -69,13 +69,13 @@ 
 		$info = curl_getinfo($ch);
 		//var_dump($info);
 		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;
@@ -106,20 +106,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);
@@ -127,19 +127,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);
@@ -157,27 +157,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);
@@ -192,8 +192,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);
 		}
@@ -213,11 +213,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") {
@@ -233,7 +233,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;
@@ -249,12 +249,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);
@@ -262,10 +262,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';
@@ -275,9 +275,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);
 	}
 	
 	/**
@@ -289,8 +289,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;
@@ -301,9 +301,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;
 	}
 	
 	/**
@@ -314,7 +314,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;
 	}
 	
@@ -324,7 +324,7 @@ 
 	* @return	String Return result
 	*/
 	public function hex2rgb($hex) {
-		$hex = str_replace('#','',$hex);
+		$hex = str_replace('#', '', $hex);
 		return sscanf($hex, "%02x%02x%02x"); 
 	}
 	
@@ -332,33 +332,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.2) {
+	public function checkLine($lat1, $lon1, $lat2, $lon2, $lat3, $lon3, $approx = 0.2) {
 		//$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;
 			}
@@ -422,34 +422,34 @@ 
 		return $result;
 	}
 
-	public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1){
+	public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1) {
 		global $globalMapRefresh;
 		$distance = ($speed*0.514444*$globalMapRefresh*$archivespeed)/1000;
 		$r = 6378;
 		$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);
@@ -458,7 +458,7 @@ 
 		$flong = $longitude + $dlong;
 		$flat = $latitude + $dlat;
 */
-		return array('latitude' => $flat,'longitude' => $flong);
+		return array('latitude' => $flat, 'longitude' => $flong);
 	}
 
 	/**
@@ -472,14 +472,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; 
@@ -495,7 +495,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',
@@ -552,7 +552,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',
@@ -568,13 +568,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',
@@ -608,7 +608,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;
 			}
 		}

require/class.GeoidHeight.php

Spacing +35 added lines, -35 removed lines

@@ -11,7 +11,7 @@ 
 * Translated to PHP of GeographicLib/src/Geoid.cpp
 * by Ycarus <ycarus@zugaina.org> in 2017
 */
-class GeoidHeight  {
+class GeoidHeight {
 	private $c0 = 240;
 	private $c3 = [[9, -18, -88, 0, 96, 90, 0, 0, -60, -20], [-9, 18, 8, 0, -96, 30, 0, 0, 60, -20], [9, -88, -18, 90, 96, 0, -20, -60, 0, 0], [186, -42, -42, -150, -96, -150, 60, 60, 60, 60], [54, 162, -78, 30, -24, -90, -60, 60, -60, 60], [-9, -32, 18, 30, 24, 0, 20, -60, 0, 0], [-9, 8, 18, 30, -96, 0, -20, 60, 0, 0], [54, -78, 162, -90, -24, 30, 60, -60, 60, -60], [-54, 78, 78, 90, 144, 90, -60, -60, -60, -60], [9, -8, -18, -30, -24, 0, 20, 60, 0, 0], [-9, 18, -32, 0, 24, 30, 0, 0, -60, 20], [9, -18, -8, 0, -24, -30, 0, 0, 60, 20]];
 	private $c0n = 372;
@@ -34,7 +34,7 @@ 
 	private $v10 = null;
 	private $v11 = null;
 
-	public function __construct($name='') {
+	public function __construct($name = '') {
 		global $globalGeoidSource;
 		//if ($name == '') $name = dirname(__FILE__).'/../install/tmp/egm2008-1.pgm';
 		if ($name == '') {
@@ -42,35 +42,35 @@ 
 			else $name = dirname(__FILE__).'/../data/egm96-15.pgm';
 		}
 
-		$f = @fopen($name,"r");
+		$f = @fopen($name, "r");
 		if ($f === FALSE) {
 			throw new Exception("Can't open ".$name);
 		}
-		$line = fgets($f,4096);
+		$line = fgets($f, 4096);
 		if (trim($line) != 'P5') {
 			throw new Exception('No PGM header');
 		}
 		$headerlen = strlen($line);
 		while (true) {
-			$line = fgets($f,4096);
+			$line = fgets($f, 4096);
 			if ((strlen($line) == 0)) {
 				throw new Exception('EOF before end of file header');
 			}
 			$headerlen += strlen($line);
-			if (strpos($line,'# Offset ') !== FALSE) {
+			if (strpos($line, '# Offset ') !== FALSE) {
 				$this->offset = substr($line, 9);
-			} else if (strpos($line,'# Scale ') !== FALSE) {
+			} else if (strpos($line, '# Scale ') !== FALSE) {
 				$this->scale = substr($line, 8);
-			} else if ((strpos($line,'#') === FALSE)) {
-				list($this->width, $this->height) = preg_split('/\s+/',$line);
+			} else if ((strpos($line, '#') === FALSE)) {
+				list($this->width, $this->height) = preg_split('/\s+/', $line);
 				break;
 			}
 		}
-		$line = fgets($f,4096);
+		$line = fgets($f, 4096);
 		$headerlen += strlen($line);
-		$levels = (int)$line;
-		$this->width = (int)$this->width;
-		$this->height = (int)$this->height;
+		$levels = (int) $line;
+		$this->width = (int) $this->width;
+		$this->height = (int) $this->height;
 		if (($levels != 65535)) {
 			throw new Exception('PGM file must have 65535 gray levels ('.$levels.')');
 		}
@@ -85,42 +85,42 @@ 
 		}
 
 		$fullsize = filesize($name);
-		if ((($fullsize - $headerlen) != (($this->width * $this->height) * 2))) {
+		if ((($fullsize - $headerlen) != (($this->width*$this->height)*2))) {
 			throw new Exception('File has the wrong length');
 		}
 
 		$this->headerlen = $headerlen;
-		$this->raw= $f;
-		$this->rlonres = ($this->width / 360.0);
-		$this->rlatres = (($this->height - 1) / 180.0);
+		$this->raw = $f;
+		$this->rlonres = ($this->width/360.0);
+		$this->rlatres = (($this->height - 1)/180.0);
 	}
 
-	private function _rawval($ix,$iy) {
+	private function _rawval($ix, $iy) {
 		if (($iy < 0)) {
 			$iy = -$iy;
-			$ix += ($this->width / 2);
+			$ix += ($this->width/2);
 		} else if (($iy >= $this->height)) {
-			$iy = ((2 * ($this->height - 1)) - $iy);
-			$ix += ($this->width / 2);
+			$iy = ((2*($this->height - 1)) - $iy);
+			$ix += ($this->width/2);
 		}
 		if (($ix < 0)) {
 			$ix += $this->width;
 		} else if (($ix >= $this->width)) {
 			$ix -= $this->width;
 		}
-		$k = ((($iy * $this->width) + $ix) * 2) + $this->headerlen;
-		fseek($this->raw,$k);
-		return unpack('n',fread($this->raw,2))[1];
+		$k = ((($iy*$this->width) + $ix)*2) + $this->headerlen;
+		fseek($this->raw, $k);
+		return unpack('n', fread($this->raw, 2))[1];
 	}
 
-	public function get($lat,$lon,$cubic=true) {
+	public function get($lat, $lon, $cubic = true) {
 		if (($lon < 0)) {
 			$lon += 360;
 		}
-		$fy = ((90 - $lat) * $this->rlatres);
-		$fx = ($lon * $this->rlonres);
-		$iy = (int)$fy;
-		$ix = (int)$fx;
+		$fy = ((90 - $lat)*$this->rlatres);
+		$fx = ($lon*$this->rlonres);
+		$iy = (int) $fy;
+		$ix = (int) $fx;
 		$fx -= $ix;
 		$fy -= $iy;
 		$t = array();
@@ -147,7 +147,7 @@ 
 					$c3x = $this->c3;
 					$c0x = $this->c0;
 				}
-				for ($i = 0; $i < 10;++$i) {
+				for ($i = 0; $i < 10; ++$i) {
 					$t[$i] = 0;
 					for ($j = 0; $j < 12; ++$j) {
 						$t[$i] += $v[$j]*$c3x[$j][$i];
@@ -158,13 +158,13 @@ 
 			$this->t = $t;
 		} else $t = $this->t;
 		if (!($cubic)) {
-			$a = (((1 - $fx) * $this->v00) + ($fx * $this->v01));
-			$b = (((1 - $fx) * $this->v10) + ($fx * $this->v11));
-			$h = (((1 - $fy) * $a) + ($fy * $b));
+			$a = (((1 - $fx)*$this->v00) + ($fx*$this->v01));
+			$b = (((1 - $fx)*$this->v10) + ($fx*$this->v11));
+			$h = (((1 - $fy)*$a) + ($fy*$b));
 		} else {
-			$h = (($t[0] + ($fx * ($t[1] + ($fx * ($t[3] + ($fx * $t[6])))))) + ($fy * (($t[2] + ($fx * ($t[4] + ($fx * $t[7])))) + ($fy * (($t[5] + ($fx * $t[8])) + ($fy * $t[9]))))));
+			$h = (($t[0] + ($fx*($t[1] + ($fx*($t[3] + ($fx*$t[6])))))) + ($fy*(($t[2] + ($fx*($t[4] + ($fx*$t[7])))) + ($fy*(($t[5] + ($fx*$t[8])) + ($fy*$t[9]))))));
 		}
-		return ((float)$this->offset + ((float)$this->scale * (float)$h));
+		return ((float) $this->offset + ((float) $this->scale*(float) $h));
 	}
 }
 /*

live-geojson.php

Spacing +56 added lines, -56 removed lines

@@ -55,23 +55,23 @@ 
 $min = true;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs', 'famaprs'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',', $_COOKIE['filter_Airlines']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',', $_COOKIE['filter_Sources']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'], FILTER_SANITIZE_STRING);
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
 } else $min = false;
 
 if (isset($_GET['ident'])) {
-	$ident = urldecode(filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING));
+	$ident = urldecode(filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING));
 	if ($tracker) {
 		$spotter_array = $TrackerLive->getLastLiveTrackerDataByIdent($ident);
 	} elseif ($marine) {
@@ -85,7 +85,7 @@ 
 	}
 	$allhistory = true;
 } elseif (isset($_GET['flightaware_id'])) {
-	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+	$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
 	if (empty($spotter_array)) {
 		$from_archive = true;
@@ -93,44 +93,44 @@ 
 	}
 	$allhistory = true;
 } elseif (isset($_GET['famtrack_id'])) {
-	$famtrack_id = urldecode(filter_input(INPUT_GET,'famtrack_id',FILTER_SANITIZE_STRING));
+	$famtrack_id = urldecode(filter_input(INPUT_GET, 'famtrack_id', FILTER_SANITIZE_STRING));
 	$spotter_array = $TrackerLive->getLastLiveTrackerDataById($famtrack_id);
 	$allhistory = true;
 } elseif (isset($_GET['fammarine_id'])) {
-	$fammarine_id = urldecode(filter_input(INPUT_GET,'fammarine_id',FILTER_SANITIZE_STRING));
+	$fammarine_id = urldecode(filter_input(INPUT_GET, 'fammarine_id', FILTER_SANITIZE_STRING));
 	$spotter_array = $MarineLive->getLastLiveMarineDataById($fammarine_id);
 	$allhistory = true;
 } elseif (isset($_GET['coord']) && (!isset($globalMapPopup) || $globalMapPopup || (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true'))) {
 //} elseif (isset($_GET['coord'])) {
 	$usecoord = true;
-	$coord = explode(',',$_GET['coord']);
+	$coord = explode(',', $_GET['coord']);
 	if ($tracker) {
-		$spotter_array = $TrackerLive->getLiveTrackerDatabyCoord($coord,$filter);
+		$spotter_array = $TrackerLive->getLiveTrackerDatabyCoord($coord, $filter);
 	} elseif ($marine) {
-		$spotter_array = $MarineLive->getLiveMarineDatabyCoord($coord,$filter);
+		$spotter_array = $MarineLive->getLiveMarineDatabyCoord($coord, $filter);
 	} else {
-		$spotter_array = $SpotterLive->getLiveSpotterDatabyCoord($coord,$filter);
+		$spotter_array = $SpotterLive->getLiveSpotterDatabyCoord($coord, $filter);
 	}
 } elseif (isset($globalMapUseBbox) && $globalMapUseBbox && isset($_GET['coord']) && $min) {
 	$usecoord = true;
-	$coord = explode(',',$_GET['coord']);
+	$coord = explode(',', $_GET['coord']);
 	if ($tracker) {
-		$spotter_array = $TrackerLive->getMinLiveTrackerDatabyCoord($coord,$filter);
+		$spotter_array = $TrackerLive->getMinLiveTrackerDatabyCoord($coord, $filter);
 	} elseif ($marine) {
-		$spotter_array = $MarineLive->getMinLiveMarineDatabyCoord($coord,$filter);
+		$spotter_array = $MarineLive->getMinLiveMarineDatabyCoord($coord, $filter);
 	} else {
-		$spotter_array = $SpotterLive->getMinLiveSpotterDatabyCoord($coord,$filter);
+		$spotter_array = $SpotterLive->getMinLiveSpotterDatabyCoord($coord, $filter);
 	}
 } elseif (isset($_GET['archive']) && isset($_GET['begindate']) && isset($_GET['enddate']) && isset($_GET['speed']) && !isset($_GET['tracker']) && !isset($_GET['marine'])) {
 	$from_archive = true;
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
 //	$enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
-	$begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
-	$enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
-	$archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
-	$begindate = date('Y-m-d H:i:s',$begindate);
-	$enddate = date('Y-m-d H:i:s',$enddate);
-	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
+	$begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
+	$enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
+	$archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
+	$begindate = date('Y-m-d H:i:s', $begindate);
+	$enddate = date('Y-m-d H:i:s', $enddate);
+	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
 } elseif ($min) {
 	if ($tracker) {
 		$spotter_array = $TrackerLive->getMinLiveTrackerData($filter);
@@ -142,18 +142,18 @@ 
 #	$min = true;
 } else {
 	if ($tracker) {
-		$spotter_array = $TrackerLive->getLiveTrackerData('','',$filter);
+		$spotter_array = $TrackerLive->getLiveTrackerData('', '', $filter);
 	} elseif ($marine) {
-		$spotter_array = $marineLive->getLiveMarineData('','',$filter);
+		$spotter_array = $marineLive->getLiveMarineData('', '', $filter);
 	} else {
-		$spotter_array = $SpotterLive->getLiveSpotterData('','',$filter);
+		$spotter_array = $SpotterLive->getLiveSpotterData('', '', $filter);
 	}
 }
 
 if (!empty($spotter_array) || $usecoord) {
 	if ($usecoord) {
 		if (isset($_GET['archive'])) {
-			$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
+			$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
 		} else {
 			$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
 		}
@@ -161,7 +161,7 @@ 
 	if ($flightcnt == '') $flightcnt = 0;
 } else $flightcnt = 0;
 
-$sqltime = round(microtime(true)-$begintime,2);
+$sqltime = round(microtime(true) - $begintime, 2);
 
 if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) $usenextlatlon = false;
 else $usenextlatlon = true;
@@ -178,7 +178,7 @@ 
 		if (!empty($spotter_array) && is_array($spotter_array))
 		{
 			$output .= '"features": [';
-			foreach($spotter_array as $spotter_item)
+			foreach ($spotter_array as $spotter_item)
 			{
 				$j++;
 				date_default_timezone_set('UTC');
@@ -234,8 +234,8 @@ 
 */
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
-							if ($compress) $output .= '"c": "'.str_replace('\\','',$spotter_item['ident']).'",';
-							else $output .= '"callsign": "'.str_replace('\\','',$spotter_item['ident']).'",';
+							if ($compress) $output .= '"c": "'.str_replace('\\', '', $spotter_item['ident']).'",';
+							else $output .= '"callsign": "'.str_replace('\\', '', $spotter_item['ident']).'",';
 							//"
 						} else {
 							if ($compress) $output .= '"c": "NA",';
@@ -244,7 +244,7 @@ 
 						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
-							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
+							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ', '_', $spotter_item['aircraft_name'])).'",';
 						} elseif (isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "NA ('.$spotter_item['aircraft_type'].')",';
 						} elseif (!$min) {
@@ -385,16 +385,16 @@ 
 						else $output .= '"heading": "'.$spotter_item['heading'].'",';
 						
 						if (isset($archivespeed)) {
-							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading'], $archivespeed);
 							$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 						} elseif ($usenextlatlon) {
-							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading']);
 							$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 						}
 
 						if (!$min) $output .= '"image": "'.$image.'",';
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
-							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
+							$output .= '"image_copyright": "'.str_replace('"', "'", trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $spotter_item['image_copyright']))).'",';
 						}
 						if (isset($spotter_item['image_source_website'])) {
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
@@ -416,7 +416,7 @@ 
 							$output .= '"waypoints": "'.$spotter_item['waypoints'].'",';
 						}
 						if (isset($spotter_item['acars'])) {
-							$output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",';
+							$output .= '"acars": "'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br />', $spotter_item['acars']['message'])).'",';
 						}
 						// type when not aircraft ?
 						if (isset($spotter_item['type'])) {
@@ -494,7 +494,7 @@ 
                 
 			}
 */
-				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
+				$history = filter_input(INPUT_GET, 'history', FILTER_SANITIZE_STRING);
 				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
 				
 				if (
@@ -502,11 +502,11 @@ 
 				    || ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
 				//    || (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))
 				//    || (isset($history) && $history != '' && $history != 'NA' && $history == $spotter_item['ident'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
+				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-', '', $history) == str_replace('-', '', $spotter_item['flightaware_id']))
 				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
+				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-', '', $history) == str_replace('-', '', $spotter_item['fammarine_id']))
 				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
+				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-', '', $history) == str_replace('-', '', $spotter_item['famtrackid']))
 				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
 				    ) {
 					if ($tracker) {
@@ -543,9 +543,9 @@ 
 								else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
 							}
 							$output_history .= '[';
-							$output_history .=  $spotter_history['longitude'].', ';
-							$output_history .=  $spotter_history['latitude'].', ';
-							$output_history .=  $spotter_history['altitude']*30.48;
+							$output_history .= $spotter_history['longitude'].', ';
+							$output_history .= $spotter_history['latitude'].', ';
+							$output_history .= $spotter_history['altitude']*30.48;
 							$output_history .= '],';
 							/*
 							if ($from_archive === false) {
@@ -563,8 +563,8 @@ 
 								else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
 							} else $d = true;
 							$output_history .= '[';
-							$output_history .=  $spotter_history['longitude'].', ';
-							$output_history .=  $spotter_history['latitude'];
+							$output_history .= $spotter_history['longitude'].', ';
+							$output_history .= $spotter_history['latitude'];
 							$output_history .= '],';
 							/*
 							if ($from_archive === false) {
@@ -580,9 +580,9 @@ 
 					
 						if ($from_archive === false) {
 							$output_historyd = '[';
-							$output_historyd .=  $spotter_item['longitude'].', ';
-							$output_historyd .=  $spotter_item['latitude'];
-							if (isset($spotter_history['altitude'])) $output_historyd .=  ','.$spotter_item['altitude']*30.48;
+							$output_historyd .= $spotter_item['longitude'].', ';
+							$output_historyd .= $spotter_item['latitude'];
+							if (isset($spotter_history['altitude'])) $output_historyd .= ','.$spotter_item['altitude']*30.48;
 							$output_historyd .= '],';
 							//$output_history = $output_historyd.$output_history;
 							$output_history = $output_history.$output_historyd;
@@ -596,7 +596,7 @@ 
 					}
 				}
 				
-				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
+				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-', '', $history) == str_replace('-', '', $spotter_item['flightaware_id']))
 				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
 				     && (isset($spotter_item['departure_airport']) 
 				        && $spotter_item['departure_airport'] != 'NA' 
@@ -630,7 +630,7 @@ 
 
 				//if (isset($history) && $history != '' && $history == $spotter_item['ident'] && isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA' && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
 				//if (isset($history) && $history != '' && $history == $spotter_item['ident'] && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
-				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
+				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-', '', $history) == str_replace('-', '', $spotter_item['flightaware_id']))
 				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
 				     && (isset($spotter_item['arrival_airport']) 
 				        && $spotter_item['arrival_airport'] != 'NA' 
@@ -661,7 +661,7 @@ 
 			$output  = substr($output, 0, -1);
 			$output .= ']';
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
-			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
+			$output .= '"totaltime": "'.round(microtime(true) - $begintime, 2).'",';
 			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
 			$output .= '"fc": "'.$j.'"';
 		} else {

require/class.NOTAM.php

Spacing +54 added lines, -54 removed lines

@@ -982,7 +982,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1000,19 +1000,19 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
 	public function getAllNOTAMtext() {
-		$query  = 'SELECT full_notam FROM notam';
+		$query = 'SELECT full_notam FROM notam';
 		$query_values = array();
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1021,13 +1021,13 @@ 
 	public function createNOTAMtextFile($filename) {
 		$allnotam_result = $this->getAllNOTAMtext();
 		$notamtext = '';
-		foreach($allnotam_result as $notam) {
+		foreach ($allnotam_result as $notam) {
 			$notamtext .= '%%'."\n";
 			$notamtext .= $notam['full_notam'];
 			$notamtext .= "\n".'%%'."\n";
 		}
 		//$allnotam = implode('\n%%%%\n',$allnotam_result);
-		file_put_contents($filename,$notamtext);
+		file_put_contents($filename, $notamtext);
 	}
 	public function parseNOTAMtextFile($filename) {
 		$data = file_get_contents($filename);
@@ -1048,7 +1048,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1057,10 +1057,10 @@ 
 	public function getAllNOTAMbyCoord($coord) {
 		global $globalDBdriver;
 		if (is_array($coord)) {
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 			if ($minlat > $maxlat) {
 				$tmplat = $minlat;
 				$minlat = $maxlat;
@@ -1082,19 +1082,19 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
-	public function getAllNOTAMbyCoordScope($coord,$scope) {
+	public function getAllNOTAMbyCoordScope($coord, $scope) {
 		global $globalDBdriver;
 		if (is_array($coord)) {
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 		} else return array();
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT * FROM notam WHERE center_latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND center_longitude BETWEEN '.$minlong.' AND '.$maxlong.' AND radius > 0 AND date_end > UTC_TIMESTAMP() AND date_begin < UTC_TIMESTAMP() AND scope = :scope';
@@ -1106,7 +1106,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1118,7 +1118,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);
@@ -1126,13 +1126,13 @@ 
 		else return array();
 	}
 
-	public function addNOTAM($ref,$title,$type,$fir,$code,$rules,$scope,$lower_limit,$upper_limit,$center_latitude,$center_longitude,$radius,$date_begin,$date_end,$permanent,$text,$full_notam) {
+	public function addNOTAM($ref, $title, $type, $fir, $code, $rules, $scope, $lower_limit, $upper_limit, $center_latitude, $center_longitude, $radius, $date_begin, $date_end, $permanent, $text, $full_notam) {
 		$query = "INSERT INTO notam (ref,title,notam_type,fir,code,rules,scope,lower_limit,upper_limit,center_latitude,center_longitude,radius,date_begin,date_end,permanent,notam_text,full_notam) VALUES (:ref,:title,:type,:fir,:code,:rules,:scope,:lower_limit,:upper_limit,:center_latitude,:center_longitude,:radius,:date_begin,:date_end,:permanent,:text,:full_notam)";
-		$query_values = array(':ref' => $ref,':title' => $title,':type' => $type,':fir' => $fir,':code' => $code,':rules' => $rules,':scope' => $scope,':lower_limit' => $lower_limit,':upper_limit' => $upper_limit,':center_latitude' => $center_latitude,':center_longitude' => $center_longitude,':radius' => $radius,':date_begin' => $date_begin,':date_end' => $date_end,':permanent' => $permanent,':text' => $text,':full_notam' => $full_notam);
+		$query_values = array(':ref' => $ref, ':title' => $title, ':type' => $type, ':fir' => $fir, ':code' => $code, ':rules' => $rules, ':scope' => $scope, ':lower_limit' => $lower_limit, ':upper_limit' => $upper_limit, ':center_latitude' => $center_latitude, ':center_longitude' => $center_longitude, ':radius' => $radius, ':date_begin' => $date_begin, ':date_end' => $date_end, ':permanent' => $permanent, ':text' => $text, ':full_notam' => $full_notam);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1143,7 +1143,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1158,7 +1158,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1168,7 +1168,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1177,7 +1177,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1186,7 +1186,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1194,14 +1194,14 @@ 
 	public function updateNOTAM() {
 		global $globalNOTAMAirports;
 		if (isset($globalNOTAMAirports) && is_array($globalNOTAMAirports) && count($globalNOTAMAirports) > 0) {
-			foreach (array_chunk($globalNOTAMAirports,10) as $airport) {
-				$airport_icao = implode(',',$airport);
+			foreach (array_chunk($globalNOTAMAirports, 10) as $airport) {
+				$airport_icao = implode(',', $airport);
 				$alldata = $this->downloadNOTAM($airport_icao);
 				if (count($alldata) > 0) {
 					foreach ($alldata as $initial_data) {
 						$data = $this->parse($initial_data);
 						$notamref = $this->getNOTAMbyRef($data['ref']);
-						if (count($notamref) == 0) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+						if (count($notamref) == 0) $this->addNOTAM($data['ref'], $data['title'], '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['latitude'], $data['longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
 					}
 				}
 			}
@@ -1214,7 +1214,7 @@ 
 			foreach ($alldata as $initial_data) {
 				$data = $this->parse($initial_data);
 				$notamref = $this->getNOTAMbyRef($data['ref']);
-				if (!isset($notamref['notam_id'])) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+				if (!isset($notamref['notam_id'])) $this->addNOTAM($data['ref'], $data['title'], '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['latitude'], $data['longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
 			}
 		}
 	}
@@ -1223,12 +1223,12 @@ 
 		global $globalTransaction;
 		$Spotter = new Spotter();
 		$allairports = $Spotter->getAllAirportInfo();
-		foreach (array_chunk($allairports,20) as $airport) {
+		foreach (array_chunk($allairports, 20) as $airport) {
 			$airports_icao = array();
-			foreach($airport as $icao) {
+			foreach ($airport as $icao) {
 				if (isset($icao['icao'])) $airports_icao[] = $icao['icao'];
 			}
-			$airport_icao = implode(',',$airports_icao);
+			$airport_icao = implode(',', $airports_icao);
 			$alldata = $this->downloadNOTAM($airport_icao);
 			if ($globalTransaction) $this->db->beginTransaction();
 			if (count($alldata) > 0) {
@@ -1241,7 +1241,7 @@ 
 						if (count($notamref) == 0) {
 							if (isset($data['ref_replaced'])) $this->deleteNOTAMbyRef($data['ref_replaced']);
 							if (isset($data['ref_cancelled'])) $this->deleteNOTAMbyRef($data['ref_cancelled']);
-							elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) echo $this->addNOTAM($data['ref'],'','',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+							elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) echo $this->addNOTAM($data['ref'], '', '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['latitude'], $data['longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
 						}
 					}
 				}
@@ -1255,7 +1255,7 @@ 
 		date_default_timezone_set("UTC");
 		$Common = new Common();
 		//$url = str_replace('{icao}',$icao,'https://pilotweb.nas.faa.gov/PilotWeb/notamRetrievalByICAOAction.do?method=displayByICAOs&reportType=RAW&formatType=DOMESTIC&retrieveLocId={icao}&actionType=notamRetrievalByICAOs');
-		$url = str_replace('{icao}',$icao,'https://pilotweb.nas.faa.gov/PilotWeb/notamRetrievalByICAOAction.do?method=displayByICAOs&reportType=RAW&formatType=ICAO&retrieveLocId={icao}&actionType=notamRetrievalByICAOs');
+		$url = str_replace('{icao}', $icao, 'https://pilotweb.nas.faa.gov/PilotWeb/notamRetrievalByICAOAction.do?method=displayByICAOs&reportType=RAW&formatType=ICAO&retrieveLocId={icao}&actionType=notamRetrievalByICAOs');
 		$data = $Common->getData($url);
 		preg_match_all("/<pre>(.+?)<\/pre>/is", $data, $matches);
 		//print_r($matches);
@@ -1272,9 +1272,9 @@ 
 		$result['permanent'] = '';
 		$result['date_begin'] = NULL;
 		$result['date_end'] = NULL;
-		$data = str_ireplace(array("\r","\n",'\r','\n'),' ',$data);
+		$data = str_ireplace(array("\r", "\n", '\r', '\n'), ' ', $data);
 		//echo $data."\n";
-		$data = preg_split('#\s(?=([A-Z]\)\s))#',$data);
+		$data = preg_split('#\s(?=([A-Z]\)\s))#', $data);
 		//print_r($data);
 		$q = false;
 		$a = false;
@@ -1283,9 +1283,9 @@ 
 		$e = false;
 		foreach ($data as $line) {
 			$line = trim($line);
-			if (preg_match('#(^|\s)Q\) (.*)#',$line,$matches) && $q === false) {
-				$line = str_replace(' ','',$line);
-				if (preg_match('#Q\)([A-Z]{3,4})\/([A-Z]{5})\/(IV|I|V)\/([A-Z]{1,3})\/([A-Z]{1,2})\/([0-9]{3})\/([0-9]{3})\/([0-9]{4})(N|S)([0-9]{5})(E|W)([0-9]{3}|)#',$line,$matches)) {
+			if (preg_match('#(^|\s)Q\) (.*)#', $line, $matches) && $q === false) {
+				$line = str_replace(' ', '', $line);
+				if (preg_match('#Q\)([A-Z]{3,4})\/([A-Z]{5})\/(IV|I|V)\/([A-Z]{1,3})\/([A-Z]{1,2})\/([0-9]{3})\/([0-9]{3})\/([0-9]{4})(N|S)([0-9]{5})(E|W)([0-9]{3}|)#', $line, $matches)) {
 				//if (preg_match('#Q\)([A-Z]{4})\/([A-Z]{5})\/(IV|I|V)\/([A-Z]{1,3})\/([A-Z]{1,2})\/([0-9]{3})\/([0-9]{3})\/([0-9]{4})(N|S)([0-9]{5})(E|W)([0-9]{3})#',$line,$matches)) {
 					//print_r($matches);
 					$result['fir'] = $matches[1];
@@ -1331,9 +1331,9 @@ 
 					elseif ($matches[5] == 'AW') $result['scope'] = 'Airport/Navigation warning';
 					$result['lower_limit'] = $matches[6];
 					$result['upper_limit'] = $matches[7];
-					$latitude = $Common->convertDec($matches[8],'latitude');
+					$latitude = $Common->convertDec($matches[8], 'latitude');
 					if ($matches[9] == 'S') $latitude = -$latitude;
-					$longitude = $Common->convertDec($matches[10],'longitude');
+					$longitude = $Common->convertDec($matches[10], 'longitude');
 					if ($matches[11] == 'W') $longitude = -$longitude;
 					$result['latitude'] = $latitude;
 					$result['longitude'] = $longitude;
@@ -1345,24 +1345,24 @@ 
 					echo "Can't parse : ".$line."\n";
 				}
 			}
-			elseif (preg_match('#(^|\s)A\) (.*)#',$line,$matches) && $a === false) {
+			elseif (preg_match('#(^|\s)A\) (.*)#', $line, $matches) && $a === false) {
 				$result['icao'] = $matches[2];
 				$a = true;
 			}
-			elseif (preg_match('#(^|\s)B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#',$line,$matches) && $b === false) {
+			elseif (preg_match('#(^|\s)B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#', $line, $matches) && $b === false) {
 				if ($matches[1] > 50) $year = '19'.$matches[2];
 				else $year = '20'.$matches[2];
 				$result['date_begin'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
 				$b = true;
 			}
-			elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#',$line,$matches) && $c === false) {
+			elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#', $line, $matches) && $c === false) {
 				if ($matches[2] > 50) $year = '19'.$matches[2];
 				else $year = '20'.$matches[2];
 				$result['date_end'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
 				$result['permanent'] = 0;
 				$c = true;
 			}
-			elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#',$line,$matches) && $c === false) {
+			elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#', $line, $matches) && $c === false) {
 				if ($matches[2] > 50) $year = '19'.$matches[2];
 				else $year = '20'.$matches[2];
 				$result['date_end'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
@@ -1372,7 +1372,7 @@ 
 				else $result['permanent'] = 0;
 				$c = true;
 			}
-			elseif (preg_match('#(^|\s)C\) (EST|PERM)$#',$line,$matches) && $c === false) {
+			elseif (preg_match('#(^|\s)C\) (EST|PERM)$#', $line, $matches) && $c === false) {
 				$result['date_end'] = '2030/12/20 12:00';
 				if ($matches[2] == 'EST') $result['estimated'] = 1;
 				else $result['estimated'] = 0;
@@ -1380,20 +1380,20 @@ 
 				else $result['permanent'] = 0;
 				$c = true;
 			}
-			elseif (preg_match('#(^|\s)E\) (.*)#',$line,$matches) && $e === false) {
+			elseif (preg_match('#(^|\s)E\) (.*)#', $line, $matches) && $e === false) {
 				$rtext = array();
-				$text = explode(' ',$matches[2]);
+				$text = explode(' ', $matches[2]);
 				foreach ($text as $word) {
 					if (isset($this->abbr[$word])) $rtext[] = strtoupper($this->abbr[$word]);
-					elseif (ctype_digit(strval(substr($word,3))) && isset($this->abbr[substr($word,0,3)])) $rtext[] = strtoupper($this->abbr[substr($word,0,3)]).' '.substr($word,3);
+					elseif (ctype_digit(strval(substr($word, 3))) && isset($this->abbr[substr($word, 0, 3)])) $rtext[] = strtoupper($this->abbr[substr($word, 0, 3)]).' '.substr($word, 3);
 					else $rtext[] = $word;
 				}
-				$result['text'] = implode(' ',$rtext);
+				$result['text'] = implode(' ', $rtext);
 				$e = true;
 			//} elseif (preg_match('#F\) (.*)#',$line,$matches)) {
 			//} elseif (preg_match('#G\) (.*)#',$line,$matches)) {
-			} elseif (preg_match('#(NOTAMN|NOTAMR|NOTAMC)#',$line,$matches)) {
-				$text = explode(' ',$line);
+			} elseif (preg_match('#(NOTAMN|NOTAMR|NOTAMC)#', $line, $matches)) {
+				$text = explode(' ', $line);
 				$result['ref'] = $text[0];
 				if ($matches[1] == 'NOTAMN') $result['type'] = 'new';
 				if ($matches[1] == 'NOTAMC') {

install/class.update_schema.php

Spacing +233 added lines, -233 removed lines

@@ -14,11 +14,11 @@ 
             try {
             	$sth = $Connection->db->prepare($query);
 		$sth->execute();
-    	    } catch(PDOException $e) {
+    	    } catch (PDOException $e) {
 		return "error : ".$e->getMessage()."\n";
     	    }
     	    while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
-    		$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
+    		$Schedule->addSchedule($row['ident'], $row['departure_airport_icao'], $row['departure_airport_time'], $row['arrival_airport_icao'], $row['arrival_airport_time']);
     	    }
 	
 	}
@@ -50,7 +50,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
     		}
     		// Copy schedules data to routes table
@@ -60,7 +60,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (delete schedule table) : ".$e->getMessage()."\n";
     		}
     		// Add source column
@@ -68,7 +68,7 @@ 
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
     		}
 		// Delete unused column
@@ -76,7 +76,7 @@ 
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
     		}
 		// Add ModeS column
@@ -84,14 +84,14 @@ 
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
     		}
 		$query = "ALTER TABLE `spotter_live`  ADD `ModeS` VARCHAR(255)";
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
     		}
     		// Add auto_increment for aircraft_modes
@@ -99,7 +99,7 @@ 
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
     		}
     		$error = '';
@@ -110,7 +110,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -123,7 +123,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
     		}
     		$error = '';
@@ -134,7 +134,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -147,7 +147,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
     		}
     		// Add image_source_website column to spotter_image
@@ -155,7 +155,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
     		}
     		$error = '';
@@ -164,7 +164,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -182,7 +182,7 @@ 
         	    try {
             		$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+    		    } catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
     		    }
     		}
@@ -196,7 +196,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to translation) : ".$e->getMessage()."\n";
     		}
     		// Add aircraft_shadow column to aircraft
@@ -204,7 +204,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new column to aircraft) : ".$e->getMessage()."\n";
     		}
     		// Add aircraft_shadow column to spotter_live
@@ -212,7 +212,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
     		}
     		$error = '';
@@ -225,7 +225,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -233,7 +233,7 @@ 
 
 	private static function update_from_6() {
     		$Connection = new Connection();
-    		if (!$Connection->indexExists('spotter_output','flightaware_id')) {
+    		if (!$Connection->indexExists('spotter_output', 'flightaware_id')) {
     		    $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
 			ALTER TABLE spotter_output ADD INDEX(date);
 			ALTER TABLE spotter_output ADD INDEX(ident);
@@ -250,7 +250,7 @@ 
         	    try {
             		$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+    		    } catch (PDOException $e) {
 			return "error (add some indexes) : ".$e->getMessage()."\n";
     		    }
     		}
@@ -265,7 +265,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -274,12 +274,12 @@ 
 	private static function update_from_7() {
 		global $globalDBname, $globalDBdriver;
     		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
+    		$query = "ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
     			ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
     		}
     		if ($globalDBdriver == 'mysql') {
@@ -287,7 +287,7 @@ 
 		    try {
             		$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+    		    } catch (PDOException $e) {
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
     		    }
     		    $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -299,15 +299,15 @@ 
 				DROP TABLE spotter_archive;
 				RENAME TABLE copy TO spotter_archive;";
             	    } else {
-    			$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
+    			$query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
             	    }
                 } else {
-    		    $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
+    		    $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
                 }
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
     		}
 
@@ -320,7 +320,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -339,14 +339,14 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (insert last_update values) : ".$e->getMessage()."\n";
     		}
 		$query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -354,12 +354,12 @@ 
 
 	private static function update_from_9() {
     		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
+    		$query = "ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
     			ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
     		}
 		$error = '';
@@ -371,7 +371,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -379,11 +379,11 @@ 
 
 	private static function update_from_10() {
     		$Connection = new Connection();
-    		$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
+    		$query = "ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
     		}
 		$error = '';
@@ -401,7 +401,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -410,18 +410,18 @@ 
 	private static function update_from_11() {
 		global $globalDBdriver, $globalDBname;
     		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
+    		$query = "ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
     		}
-    		$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+    		$query = "ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
     		}
     		if ($globalDBdriver == 'mysql') {
@@ -429,7 +429,7 @@ 
 		    try {
             		$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+    		    } catch (PDOException $e) {
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
     		    }
     		    $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -441,15 +441,15 @@ 
 				DROP TABLE spotter_archive;
 				RENAME TABLE copy TO spotter_archive;";
             	    } else {
-    			$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+    			$query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
             	    }
                 } else {
-    		    $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+    		    $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
                 }
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
     		}
 
@@ -459,7 +459,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -487,7 +487,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -495,12 +495,12 @@ 
 
 	private static function update_from_13() {
     		$Connection = new Connection();
-    		if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
-    			$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
+    		if (!$Connection->checkColumnName('spotter_archive_output', 'real_departure_airport_icao')) {
+    			$query = "ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-	    		} catch(PDOException $e) {
+	    		} catch (PDOException $e) {
 				return "error (update spotter_archive_output) : ".$e->getMessage()."\n";
     			}
 		}
@@ -509,7 +509,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -527,7 +527,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -538,11 +538,11 @@ 
     		$Connection = new Connection();
 		$error = '';
     		// Add tables
-    		$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
+    		$query = "ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update stats) : ".$e->getMessage()."\n";
     		}
 		if ($error != '') return $error;
@@ -550,7 +550,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -571,7 +571,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -589,7 +589,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -598,12 +598,12 @@ 
     		$Connection = new Connection();
 		$error = '';
     		// Modify stats_airport table
-    		if (!$Connection->checkColumnName('stats_airport','airport_name')) {
+    		if (!$Connection->checkColumnName('stats_airport', 'airport_name')) {
     			$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
     	        	try {
 	            	    $sth = $Connection->db->prepare($query);
 			    $sth->execute();
-    			} catch(PDOException $e) {
+    			} catch (PDOException $e) {
 			    return "error (update stats) : ".$e->getMessage()."\n";
     			}
     		}
@@ -612,7 +612,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -629,73 +629,73 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
     		}
 		$query = "alter table spotter_archive add spotter_archive_id INT(11)";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
     		}
-		if (!$Connection->checkColumnName('spotter_archive','over_country')) {
+		if (!$Connection->checkColumnName('spotter_archive', 'over_country')) {
 			// Add column over_country
     			$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
 			try {
             			$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_live','over_country')) {
+		if (!$Connection->checkColumnName('spotter_live', 'over_country')) {
 			// Add column over_country
     			$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
 			try {
             			$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_output','source_name')) {
+		if (!$Connection->checkColumnName('spotter_output', 'source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
     			$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if (!$Connection->checkColumnName('spotter_live','source_name')) {
+		if (!$Connection->checkColumnName('spotter_live', 'source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
     			$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if (!$Connection->checkColumnName('spotter_archive_output','source_name')) {
+		if (!$Connection->checkColumnName('spotter_archive_output', 'source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
     			$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if (!$Connection->checkColumnName('spotter_archive','source_name')) {
+		if (!$Connection->checkColumnName('spotter_archive', 'source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
     			$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
@@ -704,7 +704,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -719,13 +719,13 @@ 
 			$error .= create_db::import_file('../db/airlines.sql');
 			if ($error != '') return 'Import airlines.sql : '.$error;
 		}
-		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
+		if (!$Connection->checkColumnName('aircraft_modes', 'type_flight')) {
 			// Add column over_country
     			$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
         		try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
     			}
     		}
@@ -741,7 +741,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -750,13 +750,13 @@ 
 	private static function update_from_21() {
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('stats_airport','stats_type')) {
+		if (!$Connection->checkColumnName('stats_airport', 'stats_type')) {
 			// Rename type to stats_type
 			$query = "ALTER TABLE `stats_airport` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats_flight` CHANGE `type` `stats_type` VARCHAR(50);";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
 			}
 			if ($error != '') return $error;
@@ -765,7 +765,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -788,7 +788,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -815,17 +815,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (create index on spotter_archive) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) {
+		if (!$Connection->checkColumnName('stats_aircraft', 'aircraft_manufacturer')) {
 			// Add aircraft_manufacturer to stats_aircraft
     			$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n";
     			}
     		}
@@ -834,7 +834,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -850,23 +850,23 @@ 
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
 		}
 		if ($error != '') return 'Import airlines.sql : '.$error;
-		if (!$Connection->checkColumnName('airlines','forsource')) {
+		if (!$Connection->checkColumnName('airlines', 'forsource')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add forsource column) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_aircraft','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_aircraft', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_aircraft ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_aircraft) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -878,17 +878,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_aircraft) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_airport','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_airport', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_airport ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add filter_name column in stats_airport) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -900,17 +900,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_airport) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_country','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_country', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_country ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_country) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -922,36 +922,36 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_airline) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_flight','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_flight', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_flight ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_flight) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats','stats_airline')) {
+		if (!$Connection->checkColumnName('stats', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats) : ".$e->getMessage()."\n";
 			}
-			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats','type')) {
+			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats', 'type')) {
 				// Add unique key
 				$query = "drop index type on stats;ALTER TABLE stats ADD UNIQUE stats_type (stats_type,stats_date,stats_airline,filter_name);";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add unique key in stats) : ".$e->getMessage()."\n";
 				}
 			} else {
@@ -964,18 +964,18 @@ 
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add unique key in stats) : ".$e->getMessage()."\n";
 				}
 			}
 		}
-		if (!$Connection->checkColumnName('stats_registration','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_registration', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_registration ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_registration) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -987,17 +987,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_registration) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_callsign','filter_name')) {
+		if (!$Connection->checkColumnName('stats_callsign', 'filter_name')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_callsign ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add filter_name column in stats_callsign) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1009,17 +1009,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_airline','filter_name')) {
+		if (!$Connection->checkColumnName('stats_airline', 'filter_name')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_airline ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add filter_name column in stats_airline) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1031,7 +1031,7 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1040,7 +1040,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1050,13 +1050,13 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('stats_owner','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_owner', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_owner ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_owner) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1068,17 +1068,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_owner) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_pilot','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_pilot', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_pilot ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_pilot) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1090,7 +1090,7 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_pilot) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1098,7 +1098,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1108,12 +1108,12 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('atc','format_source')) {
+		if (!$Connection->checkColumnName('atc', 'format_source')) {
 			$query = "ALTER TABLE atc ADD format_source VARCHAR(255) DEFAULT NULL, ADD source_name VARCHAR(255) DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add format_source & source_name column in atc) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1121,7 +1121,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1131,13 +1131,13 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('stats_pilot','format_source')) {
+		if (!$Connection->checkColumnName('stats_pilot', 'format_source')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_pilot ADD format_source VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add format_source column in stats_pilot) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1149,7 +1149,7 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (modify unique key in stats_pilot) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1157,7 +1157,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1167,23 +1167,23 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live','latitude')) {
+		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live', 'latitude')) {
 			// Add unique key
 			$query = "alter table spotter_live add index(latitude,longitude)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n";
 			}
                 }
-		if (!$Connection->checkColumnName('aircraft','mfr')) {
+		if (!$Connection->checkColumnName('aircraft', 'mfr')) {
 			// Add mfr to aircraft
 			$query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add mfr column in aircraft) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1199,7 +1199,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1209,13 +1209,13 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if ($Connection->checkColumnName('aircraft','mfr')) {
+		if ($Connection->checkColumnName('aircraft', 'mfr')) {
 			// drop mfr to aircraft
 			$query = "ALTER TABLE aircraft DROP COLUMN mfr";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (drop mfr column in aircraft) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1231,7 +1231,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1241,33 +1241,33 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->indexExists('notam','ref_idx')) {
+		if (!$Connection->indexExists('notam', 'ref_idx')) {
 			// Add index key
 			$query = "create index ref_idx on notam (ref)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index ref on notam) : ".$e->getMessage()."\n";
 			}
                 }
-		if (!$Connection->indexExists('accidents','registration_idx')) {
+		if (!$Connection->indexExists('accidents', 'registration_idx')) {
 			// Add index key
 			$query = "create index registration_idx on accidents (registration)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index registration on accidents) : ".$e->getMessage()."\n";
 			}
                 }
-		if (!$Connection->indexExists('accidents','rdts')) {
+		if (!$Connection->indexExists('accidents', 'rdts')) {
 			// Add index key
 			$query = "create index rdts on accidents (registration,date,type,source)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n";
 			}
                 }
@@ -1276,7 +1276,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1286,23 +1286,23 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('accidents','airline_name')) {
+		if (!$Connection->checkColumnName('accidents', 'airline_name')) {
 			// Add airline_name to accidents
 			$query = "ALTER TABLE accidents ADD airline_name VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add airline_name column in accidents) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('accidents','airline_icao')) {
+		if (!$Connection->checkColumnName('accidents', 'airline_icao')) {
 			// Add airline_icao to accidents
 			$query = "ALTER TABLE accidents ADD airline_icao VARCHAR(10) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add airline_icao column in accidents) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1310,7 +1310,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1320,13 +1320,13 @@ 
 		global $globalDBdriver, $globalVATSIM, $globalIVAO;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('airlines','alliance')) {
+		if (!$Connection->checkColumnName('airlines', 'alliance')) {
 			// Add alliance to airlines
 			$query = "ALTER TABLE airlines ADD alliance VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add alliance column in airlines) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1353,7 +1353,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1363,13 +1363,13 @@ 
 		global $globalDBdriver, $globalVATSIM, $globalIVAO;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('airlines','ban_eu')) {
+		if (!$Connection->checkColumnName('airlines', 'ban_eu')) {
 			// Add ban_eu to airlines
 			$query = "ALTER TABLE airlines ADD ban_eu INTEGER NOT NULL DEFAULT '0'";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add ban_eu column in airlines) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1377,7 +1377,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1388,19 +1388,19 @@ 
 		$Connection = new Connection();
 		$error = '';
 		if ($globalDBdriver == 'mysql') {
-			if ($Connection->getColumnType('spotter_output','date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output','last_seen') != 'TIMESTAMP') {
+			if ($Connection->getColumnType('spotter_output', 'date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output', 'last_seen') != 'TIMESTAMP') {
 				$query = "ALTER TABLE spotter_output CHANGE date date TIMESTAMP NULL DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n";
 				}
 				$query = "ALTER TABLE spotter_output MODIFY COLUMN last_seen timestamp not null default current_timestamp()";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (convert spotter_output last_seen to timestamp) : ".$e->getMessage()."\n";
 				}
 				
@@ -1408,7 +1408,7 @@ 
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n";
 				}
 				/*$query = "SELECT date,last_seen FROM spotter_output WHERE last_seen < date ORDER BY date DESC LIMIT 150";
@@ -1459,7 +1459,7 @@ 
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (fix date) : ".$e->getMessage()."\n";
 				}
 			}
@@ -1544,7 +1544,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1553,13 +1553,13 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->indexExists('accidents','type')) {
+		if (!$Connection->indexExists('accidents', 'type')) {
 			// Add index key
 			$query = "create index type on accidents (type,date)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index type on accidents) : ".$e->getMessage()."\n";
 			}
                 }
@@ -1567,7 +1567,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1577,12 +1577,12 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('aircraft_modes','source_type')) {
+		if (!$Connection->checkColumnName('aircraft_modes', 'source_type')) {
 			$query = "ALTER TABLE aircraft_modes ADD source_type VARCHAR(255) DEFAULT 'modes'";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_type column in aircraft_modes) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1648,7 +1648,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1700,7 +1700,7 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
 			}
 			$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -1709,18 +1709,18 @@ 
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (Change table format from archive to InnoDB for spotter_archive) : ".$e->getMessage()."\n";
 				}
 			}
 		}
-		if (!$Connection->indexExists('spotter_archive','flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive','flightaware_id')) {
+		if (!$Connection->indexExists('spotter_archive', 'flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive', 'flightaware_id')) {
 			// Add index key
 			$query = "create index flightaware_id_date_idx on spotter_archive (flightaware_id,date)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n";
 			}
                 }
@@ -1728,7 +1728,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1739,148 +1739,148 @@ 
 		$Connection = new Connection();
 		$error = '';
 		if ($globalDBdriver == 'mysql') {
-			if (!$Connection->checkColumnName('marine_output','type_id')) {
+			if (!$Connection->checkColumnName('marine_output', 'type_id')) {
 				$query = "ALTER TABLE marine_output ADD COLUMN type_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_live','type_id')) {
+			if (!$Connection->checkColumnName('marine_live', 'type_id')) {
 				$query = "ALTER TABLE marine_live ADD COLUMN type_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_live) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive','type_id')) {
+			if (!$Connection->checkColumnName('marine_archive', 'type_id')) {
 				$query = "ALTER TABLE marine_archive ADD COLUMN type_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive_output','type_id')) {
+			if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN type_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_output','status_id')) {
+			if (!$Connection->checkColumnName('marine_output', 'status_id')) {
 				$query = "ALTER TABLE marine_output ADD COLUMN status_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_live','status_id')) {
+			if (!$Connection->checkColumnName('marine_live', 'status_id')) {
 				$query = "ALTER TABLE marine_live ADD COLUMN status_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_live) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive','status_id')) {
+			if (!$Connection->checkColumnName('marine_archive', 'status_id')) {
 				$query = "ALTER TABLE marine_archive ADD COLUMN status_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive_output','status_id')) {
+			if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN status_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n";
 				}
 			}
 		} else {
-			if (!$Connection->checkColumnName('marine_output','type_id')) {
+			if (!$Connection->checkColumnName('marine_output', 'type_id')) {
 				$query = "ALTER TABLE marine_output ADD COLUMN type_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_live','type_id')) {
+			if (!$Connection->checkColumnName('marine_live', 'type_id')) {
 				$query = "ALTER TABLE marine_live ADD COLUMN type_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_live) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive','type_id')) {
+			if (!$Connection->checkColumnName('marine_archive', 'type_id')) {
 				$query = "ALTER TABLE marine_archive ADD COLUMN type_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive_output','type_id')) {
+			if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN type_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_output','status_id')) {
+			if (!$Connection->checkColumnName('marine_output', 'status_id')) {
 				$query = "ALTER TABLE marine_output ADD COLUMN status_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_live','status_id')) {
+			if (!$Connection->checkColumnName('marine_live', 'status_id')) {
 				$query = "ALTER TABLE marine_live ADD COLUMN status_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_live) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive','status_id')) {
+			if (!$Connection->checkColumnName('marine_archive', 'status_id')) {
 				$query = "ALTER TABLE marine_archive ADD COLUMN status_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive_output','status_id')) {
+			if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN status_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n";
 				}
 			}
@@ -1889,7 +1889,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1904,14 +1904,14 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n";
 			}
 			$query = "ALTER TABLE marine_identity MODIFY COLUMN mmsi varchar(255) DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n";
 			}
 		} else {
@@ -1919,14 +1919,14 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n";
 			}
 			$query = "alter table marine_identity alter column mmsi type varchar(255)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1934,7 +1934,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1944,32 +1944,32 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('source_location','last_seen')) {
+		if (!$Connection->checkColumnName('source_location', 'last_seen')) {
 			$query = "ALTER TABLE source_location ADD COLUMN last_seen timestamp NULL DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column last_seen in source_location) : ".$e->getMessage()."\n";
 			}
 		}
 		if ($globalDBdriver == 'mysql') {
-			if (!$Connection->checkColumnName('source_location','location_id')) {
+			if (!$Connection->checkColumnName('source_location', 'location_id')) {
 				$query = "ALTER TABLE source_location ADD COLUMN location_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column location_id in source_location) : ".$e->getMessage()."\n";
 				}
 			}
 		} else {
-			if (!$Connection->checkColumnName('source_location','location_id')) {
+			if (!$Connection->checkColumnName('source_location', 'location_id')) {
 				$query = "ALTER TABLE source_location ADD COLUMN location_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column location_id in source_location) : ".$e->getMessage()."\n";
 				}
 			}
@@ -1978,7 +1978,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1988,12 +1988,12 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('source_location','description')) {
+		if (!$Connection->checkColumnName('source_location', 'description')) {
 			$query = "ALTER TABLE source_location ADD COLUMN description text DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column description in source_location) : ".$e->getMessage()."\n";
 			}
 		}
@@ -2001,7 +2001,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2011,39 +2011,39 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('spotter_live','real_altitude')) {
+		if (!$Connection->checkColumnName('spotter_live', 'real_altitude')) {
 			$query = "ALTER TABLE spotter_live ADD COLUMN real_altitude float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column real_altitude in spotter_live) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_output','real_altitude')) {
+		if (!$Connection->checkColumnName('spotter_output', 'real_altitude')) {
 			$query = "ALTER TABLE spotter_output ADD COLUMN real_altitude float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column real_altitude in spotter_output) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_archive_output','real_altitude')) {
+		if (!$Connection->checkColumnName('spotter_archive_output', 'real_altitude')) {
 			$query = "ALTER TABLE spotter_archive_output ADD COLUMN real_altitude float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column real_altitude in spotter_archive_output) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_archive','real_altitude')) {
+		if (!$Connection->checkColumnName('spotter_archive', 'real_altitude')) {
 			$query = "ALTER TABLE spotter_archive ADD COLUMN real_altitude float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column real_altitude in spotter_archive) : ".$e->getMessage()."\n";
 			}
 		}
@@ -2051,7 +2051,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2073,14 +2073,14 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (modify column altitude in tracker_*) : ".$e->getMessage()."\n";
 		}
 		$query = "UPDATE config SET value = '44' WHERE name = 'schema_version'";
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2121,7 +2121,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2144,7 +2144,7 @@ 
 		    try {
             		$sth = $Connection->db->prepare($query);
 		        $sth->execute();
-		    } catch(PDOException $e) {
+		    } catch (PDOException $e) {
 			return "error : ".$e->getMessage()."\n";
     		    }
     		    $result = $sth->fetch(PDO::FETCH_ASSOC);

require/class.Connection.php

Spacing +29 added lines, -29 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 require_once(dirname(__FILE__).'/settings.php');
 
-class Connection{
+class Connection {
 	public $db = null;
 	public $dbs = array();
 	public $latest_schema = 45;
 	
-	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
+	public function __construct($dbc = null, $dbname = null, $user = null, $pass = null) {
 	    global $globalDBdriver, $globalNoDB;
 	    if (isset($globalNoDB) && $globalNoDB === TRUE) {
 		$this->db = null;
@@ -16,7 +16,7 @@ 
 			if ($user === null && $pass === null) {
 			    $this->createDBConnection();
 			} else {
-			    $this->createDBConnection(null,$user,$pass);
+			    $this->createDBConnection(null, $user, $pass);
 			}
 		    } else {
 			$this->createDBConnection($dbname);
@@ -100,14 +100,14 @@ 
 		while (true) {
 			try {
 				if ($globalDBSdriver == 'mysql') {
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser,  $globalDBSpass);
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 500);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
 					// Workaround against "ONLY_FULL_GROUP_BY" mode
@@ -117,19 +117,19 @@ 
 					$this->dbs[$DBname]->exec('SET SESSION time_zone = "+00:00"');
 					//$this->dbs[$DBname]->exec('SET @@session.time_zone = "+00:00"');
 				} else {
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser,  $globalDBSpass);
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass);
 					//$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 200);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->exec('SET timezone="UTC"');
 				}
 				break;
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				$i++;
 				if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
 				//exit;
@@ -153,10 +153,10 @@ 
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return false;
 		}
-		if($results->rowCount()>0) {
+		if ($results->rowCount() > 0) {
 		    return true; 
 		}
 		else return false;
@@ -177,8 +177,8 @@ 
 			     return false;
 			}
 			
-		} catch(PDOException $e) {
-			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
+		} catch (PDOException $e) {
+			if ($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
             			throw $e;
 	                }
 	                //echo 'error ! '.$e->getMessage();
@@ -190,7 +190,7 @@ 
 	/*
 	* Check if index exist
 	*/
-	public function indexExists($table,$index)
+	public function indexExists($table, $index)
 	{
 		global $globalDBdriver, $globalDBname;
 		if ($globalDBdriver == 'mysql') {
@@ -201,11 +201,11 @@ 
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return false;
 		}
 		$nb = $results->fetchAll(PDO::FETCH_ASSOC);
-		if($nb[0]['nb'] > 0) {
+		if ($nb[0]['nb'] > 0) {
 			return true; 
 		}
 		else return false;
@@ -220,7 +220,7 @@ 
 		$query = "SELECT * FROM ".$table." LIMIT 0";
 		try {
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage()."\n";
 		}
 		$columns = array();
@@ -232,7 +232,7 @@ 
 		return $columns;
 	}
 
-	public function getColumnType($table,$column) {
+	public function getColumnType($table, $column) {
 		$select = $this->db->query('SELECT '.$column.' FROM '.$table);
 		$tomet = $select->getColumnMeta(0);
 		return $tomet['native_type'];
@@ -242,7 +242,7 @@ 
 	* Check if a column name exist in a table
 	* @return Boolean column exist or not
 	*/
-	public function checkColumnName($table,$name)
+	public function checkColumnName($table, $name)
 	{
 		global $globalDBdriver, $globalDBname;
 		if ($globalDBdriver == 'mysql') {
@@ -252,8 +252,8 @@ 
 		}
 			try {
 				$sth = $this->db()->prepare($query);
-				$sth->execute(array(':database' => $globalDBname,':table' => $table,':name' => $name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':database' => $globalDBname, ':table' => $table, ':name' => $name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage()."\n";
 			}
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
@@ -292,7 +292,7 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage()."\n";
 				}
 				$result = $sth->fetch(PDO::FETCH_ASSOC);

require/settings.php

Spacing +5 added lines, -5 removed lines

@@ -42,7 +42,7 @@ 
 $globalLongitudeMin = '1.0'; //the minimum longitude (east)
 
 $globalCenterLatitude = '46.38'; //the latitude center of your coverage area
-$globalCenterLongitude = '5.29';//the longitude center of your coverage area
+$globalCenterLongitude = '5.29'; //the longitude center of your coverage area
 
 $globalLiveZoom = '9'; //default zoom on Live Map
 $globalAirportZoom = '7'; //default zoom to begin to display airports icons
@@ -151,7 +151,7 @@ 
 $globalACARS = FALSE;
 $globalACARSHost = '0.0.0.0'; // Local IP to listen
 $globalACARSPort = '9999';
-$globalACARSArchive = array('10','80','81','82','3F'); // labels of messages to archive
+$globalACARSArchive = array('10', '80', '81', '82', '3F'); // labels of messages to archive
 $globalACARSArchiveKeepMonths = '0';
 
 //APRS configuration (for glidernet)
@@ -248,7 +248,7 @@ 
 //Check by aircraft ICAO if image is not found by registration
 $globalAircraftImageCheckICAO = TRUE;
 //Sources for Aircraft image
-$globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters','customsources');
+$globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters', 'customsources');
 // Custom source configuration {registration} will be replaced by aircraft registration (exif get copyright from exif data for each pic)
 // example of config : $globalAircraftImageCustomSources = array('thumbnail' => 'http://pics.myurl.com/thumbnail/{registration}.jpg','original' => 'http://myurl/original/{registration}.jpg','source_website' => 'https://www.myurl.com', 'source' => 'customsite', 'copyright' => 'myself','exif' => true);
 // ************************
@@ -257,7 +257,7 @@ 
 //Retrieve Image from externals sources
 $globalMarineImageFetch = TRUE;
 //Sources for Marine image
-$globalMarineImageSources = array('wikimedia','flickr','deviantart','bing','customsources');
+$globalMarineImageSources = array('wikimedia', 'flickr', 'deviantart', 'bing', 'customsources');
 // Custom source configuration {mmsi} will be replaced by vessel mmsi, {name} by it's name (exif get copyright from exif data for each pic)
 // example of config : $globalMarineImageCustomSources = array('thumbnail' => 'http://pics.myurl.com/thumbnail/{name}.jpg','original' => 'http://myurl/original/{name}.jpg','source_website' => 'https://www.myurl.com', 'source' => 'customsite', 'copyright' => 'myself','exif' => true);
 // ************************
@@ -265,7 +265,7 @@ 
 //Retrieve schedules from externals sources (set to FALSE for IVAO or if $globalFork = FALSE)
 $globalSchedulesFetch = TRUE;
 //Sources for airline schedule if not official airline site
-$globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
+$globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
 
 //Retrieve translation from external sources (set to FALSE for IVAO)
 $globalTranslationFetch = TRUE;

require/class.Stats.php

Spacing +375 added lines, -375 removed lines

@@ -18,14 +18,14 @@ 
 		$this->db = $Connection->db();
         }
               
-	public function addLastStatsUpdate($type,$stats_date) {
+	public function addLastStatsUpdate($type, $stats_date) {
                 $query = "DELETE FROM config WHERE name = :type;
             		INSERT INTO config (name,value) VALUES (:type,:stats_date);";
-                $query_values = array('type' => $type,':stats_date' => $stats_date);
+                $query_values = array('type' => $type, ':stats_date' => $stats_date);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -35,7 +35,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':type' => $type));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -55,7 +55,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -68,7 +68,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 
@@ -76,7 +76,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -86,69 +86,69 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
         }
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
                 $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
         }
-	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
+	public function getAllManufacturers($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
                 $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
         }
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
                 $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
         }
 
-	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
+	public function getAllOwnerNames($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
                 $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
         }
 
-	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
+	public function getAllPilotNames($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
                 $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -156,7 +156,7 @@ 
         }
 
 
-	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
+	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -164,24 +164,24 @@ 
 			else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		} else $all = array();
                 if (empty($all)) {
-            	    $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+            	    $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
             	    if ($filter_name != '') {
-            		    $filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            		    $filters = array_merge($filters, $globalStatsFilters[$filter_name]);
             	    }
             	    $Spotter = new Spotter($this->db);
             	    //$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
-            	    $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
+            	    $all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
                 }
                 return $all;
 	}
-	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
+	public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -190,7 +190,7 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -198,16 +198,16 @@ 
                 if (empty($all)) {
             		$Spotter = new Spotter($this->db);
             		$filters = array();
-            		$filters = array('year' => $year,'month' => $month);
+            		$filters = array('year' => $year, 'month' => $month);
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
-            		$all = $Spotter->countAllAirlineCountries($limit,$filters);
+            		$all = $Spotter->countAllAirlineCountries($limit, $filters);
                 }
                 return $all;
 	}
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -215,16 +215,16 @@ 
 			else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		} else $all = array();
 		if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month);
@@ -233,7 +233,7 @@ 
 		return $all;
 	}
 
-	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
+	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -241,20 +241,20 @@ 
 			else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		} else $all = array();
                 if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
                 }
                 return $all;
 	}
@@ -265,15 +265,15 @@ 
 		else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
@@ -282,7 +282,7 @@ 
                 return $all;
 	}
 
-	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
+	public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -291,7 +291,7 @@ 
 			if (isset($forsource)) {
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
-				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
+				$query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource);
 			} else {
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
@@ -300,7 +300,7 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -308,16 +308,16 @@ 
                 if (empty($all)) {
 	                $Spotter = new Spotter($this->db);
             		$filters = array();
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
                 }
                 return $all;
 	}
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -325,24 +325,24 @@ 
 			else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		} else $all = array();
                 if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 	                $Spotter = new Spotter($this->db);
     		        //$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
-    		        $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
+    		        $all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
                 }
                 return $all;
 	}
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -350,24 +350,24 @@ 
 			else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
 			 try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		} else $all = array();
 		if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
 		}
 		return $all;
 	}
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		$Connection = new Connection();
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($Connection->tableExists('countries')) {
@@ -376,8 +376,8 @@ 
 				else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
 				 try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -393,7 +393,7 @@ 
 			return array();
 		}
 	}
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -401,25 +401,25 @@ 
 			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		} else $all = array();
 		if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllPilots($limit,0,'',$filters);
+			$all = $Spotter->countAllPilots($limit, 0, '', $filters);
 		}
 		return $all;
 	}
 
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -427,24 +427,24 @@ 
 			else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		} else $all = array();
                 if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
             		//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
-            		$all = $Spotter->countAllOwners($limit,0,'',$filters);
+            		$all = $Spotter->countAllOwners($limit, 0, '', $filters);
                 }
                 return $all;
 	}
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -452,22 +452,22 @@ 
 			else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		} else $all = array();
                 if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
-            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
-        		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
+            		$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
+        		$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
         		$all = array();
         		foreach ($pall as $value) {
         			$icao = $value['airport_departure_icao'];
@@ -484,11 +484,11 @@ 
         		foreach ($all as $key => $row) {
         			$count[$key] = $row['airport_departure_icao_count'];
         		}
-        		array_multisort($count,SORT_DESC,$all);
+        		array_multisort($count, SORT_DESC, $all);
                 }
                 return $all;
 	}
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -496,22 +496,22 @@ 
 			else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		} else $all = array();
 		if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 //			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month);
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
         		$all = array();
         		foreach ($pall as $value) {
         			$icao = $value['airport_arrival_icao'];
@@ -528,12 +528,12 @@ 
         		foreach ($all as $key => $row) {
         			$count[$key] = $row['airport_arrival_icao_count'];
         		}
-        		array_multisort($count,SORT_DESC,$all);
+        		array_multisort($count, SORT_DESC, $all);
                 }
  
                 return $all;
 	}
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
@@ -543,18 +543,18 @@ 
 			if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 			else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		}
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_data);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
             		$all = $Spotter->countAllMonthsLastYear($filters);
@@ -563,29 +563,29 @@ 
                 return $all;
 	}
 	
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_data);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
             		$all = $Spotter->countAllDatesLastMonth($filters);
                 }
                 return $all;
 	}
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
@@ -593,40 +593,40 @@ 
 		} else {
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		}
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_data);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
             		$all = $Spotter->countAllDatesLast7Days($filters);
                 }
                 return $all;
 	}
-	public function countAllDates($stats_airline = '',$filter_name = '') {
+	public function countAllDates($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC";
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_data);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
             		$all = $Spotter->countAllDates($filters);
@@ -641,21 +641,21 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_data);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
             		$filters = array();
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
             		$all = $Spotter->countAllDatesByAirlines($filters);
                 }
                 return $all;
 	}
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
@@ -666,7 +666,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -674,7 +674,7 @@ 
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
             		$all = $Spotter->countAllMonths($filters);
@@ -692,7 +692,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -713,7 +713,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -731,21 +731,21 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
             		$filters = array();
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
             		$all = $Spotter->countAllMilitaryMonths($filters);
                 }
                 return $all;
 	}
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -762,30 +762,30 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllHours($orderby,$filters);
+            		$all = $Spotter->countAllHours($orderby, $filters);
                 }
                 return $all;
 	}
 	
-	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
+	public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '') $year = date('Y');
-		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
+		$all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month);
 		if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
@@ -793,16 +793,16 @@ 
 		}
 		return $all;
 	}
-	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
+	public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '') $year = date('Y');
-		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
+		$all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month);
 		if (empty($all)) {
 		        $filters = array();
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
@@ -810,15 +810,15 @@ 
 		}
 		return $all;
 	}
-	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
+	public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '') $year = date('Y');
-		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
+		$all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month);
 		if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallArrival($filters,$year,$month);
@@ -826,24 +826,24 @@ 
 		}
 		return $all;
 	}
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
 			$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline));
-			} catch(PDOException $e) {
+				$sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 			$all = $result[0]['nb'];
-		} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+		} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
 		if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallAircrafts($filters,$year,$month);
@@ -851,7 +851,7 @@ 
 		}
 		return $all;
 	}
-	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
+	public function countOverallAirlines($filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -859,17 +859,17 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 			$all = $result[0]['nb_airline'];
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
+		} else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month);
 		if (empty($all)) {
             		$filters = array();
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
@@ -877,7 +877,7 @@ 
 		}
 		return $all;
 	}
-	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
+	public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -886,18 +886,18 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 			$all = $result[0]['nb'];
 		} else {
-			$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
+			$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
 		}
 		if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallOwners($filters,$year,$month);
@@ -905,7 +905,7 @@ 
 		}
 		return $all;
 	}
-	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		//if ($year == '') $year = date('Y');
@@ -915,18 +915,18 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 			$all = $result[0]['nb'];
 		} else {
-			$all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month);
+			$all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month);
 		}
 		if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallPilots($filters,$year,$month);
@@ -935,67 +935,67 @@ 
 		return $all;
 	}
 
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
-		$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
+		$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
 	}
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
                 $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
-                $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+                $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
         }
-	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
+	public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
                 $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
-                $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+                $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
         }
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
     		global $globalArchiveMonths, $globalDBdriver;
     		if ($globalDBdriver == 'mysql') {
     			if ($month == '') {
 				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
-				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 			} else {
 				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
-				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
+				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
 			}
 		} else {
 			if ($month == '') {
 				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
-				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 			} else {
 				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
-				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
+				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
 			}
                 }
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1013,7 +1013,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1030,7 +1030,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1047,7 +1047,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1064,20 +1064,20 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all[0]['total'];
         }
-	public function getStatsOwner($owner_name,$filter_name = '') {
+	public function getStatsOwner($owner_name, $filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1095,20 +1095,20 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all[0]['total'];
         }
-	public function getStatsPilot($pilot,$filter_name = '') {
+	public function getStatsPilot($pilot, $filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1116,7 +1116,7 @@ 
                 else return 0;
         }
 
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
@@ -1124,15 +1124,15 @@ 
                 } else {
 			$query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+                $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
@@ -1141,11 +1141,11 @@ 
             		//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
                 }
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+                $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -1169,75 +1169,75 @@ 
         }
         */
 
-	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
+	public function getStatsSource($stats_type, $year = '', $month = '', $day = '') {
 		global $globalDBdriver;
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
 		$query_values = array();
 		if ($globalDBdriver == 'mysql') {
 			if ($year != '') {
 				$query .= ' AND YEAR(stats_date) = :year';
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 			if ($month != '') {
 				$query .= ' AND MONTH(stats_date) = :month';
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 			if ($day != '') {
 				$query .= ' AND DAY(stats_date) = :day';
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		} else {
 			if ($year != '') {
 				$query .= ' AND EXTRACT(YEAR FROM stats_date) = :year';
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 			if ($month != '') {
 				$query .= ' AND EXTRACT(MONTH FROM stats_date) = :month';
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 			if ($day != '') {
 				$query .= ' AND EXTRACT(DAY FROM stats_date) = :day';
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " ORDER BY source_name";
-		$query_values = array_merge($query_values,array(':stats_type' => $stats_type));
+		$query_values = array_merge($query_values, array(':stats_type' => $stats_type));
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
 
-	public function addStatSource($data,$source_name,$stats_type,$date) {
+	public function addStatSource($data, $source_name, $stats_type, $date) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
 		} else {
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; 
                 }
-                $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
+                $query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
                 $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
-                $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+                $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1252,15 +1252,15 @@ 
 				$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
 		}
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
+                $query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1275,15 +1275,15 @@ 
 				$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; 
 			}
 		}
-                $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
+                $query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1298,15 +1298,15 @@ 
 				$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);"; 
 			}
 		}
-                $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
+                $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1321,15 +1321,15 @@ 
 				$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
 		}
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
+                $query_values = array(':aircraft_icao' => $aircraft_icao, ':aircraft_name' => $aircraft_name, ':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1344,15 +1344,15 @@ 
 				$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; 
 			}
 		}
-                $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
+                $query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1367,15 +1367,15 @@ 
 				$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
 		}
-                $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+                $query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1390,15 +1390,15 @@ 
 				$query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; 
 			}
 		}
-                $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
+                $query_values = array(':pilot_id' => $pilot_id, ':cnt' => $cnt, ':pilot_name' => $pilot_name, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':format_source' => $format_source);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -1414,16 +1414,16 @@ 
 					$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
 				}
 			}
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
                 }
         }
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -1431,16 +1431,16 @@ 
 			} else {
 				$query = "UPDATE stats_airport SET departure = :departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 			 try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
                 }
         }
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -1456,16 +1456,16 @@ 
 					$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
 				}
 			}
-	                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+	                $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 			 try {
                     		$sth = $this->db->prepare($query);
 	                        $sth->execute($query_values);
-    		        } catch(PDOException $e) {
+    		        } catch (PDOException $e) {
             		        return "error : ".$e->getMessage();
 	                }
 	        }
         }
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -1473,11 +1473,11 @@ 
 			} else {
 				$query = "UPDATE stats_airport SET arrival = :arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
                 }
@@ -1489,7 +1489,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -1499,7 +1499,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -1509,13 +1509,13 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
         
         public function addOldStats() {
-    		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
+    		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents;
     		$Common = new Common();
     		$Connection = new Connection();
     		date_default_timezone_set('UTC');
@@ -1533,41 +1533,41 @@ 
 			$Spotter = new Spotter($this->db);
 
 			if ($globalDebug) echo 'Count all aircraft types...'."\n";
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset);
 			}
 			if ($globalDebug) echo 'Count all airlines...'."\n";
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all registrations...'."\n";
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset);
 			}
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all owners...'."\n";
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset);
 			}
 			if ($globalDebug) echo 'Count all pilots...'."\n";
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
 				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset);
 			}
 			
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
-        		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
+        		$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order departure airports...'."\n";
 	        	$alldata = array();
 	        	
@@ -1585,14 +1585,14 @@ 
     			foreach ($alldata as $key => $row) {
     				$count[$key] = $row['airport_departure_icao_count'];
         		}
-			array_multisort($count,SORT_DESC,$alldata);
+			array_multisort($count, SORT_DESC, $alldata);
 			foreach ($alldata as $number) {
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset);
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', '', $reset);
 			}
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
-        		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
+        		$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
 	        	$alldata = array();
     			foreach ($pall as $value) {
@@ -1609,18 +1609,18 @@ 
         		foreach ($alldata as $key => $row) {
         			$count[$key] = $row['airport_arrival_icao_count'];
 	        	}
-    			array_multisort($count,SORT_DESC,$alldata);
+    			array_multisort($count, SORT_DESC, $alldata);
                         foreach ($alldata as $number) {
-				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
+				echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', '', $reset);
 			}
 			if ($Connection->tableExists('countries')) {
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
 				//$SpotterArchive = new SpotterArchive();
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
 				$Spotter = new Spotter($this->db);
-				$alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day);
+				$alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day);
 				foreach ($alldata as $number) {
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset);
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset);
 				}
 			}
 			
@@ -1630,12 +1630,12 @@ 
 				$this->deleteStatsByType('fatalities_byyear');
 				$alldata = $Accident->countFatalitiesByYear();
 				foreach ($alldata as $number) {
-					$this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year'])));
+					$this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year'])));
 				}
 				$this->deleteStatsByType('fatalities_bymonth');
 				$alldata = $Accident->countFatalitiesLast12Months();
 				foreach ($alldata as $number) {
-					$this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year'])));
+					$this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year'])));
 				}
 			}
 
@@ -1651,37 +1651,37 @@ 
 			$lastyear = false;
 			foreach ($alldata as $number) {
 				if ($number['year_name'] != date('Y')) $lastyear = true;
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('airlines_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Airports data...'."\n";
 			if ($globalDebug) echo '...Departure'."\n";
@@ -1726,7 +1726,7 @@ 
     			}
     			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
 			}
 			echo '...Arrival'."\n";
 			$pall = $Spotter->getLast7DaysAirportsArrival();
@@ -1768,7 +1768,7 @@ 
     			}
     			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
 			}
 
 			echo 'Flights data...'."\n";
@@ -1776,28 +1776,28 @@ 
 			echo '-> countAllDatesLastMonth...'."\n";
 			$alldata = $Spotter->countAllDatesLastMonth($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
 			}
 			echo '-> countAllDates...'."\n";
 			$previousdata = $this->countAllDates();
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
 			$this->deleteStatFlight('date');
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month));
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month));
 			$values = array();
 			foreach ($alldata as $cnt) {
 				$values[] = $cnt['date_count'];
 			}
-			array_multisort($values,SORT_DESC,$alldata);
-			array_splice($alldata,11);
+			array_multisort($values, SORT_DESC, $alldata);
+			array_splice($alldata, 11);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
 			}
 			
 			$this->deleteStatFlight('hour');
 			echo '-> countAllHours...'."\n";
-			$alldata = $Spotter->countAllHours('hour',$filter_last_month);
+			$alldata = $Spotter->countAllHours('hour', $filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
 			}
 
 
@@ -1808,42 +1808,42 @@ 
 				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
 				$SpotterArchive = new SpotterArchive();
 				//$Spotter = new Spotter($this->db);
-				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
+				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day);
 				//$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
 				foreach ($alldata as $number) {
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset);
 				}
 			}
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
 			$Spotter = new Spotter($this->db);
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset);
 			}
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
-       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
+       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
 	        	//$alldata = array();
     			foreach ($dall as $value) {
@@ -1863,12 +1863,12 @@ 
     			}
     			$alldata = $pall;
 			foreach ($alldata as $number) {
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset);
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
-        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
+        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
 	        	//$alldata = array();
     			foreach ($dall as $value) {
@@ -1888,7 +1888,7 @@ 
     			}
     			$alldata = $pall;
                         foreach ($alldata as $number) {
-				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
+				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
 			$Spotter = new Spotter($this->db);
@@ -1896,27 +1896,27 @@ 
 			$lastyear = false;
 			foreach ($alldata as $number) {
 				if ($number['year_name'] != date('Y')) $lastyear = true;
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo '...Departure'."\n";
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
@@ -1939,7 +1939,7 @@ 
     			}
     			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], $number['airline_icao']);
 			}
 			if ($globalDebug) echo '...Arrival'."\n";
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
@@ -1962,32 +1962,32 @@ 
     			}
     			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], $number['airline_icao']);
 			}
 
 			if ($globalDebug) echo 'Flights data...'."\n";
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
 			}
 			if ($globalDebug) echo '-> countAllDates...'."\n";
 			//$previousdata = $this->countAllDatesByAirlines();
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month));
 			$values = array();
 			foreach ($alldata as $cnt) {
 				$values[] = $cnt['date_count'];
 			}
-			array_multisort($values,SORT_DESC,$alldata);
-			array_splice($alldata,11);
+			array_multisort($values, SORT_DESC, $alldata);
+			array_splice($alldata, 11);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
 			}
 			
 			if ($globalDebug) echo '-> countAllHours...'."\n";
-			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
+			$alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
 			}
 			
 
@@ -2011,7 +2011,7 @@ 
 						$last_update_day = date('Y').'-01-01 00:00:00';
 					}
 				}
-				if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) {
+				if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) {
 					$last_update_day = date('Y').'-01-01 00:00:00';
 					$reset = true;
 				}
@@ -2020,32 +2020,32 @@ 
 				// Count by filter
 				if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
 				$Spotter = new Spotter($this->db);
-				$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
+					$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset);
 				}
-				$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
+					$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset);
 				}
-				$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
+					$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset);
 				}
-				$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
+					$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset);
 				}
-				$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
+					$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset);
 				}
-				$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
+					$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset);
 				}
-				$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
-	       			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
+				$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
+	       			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
 		        	$alldata = array();
 	    			foreach ($pall as $value) {
 		        		$icao = $value['airport_departure_icao'];
@@ -2061,12 +2061,12 @@ 
     				foreach ($alldata as $key => $row) {
     					$count[$key] = $row['airport_departure_icao_count'];
     				}
-				array_multisort($count,SORT_DESC,$alldata);
+				array_multisort($count, SORT_DESC, $alldata);
 				foreach ($alldata as $number) {
-    					echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset);
+    					echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', $filter_name, $reset);
 				}
-				$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
-    				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
+				$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter);
+    				$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter);
 				$alldata = array();
     				foreach ($pall as $value) {
 		        		$icao = $value['airport_arrival_icao'];
@@ -2082,40 +2082,40 @@ 
         			foreach ($alldata as $key => $row) {
     					$count[$key] = $row['airport_arrival_icao_count'];
 		        	}
-        			array_multisort($count,SORT_DESC,$alldata);
+        			array_multisort($count, SORT_DESC, $alldata);
 				foreach ($alldata as $number) {
-					echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset);
+					echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', $filter_name, $reset);
 				}
 				$Spotter = new Spotter($this->db);
 				$alldata = $Spotter->countAllMonths($filter);
 				$lastyear = false;
 				foreach ($alldata as $number) {
 					if ($number['year_name'] != date('Y')) $lastyear = true;
-					$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				$alldata = $Spotter->countAllMonthsOwners($filter);
 				foreach ($alldata as $number) {
-					$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				$alldata = $Spotter->countAllMonthsPilots($filter);
 				foreach ($alldata as $number) {
-					$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				$alldata = $Spotter->countAllMilitaryMonths($filter);
 				foreach ($alldata as $number) {
-					$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				$alldata = $Spotter->countAllMonthsAircrafts($filter);
 				foreach ($alldata as $number) {
-					$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				$alldata = $Spotter->countAllMonthsRealArrivals($filter);
 				foreach ($alldata as $number) {
-					$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				echo '...Departure'."\n";
-				$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
-        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
+				$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
+        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
 				foreach ($dall as $value) {
     					$icao = $value['departure_airport_icao'];
     					$ddate = $value['date'];
@@ -2133,11 +2133,11 @@ 
     				}
 	    			$alldata = $pall;
 				foreach ($alldata as $number) {
-					$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],'',$filter_name);
+					$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], '', $filter_name);
 				}
 				echo '...Arrival'."\n";
-				$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
-    				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
+				$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
+    				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
 				foreach ($dall as $value) {
 					$icao = $value['arrival_airport_icao'];
 					$ddate = $value['date'];
@@ -2155,40 +2155,40 @@ 
     				}
     				$alldata = $pall;
 				foreach ($alldata as $number) {
-					$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],'',$filter_name);
+					$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], '', $filter_name);
 				}
     
 				echo 'Flights data...'."\n";
 				echo '-> countAllDatesLastMonth...'."\n";
 				$alldata = $Spotter->countAllDatesLastMonth($filter);
 				foreach ($alldata as $number) {
-					$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
+					$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
 				}
 				echo '-> countAllDates...'."\n";
-				$previousdata = $this->countAllDates('',$filter_name);
-				$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
+				$previousdata = $this->countAllDates('', $filter_name);
+				$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
 				$values = array();
 				foreach ($alldata as $cnt) {
 					$values[] = $cnt['date_count'];
 				}
-				array_multisort($values,SORT_DESC,$alldata);
-				array_splice($alldata,11);
+				array_multisort($values, SORT_DESC, $alldata);
+				array_splice($alldata, 11);
 				foreach ($alldata as $number) {
-					$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
+					$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
 				}
 				
 				echo '-> countAllHours...'."\n";
-				$alldata = $Spotter->countAllHours('hour',$filter);
+				$alldata = $Spotter->countAllHours('hour', $filter);
 				foreach ($alldata as $number) {
-					$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
+					$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
 				}
 				echo 'Insert last stats update date...'."\n";
 				date_default_timezone_set('UTC');
-				$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s'));
+				$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s'));
 				if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) {
-					if (date('Y',strtotime($last_update_day)) != date('Y')) {
+					if (date('Y', strtotime($last_update_day)) != date('Y')) {
 						$this->deleteOldStats($filter_name);
-						$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00');
+						$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00');
 					}
 				}
 
@@ -2201,16 +2201,16 @@ 
 				// SUM all previous month to put as year
 				$previous_year = date('Y');
 				$previous_year--;
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
 				$allairlines = $this->getAllAirlineNames();
 				foreach ($allairlines as $data) {
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
 				}
 				
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
@@ -2219,7 +2219,7 @@ 
 						try {
 							$sth = $this->db->prepare($query);
 							$sth->execute();
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
 						}
 					}
@@ -2228,15 +2228,15 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
 					}
 				}
 				if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) {
 					$last_update = $this->getLastStatsUpdate('last_update_stats');
-					if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) {
+					if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) {
 						$this->deleteOldStats();
-						$this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00');
+						$this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00');
 						$lastyearupdate = true;
 					}
 				}
@@ -2258,7 +2258,7 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -2272,14 +2272,14 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 			}
 			if (!isset($lastyearupdate)) {
 				echo 'Insert last stats update date...'."\n";
 				date_default_timezone_set('UTC');
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
 			}
 			if ($globalStatsResetYear) {
 				require_once(dirname(__FILE__).'/../install/class.settings.php');