Ysurac / FlightAirMap

require/class.APRS.php

Indentation +166 added lines, -166 removed lines

@@ -3,10 +3,10 @@ 
 require_once(dirname(__FILE__).'/class.Common.php');
 require_once(dirname(__FILE__).'/class.GeoidHeight.php');
 class aprs {
-    private $socket;
-    private $connected = false;
+	private $socket;
+	private $connected = false;
 
-    protected $symbols = array('/!' => 'Police',
+	protected $symbols = array('/!' => 'Police',
 	'/#' => 'DIGI',
 	'/$' => 'Phone',
 	'/%' => 'DX Cluster',
@@ -166,13 +166,13 @@ 
 	'\~' => 'TNC Stream SW');
 	
 
-    private function urshift($n, $s) {
+	private function urshift($n, $s) {
 	return ($n >= 0) ? ($n >> $s) :
-	    (($n & 0x7fffffff) >> $s) | 
+		(($n & 0x7fffffff) >> $s) | 
 		(0x40000000 >> ($s - 1));
-    }
+	}
 
-    public function parse($input) {
+	public function parse($input) {
 	global $globalDebug;
 	$debug = false;
 	$result = array();
@@ -184,8 +184,8 @@ 
 	
 	/* Check that end was found and body has at least one byte. */
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
-	    if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
-	    return false;
+		if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
+		return false;
 	}
 	
 	if ($debug) echo 'input : '.$input."\n";
@@ -199,34 +199,34 @@ 
 	/* Parse source, target and path. */
 	//FLRDF0A52>APRS,qAS,LSTB
 	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
-	    $ident = $matches[1];
-	    $all_elements = $matches[2];
-	    if ($ident == 'AIRCRAFT') {
+		$ident = $matches[1];
+		$all_elements = $matches[2];
+		if ($ident == 'AIRCRAFT') {
 		$result['format_source'] = 'famaprs';
 		$result['source_type'] = 'modes';
-	    } elseif ($ident == 'MARINE') {
+		} elseif ($ident == 'MARINE') {
 		$result['format_source'] = 'famaprs';
 		$result['source_type'] = 'ais';
-	    } else {
+		} else {
 		if ($debug) echo 'ident : '.$ident."\n";
 		$result['ident'] = $ident;
-	    }
+		}
 	} else {
-	    if ($debug) 'No ident'."\n";
-	    return false;
+		if ($debug) 'No ident'."\n";
+		return false;
 	}
 	$elements = explode(',',$all_elements);
 	$source = end($elements);
 	$result['source'] = $source;
 	foreach ($elements as $element) {
-	    if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
-	        //echo "ok";
-	        //if ($element == 'TCPIP*') return false;
-	    } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
+		if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
+			//echo "ok";
+			//if ($element == 'TCPIP*') return false;
+		} elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
 		if ($debug) echo 'element : '.$element."\n";
 		return false;
-	    }
-	    /*
+		}
+		/*
 	    } elseif (preg_match('/^([0-9A-F]{32})$/',$element)) {
 		//echo "ok";
 	    } else {
@@ -253,48 +253,48 @@ 
 	$body_parse = substr($body,1);
 	//echo 'Body : '.$body."\n";
 	if (preg_match('/^;(.){9}\*/',$body,$matches)) {
-	    $body_parse = substr($body_parse,10);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$body_parse = substr($body_parse,10);
+		$find = true;
+		//echo $body_parse."\n";
 	}
 	if (preg_match('/^`(.*)\//',$body,$matches)) {
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$body_parse = substr($body_parse,strlen($matches[1])-1);
+		$find = true;
+		//echo $body_parse."\n";
 	}
 	if (preg_match("/^'(.*)\//",$body,$matches)) {
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$body_parse = substr($body_parse,strlen($matches[1])-1);
+		$find = true;
+		//echo $body_parse."\n";
 	}
 	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
-	    $find = true;
-	    //print_r($matches);
-	    $timestamp = $matches[0];
-	    if ($matches[4] == 'h') {
+		$find = true;
+		//print_r($matches);
+		$timestamp = $matches[0];
+		if ($matches[4] == 'h') {
 		$timestamp = strtotime(date('Ymd').' '.$matches[1].':'.$matches[2].':'.$matches[3]);
 		//echo 'timestamp : '.$timestamp.' - now : '.time()."\n";
 		/*
 		if (time() + 3900 < $timestamp) $timestamp -= 86400;
 		elseif (time() - 82500 > $timestamp) $timestamp += 86400;
 		*/
-	    } elseif ($matches[4] == 'z' || $matches[4] == '/') {
+		} elseif ($matches[4] == 'z' || $matches[4] == '/') {
 		// This work or not ?
 		$timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]);
-	    }
-	    $body_parse = substr($body_parse,7);
-	    $result['timestamp'] = $timestamp;
-	    //echo date('Ymd H:i:s',$timestamp);
+		}
+		$body_parse = substr($body_parse,7);
+		$result['timestamp'] = $timestamp;
+		//echo date('Ymd H:i:s',$timestamp);
 	}
 	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) {
-	    $find = true;
-	    $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
-	    $body_parse = substr($body_parse,8);
-	    $result['timestamp'] = $timestamp;
-	    //echo date('Ymd H:i:s',$timestamp);
+		$find = true;
+		$timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
+		$body_parse = substr($body_parse,8);
+		$result['timestamp'] = $timestamp;
+		//echo date('Ymd H:i:s',$timestamp);
 	}
 	//if (strlen($body_parse) > 19) {
-	    if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
+		if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
 		$find = true;
 		// 4658.70N/00707.78Ez
 		//print_r(str_split($body_parse));
@@ -313,7 +313,7 @@ 
 		$lon = intval($lon_deg);
 		if ($lat > 89 || $lon > 179) return false;
 	    
-	    /*
+		/*
 	    $tmp_5b = str_replace('.','',$lat_min);
 	    if (preg_match('/^([0-9]{0,4})( {0,4})$/',$tmp_5b,$matches)) {
 	        print_r($matches);
@@ -327,9 +327,9 @@ 
 		$result['longitude'] = $longitude;
 		$body_parse = substr($body_parse,18);
 		$body_parse_len = strlen($body_parse);
-	    }
-	    $body_parse_len = strlen($body_parse);
-	    if ($body_parse_len > 0) {
+		}
+		$body_parse_len = strlen($body_parse);
+		if ($body_parse_len > 0) {
 		/*
 		if (!isset($result['timestamp']) && !isset($result['latitude'])) {
 			$body_split = str_split($body);
@@ -363,95 +363,95 @@ 
 			if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
 			if ($symbol_code != '_') {
 			}
-		    //$body_parse = substr($body_parse,1);
-		    //$body_parse = trim($body_parse);
-		    //$body_parse_len = strlen($body_parse);
-		    if ($body_parse_len >= 7) {
+			//$body_parse = substr($body_parse,1);
+			//$body_parse = trim($body_parse);
+			//$body_parse_len = strlen($body_parse);
+			if ($body_parse_len >= 7) {
 			
-		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
-		    	    $course = substr($body_parse,0,3);
-		    	    $tmp_s = intval($course);
-		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
-		    	    $speed = substr($body_parse,4,3);
-		    	    if ($speed != '...') {
-		    		//$result['speed'] = round($speed*1.852);
-		    		$result['speed'] = intval($speed);
-		    	    }
-		    	    $body_parse = substr($body_parse,7);
-		        }
-		        // Check PHGR, PHG, RNG
-		    } 
-		    /*
+				if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
+					$course = substr($body_parse,0,3);
+					$tmp_s = intval($course);
+					if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
+					$speed = substr($body_parse,4,3);
+					if ($speed != '...') {
+					//$result['speed'] = round($speed*1.852);
+					$result['speed'] = intval($speed);
+					}
+					$body_parse = substr($body_parse,7);
+				}
+				// Check PHGR, PHG, RNG
+			} 
+			/*
 		    else if ($body_parse_len > 0) {
 			$rest = $body_parse;
 		    }
 		    */
-		    if (strlen($body_parse) > 0) {
-		        if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
-		            $altitude = intval($matches[1]);
-		            //$result['altitude'] = round($altitude*0.3048);
-		            $result['altitude'] = $altitude;
-		            //$body_parse = trim(substr($body_parse,strlen($matches[0])));
-		            $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
-		        }
-		    }
+			if (strlen($body_parse) > 0) {
+				if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
+					$altitude = intval($matches[1]);
+					//$result['altitude'] = round($altitude*0.3048);
+					$result['altitude'] = $altitude;
+					//$body_parse = trim(substr($body_parse,strlen($matches[0])));
+					$body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
+				}
+			}
 		    
-		    // Telemetry
-		    /*
+			// Telemetry
+			/*
 		    if (preg_match('/^([0-9]+),(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,([01]{0,8})/',$body_parse,$matches)) {
 		        // Nothing yet...
 		    }
 		    */
-		    // DAO
+			// DAO
 		    
-		    if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
+			if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
 			    
-			    $dao = $matches[1];
-			    if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
+				$dao = $matches[1];
+				if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
 				$dao_split = str_split($dao);
-			        $lat_off = (($dao_split[1])-48.0)*0.001/60.0;
-			        $lon_off = (($dao_split[2])-48.0)*0.001/60.0;
+					$lat_off = (($dao_split[1])-48.0)*0.001/60.0;
+					$lon_off = (($dao_split[2])-48.0)*0.001/60.0;
 			    
 				if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
 				else $result['latitude'] += $lat_off;
 				if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
 				else $result['longitude'] += $lon_off;
-			    }
+				}
 			    
-		            $body_parse = substr($body_parse,6);
-		    }
-		    echo 'bodyparse : '.$body_parse."\n";
-		    if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) {
+					$body_parse = substr($body_parse,6);
+			}
+			echo 'bodyparse : '.$body_parse."\n";
+			if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) {
 			$result['ident'] = str_replace('_',' ',$matches[1]);
-		    }
-		    if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
+			}
+			if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
 			$result['squawk'] = $matches[1];
-		    }
-		    if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
+			}
+			if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
 			$result['aircraft_icao'] = $matches[1];
-		    }
-		    if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) {
+			}
+			if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) {
 			$result['verticalrate'] = $matches[1];
-		    }
-		    if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
+			}
+			if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
 			$result['typeid'] = $matches[1];
-		    }
-		    if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
+			}
+			if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
 			$result['statusid'] = $matches[1];
-		    }
-		    if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
+			}
+			if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
 			$result['imo'] = $matches[1];
-		    }
-		    if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
+			}
+			if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
 			$result['arrival_date'] = $matches[1];
-		    }
-		    if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) {
+			}
+			if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) {
 			$result['arrival_code'] = str_replace('_',' ',$matches[1]);
-		    }
-		    // OGN comment
+			}
+			// OGN comment
 		   // echo "Before OGN : ".$body_parse."\n";
-		    //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
-		    if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
+			//if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
+			if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
 			$id = $matches[1];
 			//$mode = substr($id,0,2);
 			$address = substr($id,2);
@@ -481,42 +481,42 @@ 
 			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
 			$result['stealth'] = $stealth;
 			$result['address'] = $address;
-		    }
+			}
 		    
-		    //Comment
-		    $result['comment'] = trim($body_parse);
+			//Comment
+			$result['comment'] = trim($body_parse);
 		//} else {
-		    // parse weather
-		    //$body_parse = substr($body_parse,1);
-		    //$body_parse_len = strlen($body_parse);
-		    //echo 'weather'."\n";
-		    if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
-			    $result['wind_dir'] = intval($matches[1]);
-			    $result['wind_speed'] = round(intval($matches[2])*1.60934,1);
-			    $result['wind_gust'] = round(intval($matches[3])*1.60934,1);
-			    $result['temp'] = round(5/9*((intval($matches[4]))-32),1);
-		    	    $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+			// parse weather
+			//$body_parse = substr($body_parse,1);
+			//$body_parse_len = strlen($body_parse);
+			//echo 'weather'."\n";
+			if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+				$result['wind_dir'] = intval($matches[1]);
+				$result['wind_speed'] = round(intval($matches[2])*1.60934,1);
+				$result['wind_gust'] = round(intval($matches[3])*1.60934,1);
+				$result['temp'] = round(5/9*((intval($matches[4]))-32),1);
+					$body_parse = substr($body_parse,strlen($matches[0])+1);
+			} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
 			$result['wind_dir'] = intval($matches[1]);
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
 			$result['temp'] = round(5/9*(($matches[4])-32),1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
 			$result['wind_dir'] = intval($matches[1]);
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
 			$result['wind_dir'] = intval($matches[1]);
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    }
-		    //if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
-		    //g012t088r000p000P000h38b10110
-		    //g011t086r000p000P000h29b10198
-		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			}
+			//if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
+			//g012t088r000p000P000h38b10110
+			//g011t086r000p000P000h29b10198
+			if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
@@ -524,8 +524,8 @@ 
 			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
 			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
-		        $body_parse = substr($body_parse,strlen($matches[0]));
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0]));
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
@@ -533,8 +533,8 @@ 
 			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
 			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
-		        $body_parse = substr($body_parse,strlen($matches[0]));
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0]));
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
@@ -542,58 +542,58 @@ 
 			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
 			if ($matches[7] != '...') $result['humidity'] = intval($matches[7]);
 			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
-		        $body_parse = substr($body_parse,strlen($matches[0]));
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0]));
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
 			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
 			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
-		        $body_parse = substr($body_parse,strlen($matches[0]));
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0]));
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
 			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
 			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
-		        $body_parse = substr($body_parse,strlen($matches[0]));
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0]));
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
 			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
 			if ($matches[5] != '...') $result['humidity'] = intval($matches[5]);
 			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
-		        $body_parse = substr($body_parse,strlen($matches[0]));
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0]));
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
 			if ($matches[2] != '...') $result['humidity'] = intval($matches[3]);
 			if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1);
-		        $body_parse = substr($body_parse,strlen($matches[0]));
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0]));
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
 			if ($matches[4] != '...') $result['humidity'] = intval($matches[4]);
 			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
-		        $body_parse = substr($body_parse,strlen($matches[0]));
-		    }
-		    $result['comment'] = trim($body_parse);
+				$body_parse = substr($body_parse,strlen($matches[0]));
+			}
+			$result['comment'] = trim($body_parse);
 		}
 		} else $result['comment'] = trim($body_parse);
 
-	    }
+		}
 	//}
 	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
 	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
 	if ($debug) print_r($result);
 	return $result;
-    }
+	}
     
-    public function connect() {
+	public function connect() {
 	global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport;
 	$aprs_connect = 0;
 	$aprs_keep = 120;
@@ -617,24 +617,24 @@ 
 		socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE,1);
 		while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) {
 			if (strpos($msgin, "$aprs_ssid verified") !== FALSE) {
-			    echo 'APRS user verified !'."\n";
-			    $this->connected = true;
-			    return true;
-			    break;
+				echo 'APRS user verified !'."\n";
+				$this->connected = true;
+				return true;
+				break;
 			}
 			if (time()-$authstart > 5) {
-			    echo 'APRS timeout'."\n";
-			    break;
+				echo 'APRS timeout'."\n";
+				break;
 			}
 		}
 	}
-    }
+	}
 
-    public function disconnect() {
+	public function disconnect() {
 	socket_close($this->socket);
-    }
+	}
     
-    public function send($data) {
+	public function send($data) {
 	global $globalDebug;
 	if ($this->connected === false) $this->connect();
 	$send = socket_send( $this->socket  , $data , strlen($data),0);
@@ -643,7 +643,7 @@ 
 		socket_close($this->socket);
 		$this->connect();
 	}
-    }
+	}
 }
 
 class APRSSpotter extends APRS {

require/class.Stats.php

Braces +661 added lines, -231 removed lines

@@ -15,10 +15,14 @@ 
 	
 	public function __construct($dbc = null) {
 		global $globalFilterName;
-		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
+		if (isset($globalFilterName)) {
+			$this->filter_name = $globalFilterName;
+		}
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection. (Stats)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (Stats)');
+		}
 	}
 
 	public function addLastStatsUpdate($type,$stats_date) {
@@ -86,7 +90,9 @@ 
 
 	public function getAllAirlineNames($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
 		 try {
 			$sth = $this->db->prepare($query);
@@ -106,7 +112,9 @@ 
 		return $all;
 	}
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->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);
@@ -118,7 +126,9 @@ 
 		return $all;
 	}
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->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);
@@ -130,7 +140,9 @@ 
 		return $all;
 	}
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->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);
@@ -143,7 +155,9 @@ 
 	}
 
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->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);
@@ -156,7 +170,9 @@ 
 	}
 
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->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);
@@ -171,7 +187,9 @@ 
 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -180,8 +198,11 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+				if ($limit) {
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -189,11 +210,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+				if ($limit) {
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' 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));
@@ -201,7 +227,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -220,10 +248,15 @@ 
 	}
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
+			if ($limit) {
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
+			} else {
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
+			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':filter_name' => $filter_name));
@@ -231,7 +264,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
 		if (empty($all)) {
 			$Spotter = new Spotter($this->db);
 			$filters = array();
@@ -246,7 +281,9 @@ 
 	}
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -255,8 +292,11 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
+				if ($limit) {
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -264,11 +304,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $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 LIMIT 10 OFFSET 0";
-				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";
+				if ($limit) {
+					$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 LIMIT 10 OFFSET 0";
+				} 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));
@@ -276,7 +321,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -296,7 +343,9 @@ 
 
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -305,8 +354,11 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $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_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
-				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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
+				if ($limit) {
+					$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_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
+				} 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 IN ('".implode("','",$alliance_airlines)."') 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(':filter_name' => $filter_name));
@@ -314,11 +366,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $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_airport.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 LIMIT 10 OFFSET 0";
-				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";
+				if ($limit) {
+					$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_airport.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 LIMIT 10 OFFSET 0";
+				} 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));
@@ -326,7 +383,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -345,7 +404,9 @@ 
 	}
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -353,12 +414,18 @@ 
 			foreach ($airlines as $airline) {
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
-			if ($limit) $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.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
-			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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
+			if ($limit) {
+				$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.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
+			} 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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
+			}
 			$query_values = array(':filter_name' => $filter_name);
 		} else {
-			if ($limit) $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.name = 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 LIMIT 10 OFFSET 0";
-			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";
+			if ($limit) {
+				$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.name = 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 LIMIT 10 OFFSET 0";
+			} 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";
+			}
 			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
 		}
 		try {
@@ -386,17 +453,29 @@ 
 
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($globalVATSIM) $forsource = 'vatsim';
-			if ($globalIVAO) $forsource = 'ivao';
+			if ($globalVATSIM) {
+				$forsource = 'vatsim';
+			}
+			if ($globalIVAO) {
+				$forsource = 'ivao';
+			}
 			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";
+				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);
 			} 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";
+				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";
+				}
 				$query_values = array(':filter_name' => $filter_name);
 			}
 			try {
@@ -406,7 +485,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
                 if (empty($all)) {
 	                $Spotter = new Spotter($this->db);
             		$filters = array();
@@ -421,7 +502,9 @@ 
 	}
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -430,8 +513,11 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
-				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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
+				if ($limit) {
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
+				} 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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -439,11 +525,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration 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 LIMIT 10 OFFSET 0";
-				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";
+				if ($limit) {
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration 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 LIMIT 10 OFFSET 0";
+				} 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));
@@ -451,7 +542,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -470,7 +563,9 @@ 
 	}
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -479,8 +574,11 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
-				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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
+				if ($limit) {
+					$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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
+				} 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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
+				}
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -488,11 +586,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $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 LIMIT 10 OFFSET 0";
-				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";
+				if ($limit) {
+					$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 LIMIT 10 OFFSET 0";
+				} 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));
@@ -500,7 +603,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -519,7 +624,9 @@ 
 	}
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		$Connection = new Connection($this->db);
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($Connection->tableExists('countries')) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 				$Spotter = new Spotter($this->db);
@@ -529,8 +636,11 @@ 
 					foreach ($airlines as $airline) {
 						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 					}
-					if ($limit) $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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
-					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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
+					if ($limit) {
+						$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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
+					} 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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
+					}
 					 try {
 						$sth = $this->db->prepare($query);
 						$sth->execute(array(':filter_name' => $filter_name));
@@ -539,11 +649,16 @@ 
 					}
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 					return $all;
-				} else return array();
+				} else {
+					return array();
+				}
 			} else {
 				if ($year == '' && $month == '') {
-					if ($limit) $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 LIMIT 20 OFFSET 0";
-					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";
+					if ($limit) {
+						$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 LIMIT 20 OFFSET 0";
+					} 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));
@@ -552,7 +667,9 @@ 
 					}
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 					return $all;
-				} else return array();
+				} else {
+					return array();
+				}
 			}
 		} else {
 			/*
@@ -566,10 +683,15 @@ 
 	}
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($limit) $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 LIMIT 10 OFFSET 0";
-			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";
+			if ($limit) {
+				$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 LIMIT 10 OFFSET 0";
+			} 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));
@@ -577,7 +699,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
 			if ($filter_name != '') {
@@ -592,7 +716,9 @@ 
 
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -601,8 +727,11 @@ 
 				foreach ($airlines as $airline) {
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 				}
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
+				if ($limit) {
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -610,11 +739,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $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 LIMIT 10 OFFSET 0";
-				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";
+				if ($limit) {
+					$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 LIMIT 10 OFFSET 0";
+				} 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));
@@ -622,7 +756,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -641,7 +777,9 @@ 
 	}
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -650,8 +788,11 @@ 
 				foreach ($airlines as $airline) {
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 				}
-				if ($limit) $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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
-				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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+				if ($limit) {
+					$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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
+				} 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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -659,11 +800,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $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 LIMIT 10 OFFSET 0";
-				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";
+				if ($limit) {
+					$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 LIMIT 10 OFFSET 0";
+				} 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));
@@ -671,7 +817,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -696,7 +844,9 @@ 
 				$icao = $value['airport_departure_icao'];
 				if (isset($all[$icao])) {
 					$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-				} else $all[$icao] = $value;
+				} else {
+					$all[$icao] = $value;
+				}
 			}
 			$count = array();
 			foreach ($all as $key => $row) {
@@ -708,7 +858,9 @@ 
 	}
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -717,8 +869,11 @@ 
 				foreach ($airlines as $airline) {
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 				}
-				if ($limit) $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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
-				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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+				if ($limit) {
+					$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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
+				} 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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -726,11 +881,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $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 LIMIT 10 OFFSET 0";
-				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";
+				if ($limit) {
+					$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 LIMIT 10 OFFSET 0";
+				} 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));
@@ -738,7 +898,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -763,7 +925,9 @@ 
 				$icao = $value['airport_arrival_icao'];
 				if (isset($all[$icao])) {
 					$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-				} else $all[$icao] = $value;
+				} else {
+					$all[$icao] = $value;
+				}
 			}
 			$count = array();
 			foreach ($all as $key => $row) {
@@ -775,7 +939,9 @@ 
 	}
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -784,20 +950,32 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				if ($limit) {
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				} else {
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				}
 			} else {
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				if ($limit) {
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				} else {
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				}
 			}
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
 			if ($globalDBdriver == 'mysql') {
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(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";
+				if ($limit) {
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
+				} else {
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(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";
+				}
 			} else {
-				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";
+				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);
 		}
@@ -825,7 +1003,9 @@ 
 	
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -862,7 +1042,9 @@ 
 	}
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -907,7 +1089,9 @@ 
 	}
 	public function countAllDates($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -944,7 +1128,9 @@ 
 	}
 	public function countAllDatesMarine($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT marine_date as date_name, cnt as date_count FROM stats_marine WHERE stats_type = 'date' AND filter_name = :filter_name ORDER BY date_count DESC";
 		$query_data = array(':filter_name' => $filter_name);
 		try {
@@ -966,7 +1152,9 @@ 
 	}
 	public function countAllDatesTracker($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT tracker_date as date_name, cnt as date_count FROM stats_tracker WHERE stats_type = 'date' AND filter_name = :filter_name ORDER BY date_count DESC";
 		$query_data = array(':filter_name' => $filter_name);
 		try {
@@ -988,7 +1176,9 @@ 
 	}
 	public function countAllDatesByAirlines($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name";
 		$query_data = array('filter_name' => $filter_name);
 		try {
@@ -1010,7 +1200,9 @@ 
 	}
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1095,7 +1287,9 @@ 
 	}
 	public function countAllMilitaryMonths($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name";
 		try {
 			$sth = $this->db->prepare($query);
@@ -1116,7 +1310,9 @@ 
 	}
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1124,12 +1320,18 @@ 
 			foreach ($airlines as $airline) {
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
-			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
-			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+			if ($limit) {
+				$query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+			} else {
+				$query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+			}
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
-			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";
-			else $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";
+			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";
+			} else {
+				$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";
+			}
 			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		if ($orderby == 'hour') {
@@ -1139,7 +1341,9 @@ 
 				$query .= " ORDER BY CAST(flight_date AS integer) ASC";
 			}
 		}
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
+		if ($orderby == 'count') {
+			$query .= " ORDER BY hour_count DESC";
+		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
@@ -1163,8 +1367,12 @@ 
 	}
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($year == '') $year = date('Y');
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($year == '') {
+			$year = date('Y');
+		}
 		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -1183,8 +1391,12 @@ 
 	}
 	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($year == '') $year = date('Y');
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($year == '') {
+			$year = date('Y');
+		}
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
 		if (empty($all)) {
 			$filters = array();
@@ -1200,8 +1412,12 @@ 
 	}
 	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($year == '') $year = date('Y');
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($year == '') {
+			$year = date('Y');
+		}
 		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -1220,7 +1436,9 @@ 
 	}
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1238,7 +1456,9 @@ 
 				}
 				$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);
+			}
 		} else {
 			if ($year == '' && $month == '') {
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1250,7 +1470,9 @@ 
 				}
 				$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)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -1269,7 +1491,9 @@ 
 	}
 	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
 			$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
 			try {
@@ -1280,7 +1504,9 @@ 
 			}
 			$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);
@@ -1295,7 +1521,9 @@ 
 	}
 	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1350,7 +1578,9 @@ 
 	}
 	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		//if ($year == '') $year = date('Y');
 		if ($year == '' && $month == '') {
 			$query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1379,7 +1609,9 @@ 
 	}
 
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1403,7 +1635,9 @@ 
 		return $all;
 	}
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->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);
 		try {
@@ -1416,7 +1650,9 @@ 
 		return $all;
 	}
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->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);
 		try {
@@ -1427,7 +1663,9 @@ 
 		}
 	}
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		global $globalArchiveMonths, $globalDBdriver;
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
@@ -1483,7 +1721,9 @@ 
 	}
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1516,7 +1756,9 @@ 
 	}
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1547,7 +1789,9 @@ 
 	}
 	public function getStatsAirlineTotal($filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
 		} else {
@@ -1564,7 +1808,9 @@ 
 	}
 	public function getStatsOwnerTotal($filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
 		} else {
@@ -1581,7 +1827,9 @@ 
 	}
 	public function getStatsOwner($owner_name,$filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		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);
@@ -1590,12 +1838,17 @@ 
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
-		else return 0;
+		if (isset($all[0]['cnt'])) {
+			return $all[0]['cnt'];
+		} else {
+			return 0;
+		}
 	}
 	public function getStatsPilotTotal($filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
 		} else {
@@ -1612,7 +1865,9 @@ 
 	}
 	public function getStatsPilot($pilot,$filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		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);
@@ -1621,13 +1876,18 @@ 
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
-		else return 0;
+		if (isset($all[0]['cnt'])) {
+			return $all[0]['cnt'];
+		} else {
+			return 0;
+		}
 	}
 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt";
 		} else {
@@ -1643,7 +1903,9 @@ 
 	}
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
 		} else {
@@ -2116,27 +2378,37 @@ 
 		date_default_timezone_set('UTC');
 		if ((isset($globalMarine) && $globalMarine) || (isset($globalMasterServer) && $globalMasterServer)) {
 			$last_update = $this->getLastStatsUpdate('last_update_stats_marine');
-			if ($globalDebug) echo '!!! Update Marine stats !!!'."\n";
+			if ($globalDebug) {
+				echo '!!! Update Marine stats !!!'."\n";
+			}
 			if (isset($last_update[0]['value'])) {
 				$last_update_day = $last_update[0]['value'];
-			} else $last_update_day = '2012-12-12 12:12:12';
+			} else {
+				$last_update_day = '2012-12-12 12:12:12';
+			}
 			$reset = false;
 			$Marine = new Marine($this->db);
 			$filtername = 'marine';
 			if ($Connection->tableExists('countries')) {
-				if ($globalDebug) echo 'Count all vessels by countries...'."\n";
+				if ($globalDebug) {
+					echo 'Count all vessels by countries...'."\n";
+				}
 				$alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day);
 				foreach ($alldata as $number) {
 					$this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset);
 				}
 			}
-			if ($globalDebug) echo 'Count all vessels by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all vessels by months...'."\n";
+			}
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
 			$filter_last_month = array('since_date' => $last_month);
 			$alldata = $Marine->countAllMonths($filter_last_month);
 			$lastyear = false;
 			foreach ($alldata as $number) {
-				if ($number['year_name'] != date('Y')) $lastyear = true;
+				if ($number['year_name'] != date('Y')) {
+					$lastyear = true;
+				}
 				$this->addStat('marine_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
 			echo 'Marine data...'."\n";
@@ -2172,26 +2444,36 @@ 
 		}
 		if ((isset($globalTracker) && $globalTracker) || (isset($globalMasterServer) && $globalMasterServer)) {
 			$last_update = $this->getLastStatsUpdate('last_update_stats_tracker');
-			if ($globalDebug) echo '!!! Update tracker stats !!!'."\n";
+			if ($globalDebug) {
+				echo '!!! Update tracker stats !!!'."\n";
+			}
 			if (isset($last_update[0]['value'])) {
 				$last_update_day = $last_update[0]['value'];
-			} else $last_update_day = '2012-12-12 12:12:12';
+			} else {
+				$last_update_day = '2012-12-12 12:12:12';
+			}
 			$reset = false;
 			$Tracker = new Tracker($this->db);
 			if ($Connection->tableExists('countries')) {
-				if ($globalDebug) echo 'Count all trackers by countries...'."\n";
+				if ($globalDebug) {
+					echo 'Count all trackers by countries...'."\n";
+				}
 				$alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day);
 				foreach ($alldata as $number) {
 					$this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset);
 				}
 			}
-			if ($globalDebug) echo 'Count all vessels by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all vessels by months...'."\n";
+			}
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
 			$filter_last_month = array('since_date' => $last_month);
 			$alldata = $Tracker->countAllMonths($filter_last_month);
 			$lastyear = false;
 			foreach ($alldata as $number) {
-				if ($number['year_name'] != date('Y')) $lastyear = true;
+				if ($number['year_name'] != date('Y')) {
+					$lastyear = true;
+				}
 				$this->addStat('tracker_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
 			echo 'Tracker data...'."\n";
@@ -2228,10 +2510,14 @@ 
 
 		if (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft) || (isset($globalMasterServer) && $globalMasterServer)) {
 			$last_update = $this->getLastStatsUpdate('last_update_stats');
-			if ($globalDebug) echo '!!! Update aicraft stats !!!'."\n";
+			if ($globalDebug) {
+				echo '!!! Update aicraft stats !!!'."\n";
+			}
 			if (isset($last_update[0]['value'])) {
 				$last_update_day = $last_update[0]['value'];
-			} else $last_update_day = '2012-12-12 12:12:12';
+			} else {
+				$last_update_day = '2012-12-12 12:12:12';
+			}
 			$reset = false;
 			//if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) {
 			if ($globalStatsResetYear) {
@@ -2240,43 +2526,63 @@ 
 			}
 			$Spotter = new Spotter($this->db);
 
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircraft types...'."\n";
+			}
 			$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);
 			}
-			if ($globalDebug) echo 'Count all airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all registrations...'."\n";
+			if ($globalDebug) {
+				echo 'Count all registrations...'."\n";
+			}
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
 			}
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
+			if ($globalDebug) {
+				echo 'Count all callsigns...'."\n";
+			}
 			$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);
 			}
-			if ($globalDebug) echo 'Count all owners...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners...'."\n";
+			}
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
 			}
-			if ($globalDebug) echo 'Count all pilots...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots...'."\n";
+			}
 			$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'];
+				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);
 			}
 			
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all departure airports...'."\n";
+			}
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected departure airports...'."\n";
+			}
 			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order departure airports...'."\n";
+			if ($globalDebug) {
+				echo 'Order departure airports...'."\n";
+			}
 			$alldata = array();
 			foreach ($pall as $value) {
 				$icao = $value['airport_departure_icao'];
@@ -2286,7 +2592,9 @@ 
 				$icao = $value['airport_departure_icao'];
 				if (isset($alldata[$icao])) {
 					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-				} else $alldata[$icao] = $value;
+				} else {
+					$alldata[$icao] = $value;
+				}
 			}
 			$count = array();
 			foreach ($alldata as $key => $row) {
@@ -2296,11 +2604,17 @@ 
 			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);
 			}
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all arrival airports...'."\n";
+			}
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected arrival airports...'."\n";
+			}
 			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
+			if ($globalDebug) {
+				echo 'Order arrival airports...'."\n";
+			}
 			$alldata = array();
 			foreach ($pall as $value) {
 				$icao = $value['airport_arrival_icao'];
@@ -2310,7 +2624,9 @@ 
 				$icao = $value['airport_arrival_icao'];
 				if (isset($alldata[$icao])) {
 					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-				} else $alldata[$icao] = $value;
+				} else {
+					$alldata[$icao] = $value;
+				}
 			}
 			$count = array();
 			foreach ($alldata as $key => $row) {
@@ -2321,7 +2637,9 @@ 
 				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";
+				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);
@@ -2332,7 +2650,9 @@ 
 			}
 			
 			if (isset($globalAccidents) && $globalAccidents) {
-				if ($globalDebug) echo 'Count fatalities stats...'."\n";
+				if ($globalDebug) {
+					echo 'Count fatalities stats...'."\n";
+				}
 				$Accident = new Accident($this->db);
 				$this->deleteStatsByType('fatalities_byyear');
 				$alldata = $Accident->countFatalitiesByYear();
@@ -2348,48 +2668,68 @@ 
 
 			// Add by month using getstat if month finish...
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all flights by months...'."\n";
+			}
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
 			$filter_last_month = array('since_date' => $last_month);
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllMonths($filter_last_month);
 			$lastyear = false;
 			foreach ($alldata as $number) {
-				if ($number['year_name'] != date('Y')) $lastyear = true;
+				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'])));
 			}
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
+			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'])));
 			}
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
+			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'])));
 			}
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
+			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'])));
 			}
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
+			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'])));
 			}
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
+			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'])));
 			}
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
+			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'])));
 			}
-			if ($globalDebug) echo 'Airports data...'."\n";
-			if ($globalDebug) echo '...Departure'."\n";
+			if ($globalDebug) {
+				echo 'Airports data...'."\n";
+			}
+			if ($globalDebug) {
+				echo '...Departure'."\n";
+			}
 			$this->deleteStatAirport('daily');
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
@@ -2507,7 +2847,9 @@ 
 			// Count by airlines
 			echo '--- Stats by airlines ---'."\n";
 			if ($Connection->tableExists('countries')) {
-				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
+				if ($globalDebug) {
+					echo 'Count all flights by countries by airlines...'."\n";
+				}
 				$SpotterArchive = new SpotterArchive($this->db);
 				//$Spotter = new Spotter($this->db);
 				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
@@ -2516,37 +2858,53 @@ 
 					$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";
+			if ($globalDebug) {
+				echo 'Count all aircraft types by airlines...'."\n";
+			}
 			$Spotter = new Spotter($this->db);
 			$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);
 			}
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircraft registrations by airlines...'."\n";
+			}
 			$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);
 			}
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all callsigns by airlines...'."\n";
+			}
 			$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);
 			}
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots by airlines...'."\n";
+			}
 			$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);
 			}
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all departure airports by airlines...'."\n";
+			}
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected departure airports by airlines...'."\n";
+			}
 			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Order detected departure airports by airlines...'."\n";
+			}
 			//$alldata = array();
 			foreach ($dall as $value) {
 				$icao = $value['airport_departure_icao'];
@@ -2567,11 +2925,17 @@ 
 			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);
 			}
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all arrival airports by airlines...'."\n";
+			}
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected arrival airports by airlines...'."\n";
+			}
 			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Order arrival airports by airlines...'."\n";
+			}
 			//$alldata = array();
 			foreach ($dall as $value) {
 				$icao = $value['airport_arrival_icao'];
@@ -2590,37 +2954,53 @@ 
 			}
 			$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";
 			}
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllMonthsByAirlines($filter_last_month);
 			$lastyear = false;
 			foreach ($alldata as $number) {
-				if ($number['year_name'] != date('Y')) $lastyear = true;
+				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']);
 			}
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
+			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']);
 			}
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
+			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']);
 			}
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
+			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']);
 			}
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
+			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']);
 			}
-			if ($globalDebug) echo '...Departure'."\n";
+			if ($globalDebug) {
+				echo '...Departure'."\n";
+			}
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
 			$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
 			foreach ($dall as $value) {
@@ -2643,7 +3023,9 @@ 
 			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']);
 			}
-			if ($globalDebug) echo '...Arrival'."\n";
+			if ($globalDebug) {
+				echo '...Arrival'."\n";
+			}
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
 			$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
 			foreach ($dall as $value) {
@@ -2667,13 +3049,19 @@ 
 				$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";
+			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']);
 			}
-			if ($globalDebug) echo '-> countAllDates...'."\n";
+			if ($globalDebug) {
+				echo '-> countAllDates...'."\n";
+			}
 			//$previousdata = $this->countAllDatesByAirlines();
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
 			$values = array();
@@ -2686,14 +3074,18 @@ 
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
 			}
 			
-			if ($globalDebug) echo '-> countAllHours...'."\n";
+			if ($globalDebug) {
+				echo '-> countAllHours...'."\n";
+			}
 			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
 			foreach ($alldata as $number) {
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
 			}
 
 			// Stats by filters
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
+				$globalStatsFilters = array();
+			}
 			foreach ($globalStatsFilters as $name => $filter) {
 				if (!empty($filter)) {
 					//$filter_name = $filter['name'];
@@ -2701,7 +3093,9 @@ 
 					$reset = false;
 					$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
 					if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) {
-						if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
+						if ($globalDebug) {
+							echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
+						}
 						$this->deleteOldStats($filter_name);
 						unset($last_update);
 					}
@@ -2718,39 +3112,55 @@ 
 						$reset = true;
 					}
 					// Count by filter
-					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
+					if ($globalDebug) {
+						echo '--- Stats for filter '.$filter_name.' ---'."\n";
+					}
 					$Spotter = new Spotter($this->db);
-					if ($globalDebug) echo 'Count all aircraft types...'."\n";
+					if ($globalDebug) {
+						echo 'Count all aircraft types...'."\n";
+					}
 					$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);
 					}
-					if ($globalDebug) echo 'Count all airlines...'."\n";
+					if ($globalDebug) {
+						echo 'Count all airlines...'."\n";
+					}
 					$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);
 					}
-					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
+					if ($globalDebug) {
+						echo 'Count all aircraft registrations...'."\n";
+					}
 					$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);
 					}
-					if ($globalDebug) echo 'Count all callsigns...'."\n";
+					if ($globalDebug) {
+						echo 'Count all callsigns...'."\n";
+					}
 					$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);
 					}
-					if ($globalDebug) echo 'Count all owners...'."\n";
+					if ($globalDebug) {
+						echo 'Count all owners...'."\n";
+					}
 					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
 					foreach ($alldata as $number) {
 						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
 					}
-					if ($globalDebug) echo 'Count all pilots...'."\n";
+					if ($globalDebug) {
+						echo 'Count all pilots...'."\n";
+					}
 					$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);
 					}
-					if ($globalDebug) echo 'Count departure airports...'."\n";
+					if ($globalDebug) {
+						echo 'Count departure airports...'."\n";
+					}
 					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
 					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
 					$alldata = array();
@@ -2762,7 +3172,9 @@ 
 						$icao = $value['airport_departure_icao'];
 						if (isset($alldata[$icao])) {
 							$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-						} else $alldata[$icao] = $value;
+						} else {
+							$alldata[$icao] = $value;
+						}
 					}
 					$count = array();
 					foreach ($alldata as $key => $row) {
@@ -2772,7 +3184,9 @@ 
 					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);
 					}
-					if ($globalDebug) echo 'Count all arrival airports...'."\n";
+					if ($globalDebug) {
+						echo 'Count all arrival airports...'."\n";
+					}
 					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
 					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
 					$alldata = array();
@@ -2784,7 +3198,9 @@ 
 						$icao = $value['airport_arrival_icao'];
 						if (isset($alldata[$icao])) {
 							$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-						} else $alldata[$icao] = $value;
+						} else {
+							$alldata[$icao] = $value;
+						}
 					}
 					$count = array();
 					foreach ($alldata as $key => $row) {
@@ -2794,35 +3210,49 @@ 
 					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);
 					}
-					if ($globalDebug) echo 'Count all months...'."\n";
+					if ($globalDebug) {
+						echo 'Count all months...'."\n";
+					}
 					$Spotter = new Spotter($this->db);
 					$alldata = $Spotter->countAllMonths($filter);
 					$lastyear = false;
 					foreach ($alldata as $number) {
-						if ($number['year_name'] != date('Y')) $lastyear = true;
+						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);
 					}
-					if ($globalDebug) echo 'Count all owners by months...'."\n";
+					if ($globalDebug) {
+						echo 'Count all owners by months...'."\n";
+					}
 					$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);
 					}
-					if ($globalDebug) echo 'Count all pilots by months...'."\n";
+					if ($globalDebug) {
+						echo 'Count all pilots by months...'."\n";
+					}
 					$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);
 					}
-					if ($globalDebug) echo 'Count all military by months...'."\n";
+					if ($globalDebug) {
+						echo 'Count all military by months...'."\n";
+					}
 					$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);
 					}
-					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
+					if ($globalDebug) {
+						echo 'Count all aircrafts by months...'."\n";
+					}
 					$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);
 					}
-					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
+					if ($globalDebug) {
+						echo 'Count all real arrivals by months...'."\n";
+					}
 					$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);

live-czml.php

Indentation +24 added lines, -24 removed lines

@@ -39,30 +39,30 @@ 
 
 
 function quaternionrotate($heading, $attitude = 0, $bank = 0) {
-    // Assuming the angles are in radians.
-    $c1 = cos($heading/2);
-    $s1 = sin($heading/2);
-    $c2 = cos($attitude/2);
-    $s2 = sin($attitude/2);
-    $c3 = cos($bank/2);
-    $s3 = sin($bank/2);
-    $c1c2 = $c1*$c2;
-    $s1s2 = $s1*$s2;
-    $w =$c1c2*$c3 - $s1s2*$s3;
-    $x =$c1c2*$s3 + $s1s2*$c3;
-    $y =$s1*$c2*$c3 + $c1*$s2*$s3;
-    $z =$c1*$s2*$c3 - $s1*$c2*$s3;
-    return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
+	// Assuming the angles are in radians.
+	$c1 = cos($heading/2);
+	$s1 = sin($heading/2);
+	$c2 = cos($attitude/2);
+	$s2 = sin($attitude/2);
+	$c3 = cos($bank/2);
+	$s3 = sin($bank/2);
+	$c1c2 = $c1*$c2;
+	$s1s2 = $s1*$s2;
+	$w =$c1c2*$c3 - $s1s2*$s3;
+	$x =$c1c2*$s3 + $s1s2*$c3;
+	$y =$s1*$c2*$c3 + $c1*$s2*$s3;
+	$z =$c1*$s2*$c3 - $s1*$c2*$s3;
+	return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
 //    return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365');
 
 }
 
 
 if (isset($_GET['download'])) {
-    if ($_GET['download'] == "true")
-    {
+	if ($_GET['download'] == "true")
+	{
 	header('Content-disposition: attachment; filename="flightairmap.json"');
-    }
+	}
 }
 header('Content-Type: text/javascript');
 
@@ -252,10 +252,10 @@ 
 			$image = "images/placeholder_thumb.png";
 		}
 
-                if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id'];
-                elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid'];
-                elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id'];
-                if ($prev_flightaware_id != $id) {
+				if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id'];
+				elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid'];
+				elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id'];
+				if ($prev_flightaware_id != $id) {
 			if ($prev_flightaware_id != '') {
 				/*
 				if ($nblatlong == 1) {
@@ -333,7 +333,7 @@ 
 							$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
 							$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
 						} else $aircraft_shadow = '';
-	    					$output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5';
+							$output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5';
 						if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true' && isset($_COOKIE['IconColor'])) {
 							$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
 							$output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}';
@@ -364,7 +364,7 @@ 
 							$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
 							$output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}';
 						}
-    						$output .= '},';
+							$output .= '},';
 					} elseif (isset($modelsdb[$aircraft_icao])) {
 						$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$aircraft_icao].'","scale" : 1.0,"minimumPixelSize": 20';
 						$output .= ',"heightReference": "'.$heightrelative.'"';
@@ -372,7 +372,7 @@ 
 							$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
 							$output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}';
 						}
-    						$output .= '},';
+							$output .= '},';
 					} elseif ($aircraft_icao != '') {
 						$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_icao);
 						if (isset($aircraft_info[0]['engine_type'])) {

Braces +116 added lines, -42 removed lines

@@ -8,8 +8,12 @@ 
 }
 $tracker = false;
 $marine = false;
-if (isset($_GET['tracker'])) $tracker = true;
-if (isset($_GET['marine'])) $marine = true;
+if (isset($_GET['tracker'])) {
+	$tracker = true;
+}
+if (isset($_GET['marine'])) {
+	$marine = true;
+}
 if ($tracker) {
 	require_once('require/class.Tracker.php');
 	require_once('require/class.TrackerLive.php');
@@ -66,23 +70,46 @@ 
 }
 header('Content-Type: text/javascript');
 
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 
 $from_archive = false;
 $min = false;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','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;
@@ -179,8 +206,12 @@ 
 	} else {
 		$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
 	}
-	if ($flightcnt == '') $flightcnt = 0;
-} else $flightcnt = 0;
+	if ($flightcnt == '') {
+		$flightcnt = 0;
+	}
+	} else {
+	$flightcnt = 0;
+}
 
 $sqltime = round(microtime(true)-$begintime,2);
 $minitime = time();
@@ -216,7 +247,9 @@ 
 $prev_flightaware_id = '';
 $speed = 1;
 $gltf2 = false;
-if (isset($archivespeed)) $speed = $archivespeed;
+if (isset($archivespeed)) {
+	$speed = $archivespeed;
+}
 $output = '[';
 if ($tracker) {
 	$output .= '{"id" : "document", "name" : "tracker","version" : "1.0"';
@@ -252,9 +285,13 @@ 
 			$image = "images/placeholder_thumb.png";
 		}
 
-                if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id'];
-                elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid'];
-                elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id'];
+                if (isset($spotter_item['flightaware_id'])) {
+                	$id = $spotter_item['flightaware_id'];
+                } elseif (isset($spotter_item['famtrackid'])) {
+                	$id = $spotter_item['famtrackid'];
+                } elseif (isset($spotter_item['fammarine_id'])) {
+                	$id = $spotter_item['fammarine_id'];
+                }
                 if ($prev_flightaware_id != $id) {
 			if ($prev_flightaware_id != '') {
 				/*
@@ -301,7 +338,9 @@ 
 						}
 					}
 				}
-				if ($ident != '') $output.= '"ident": "'.$ident.'",';
+				if ($ident != '') {
+					$output.= '"ident": "'.$ident.'",';
+				}
 				$output.= '"gltf2": %gltf2%,';
 				$output.= '"type": "flight"';
 			}
@@ -332,7 +371,9 @@ 
 							$spotter_item['engine_type'] = $aircraft_info[0]['engine_type'];
 							$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
 							$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
-						} else $aircraft_shadow = '';
+						} else {
+							$aircraft_shadow = '';
+						}
 	    					$output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5';
 						if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true' && isset($_COOKIE['IconColor'])) {
 							$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
@@ -340,7 +381,9 @@ 
 						}
 						$output .= '},';
 					}
-				} else $output .= ' "billboard" : {"image" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAfCAYAAACVgY94AAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAA7VJREFUeNrEl2uIlWUQx39nXUu0m2uQbZYrbabdLKMs/VBkmHQjioqFIhBS+hKEQpQRgVAf2u5RQkGBRUllRH4I2e5ZUBJlEZVt5i0tTfHStrZ6fn35L70d9n7Obg88vOedmWfmf2bmmZkXlRrtq9V16mZ1iVqqhd5agXvQf1c5zw/V8dXqrqO6dQKwBrgdWApsCb0VqAc2AnOrMVANwIsD4BLgTOBPYB2wHJgEzAG+ANqAu4ZsZYiuX5QwfqI2hvaNulA9J7zLQn8o76vUuuHOwXHqSzH4aIF+TWjnBkSH+nCBf716SP1KPWO4AJ6ltgfIjRW8p9U/1KPz/ry6RT2mIDNF3Zjz19Ya4G1R/J16dgWvQd2pPlXhMdVZPUTgxfCW1wJgXUJpQlvfg8zs8K8r0Caom9QHetG7NGfa1ElDBThRXRtFd/Qh16puKIS3e7+clBjdy7kL1b3q4fzJQQGck5z6Nb97kxujblWf64HXov7Vl/E4YXWccP9AAd6dAx+ox/WTArNzY1t64B0f8K0DyLXuUvRGZfcpCo1VX4tg6wB76WMB0dALf526foAX8cqUot2pGP8B2Kz+krBeNYjS8636dh/8Beo2deoA9TWp76pd6g0q9cDNwKvAD8A84EfglLRBe2g+JWAfcEF68bPABOCoAl/gIPA5MA64FVgGnNhP292W3r0SeB1YVlJXAjcBP8XwyQUj9AKwAzg2+/fQSsBhoJxBAaALaIzenZGnD911wA7gEDAD2FFSpwOzgDHZ5T7+ZSlGd2d6AXgi5+qAn+O5U0PbBVwKtAD3AHuB8f3YGBUdncCGoQ4LE9XtGRqK9LnduVPRIu2BPqwD65IYbS7Qpql7Ql9YoJcy9bwzkgPrfOCj5G33+h54E/g0PAr5thq4ApgyEgNrc27aWwVaPTA1QJ4BjgTGFvhteV40EgPrgvTP7qlmZqFnl9WD+b2posN83E/NrEkOjlI/U1fkfUYa/pe5IE3qZPW8jFOqiyN7p3pAPX04c7AxYSoDDcAjKT2LgLXA6IR2M3Bviv59wDTgQGTPH84Qd8+HXfHcoUws2zM0HMjuUPep+xP2PWpnwtw0GJsldbBpewQwE/gbeDyt7H1gcW53O7AC+A3Yn6+/W+Ld9SnWA15DAVhc8xK2TuA9YHrCuhV4EngFuBx4YagG6qv8cF+T52kB2Zy+e1I8taUacNV+uBdXO7ABmJwJpwx8XQvF9TUCWM64tiQhbq/oMv+7BwFWpQzNT8vbVQul/wwAGzzdmXU1xuUAAAAASUVORK5CYII=","scale" : 0.5},';
+				} else {
+					$output .= ' "billboard" : {"image" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAfCAYAAACVgY94AAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAA7VJREFUeNrEl2uIlWUQx39nXUu0m2uQbZYrbabdLKMs/VBkmHQjioqFIhBS+hKEQpQRgVAf2u5RQkGBRUllRH4I2e5ZUBJlEZVt5i0tTfHStrZ6fn35L70d9n7Obg88vOedmWfmf2bmmZkXlRrtq9V16mZ1iVqqhd5agXvQf1c5zw/V8dXqrqO6dQKwBrgdWApsCb0VqAc2AnOrMVANwIsD4BLgTOBPYB2wHJgEzAG+ANqAu4ZsZYiuX5QwfqI2hvaNulA9J7zLQn8o76vUuuHOwXHqSzH4aIF+TWjnBkSH+nCBf716SP1KPWO4AJ6ltgfIjRW8p9U/1KPz/ry6RT2mIDNF3Zjz19Ya4G1R/J16dgWvQd2pPlXhMdVZPUTgxfCW1wJgXUJpQlvfg8zs8K8r0Caom9QHetG7NGfa1ElDBThRXRtFd/Qh16puKIS3e7+clBjdy7kL1b3q4fzJQQGck5z6Nb97kxujblWf64HXov7Vl/E4YXWccP9AAd6dAx+ox/WTArNzY1t64B0f8K0DyLXuUvRGZfcpCo1VX4tg6wB76WMB0dALf526foAX8cqUot2pGP8B2Kz+krBeNYjS8636dh/8Beo2deoA9TWp76pd6g0q9cDNwKvAD8A84EfglLRBe2g+JWAfcEF68bPABOCoAl/gIPA5MA64FVgGnNhP292W3r0SeB1YVlJXAjcBP8XwyQUj9AKwAzg2+/fQSsBhoJxBAaALaIzenZGnD911wA7gEDAD2FFSpwOzgDHZ5T7+ZSlGd2d6AXgi5+qAn+O5U0PbBVwKtAD3AHuB8f3YGBUdncCGoQ4LE9XtGRqK9LnduVPRIu2BPqwD65IYbS7Qpql7Ql9YoJcy9bwzkgPrfOCj5G33+h54E/g0PAr5thq4ApgyEgNrc27aWwVaPTA1QJ4BjgTGFvhteV40EgPrgvTP7qlmZqFnl9WD+b2posN83E/NrEkOjlI/U1fkfUYa/pe5IE3qZPW8jFOqiyN7p3pAPX04c7AxYSoDDcAjKT2LgLXA6IR2M3Bviv59wDTgQGTPH84Qd8+HXfHcoUws2zM0HMjuUPep+xP2PWpnwtw0GJsldbBpewQwE/gbeDyt7H1gcW53O7AC+A3Yn6+/W+Ld9SnWA15DAVhc8xK2TuA9YHrCuhV4EngFuBx4YagG6qv8cF+T52kB2Zy+e1I8taUacNV+uBdXO7ABmJwJpwx8XQvF9TUCWM64tiQhbq/oMv+7BwFWpQzNT8vbVQul/wwAGzzdmXU1xuUAAAAASUVORK5CYII=","scale" : 0.5},';
+				}
 			} elseif ($one3dmodel) {
 				if (isset($globalMap3DForceModel) && $globalMap3DForceModel != '') {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$globalMap3DForceModel.'","scale" : 1.0,"minimumPixelSize": 20';
@@ -380,7 +423,9 @@ 
 							$spotter_item['engine_type'] = $aircraft_info[0]['engine_type'];
 							$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
 							$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
-						} else $aircraft_shadow = '';
+						} else {
+							$aircraft_shadow = '';
+						}
 						if ($aircraft_shadow != '') {
 							if (isset($modelsdb[$aircraft_shadow])) {
 								$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$aircraft_shadow].'","scale" : 1.0,"minimumPixelSize": 20';
@@ -517,7 +562,9 @@ 
 								}
 								$output .= '},';
 								//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
-								if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
+								if ($spotter_item['aircraft_icao'] != '') {
+									$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
+								}
 								$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
 							}
 						} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
@@ -539,7 +586,9 @@ 
 							}
 							$output .= '},';
 							//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
-							if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
+							if ($spotter_item['aircraft_icao'] != '') {
+								$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
+							}
 							$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
 						}
 					} else {
@@ -552,7 +601,9 @@ 
 						}
 						$output .= '},';
 						//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
-						if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
+						if ($spotter_item['aircraft_icao'] != '') {
+							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
+						}
 						$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
 					}
 				} elseif ($tracker && isset($spotter_item['type'])) {
@@ -656,8 +707,11 @@ 
 					$output .= '},';
 				}
 			}
-			if (isset($onground) && $onground) $output = str_replace('%onground%','true',$output);
-			else $output = str_replace('%onground%','false',$output);
+			if (isset($onground) && $onground) {
+				$output = str_replace('%onground%','true',$output);
+			} else {
+				$output = str_replace('%onground%','false',$output);
+			}
 
 	//		$output .= '"heightReference": "CLAMP_TO_GROUND",';
 			//$output .= '"heightReference": "'.$heightrelative.'",';
@@ -670,8 +724,12 @@ 
 	//		$output .= '"interpolationDegree" : 5,';
 	//		$output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", ';
 			$output .= '"cartographicDegrees": [';
-			if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
+			if ($minitime > strtotime($spotter_item['date'])) {
+				$minitime = strtotime($spotter_item['date']);
+			}
+			if ($maxitime < strtotime($spotter_item['date'])) {
+				$maxitime = strtotime($spotter_item['date']);
+			}
 			$output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
 			$output .= $spotter_item['longitude'].', ';
 			$output .= $spotter_item['latitude'];
@@ -694,7 +752,9 @@ 
 					$output .= ', '.round($spotter_item['altitude']*30.48);
 					$prevalt = round($spotter_item['altitude']*30.48);
 				}
-			} else $output .= ', 0';
+			} else {
+				$output .= ', 0';
+			}
 			//$orientation = '"orientation" : { ';
 			//$orientation .= '"unitQuaternion": [';
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
@@ -702,13 +762,18 @@ 
 		} else {
 			$nblatlong = $nblatlong+1;
 			$output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
+			if ($maxitime < strtotime($spotter_item['date'])) {
+				$maxitime = strtotime($spotter_item['date']);
+			}
 			if ($spotter_item['ground_speed'] == 0) {
 				$output .= $prevlong.', ';
 				$output .= $prevlat;
 				//if (!$marine && (!isset($onground) || !$onground)) $output .= ', '.$prevalt;
-				if (!$marine) $output .= ', '.$prevalt;
-				else $output .= ', 0';
+				if (!$marine) {
+					$output .= ', '.$prevalt;
+				} else {
+					$output .= ', 0';
+				}
 			} else {
 				$output .= $spotter_item['longitude'].', ';
 				$output .= $spotter_item['latitude'];
@@ -721,14 +786,17 @@ 
 							$output .= ', 0';
 						}
 					} else {
-						if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') $output .= ', '.round($spotter_item['real_altitude']*0.3048);
-						elseif ($tracker) {
+						if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
+							$output .= ', '.round($spotter_item['real_altitude']*0.3048);
+						} elseif ($tracker) {
 							$output .= ', '.round($spotter_item['altitude']*0.3048);
 						} else {
 							$output .= ', '.round($spotter_item['altitude']*30.48);
 						}
 					}
-				} else $output .= ', 0';
+				} else {
+					$output .= ', 0';
+				}
 			}
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
 			//$orientation .= ',"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
@@ -747,11 +815,17 @@ 
 		} else {
 			$output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output);
 		}
+	} else {
+		$output = str_replace('%minitime%',date("c",$minitime),$output);
 	}
-	else $output = str_replace('%minitime%',date("c",$minitime),$output);
-} else $output = str_replace('%minitime%',date("c",$minitime),$output);
+	} else {
+	$output = str_replace('%minitime%',date("c",$minitime),$output);
+}
 $output = str_replace('%maxitime%',date("c",$maxitime),$output);
-if ($gltf2) $output = str_replace('%gltf2%','true',$output);
-else $output = str_replace('%gltf2%','false',$output);
+if ($gltf2) {
+	$output = str_replace('%gltf2%','true',$output);
+} else {
+	$output = str_replace('%gltf2%','false',$output);
+}
 print $output;
 ?>

js/map-aircraft.3d.js.php

Indentation +6 added lines, -6 removed lines

@@ -265,22 +265,22 @@ 
 			var entityid = entity.id;
 			var lastupdateentity = entity.properties.lastupdate;
 			<?php 
-			    if (isset($globalMapUseBbox) && $globalMapUseBbox) {
-			    // Remove flights not in latest CZML
+				if (isset($globalMapUseBbox) && $globalMapUseBbox) {
+				// Remove flights not in latest CZML
 			?>
 			if (lastupdateentity != lastupdate) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 				czmlds.entities.removeById(entityid);
 			}
 			<?php
-			    } else {
+				} else {
 			?>
 			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 				czmlds.entities.removeById(entityid);
 			}
 			<?php
-			    }
+				}
 			?>
 		}
 	}
@@ -708,12 +708,12 @@ 
 	update_airportsLayer();
 }
 <?php
-    if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
+	if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
 ?>
 update_atcLayer();
 setInterval(function(){update_atcLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
 <?php
-    }
+	}
 ?>
 
 function iconColor(color) {

js/map-marine.3d.js.php

Indentation +8 added lines, -8 removed lines

@@ -41,20 +41,20 @@ 
 			var entityid = entity.id;
 			var lastupdateentity = entity.properties.lastupdate;
 			<?php 
-			    if (isset($globalMapUseBbox) && $globalMapUseBbox) {
+				if (isset($globalMapUseBbox) && $globalMapUseBbox) {
 			?>
 			if (lastupdateentity != lastupdatemarine) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 				czmldsmarine.entities.removeById(entityid);
 			}
 			<?php
-			    } else {
+				} else {
 			?>
 			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 			}
 			<?php
-			    }
+				}
 			?>
 		}
 	}
@@ -76,15 +76,15 @@ 
 function updateMarineData() {
 	lastupdatemarine = Date.now();
 <?php
-    if (isset($globalMapUseBbox) && $globalMapUseBbox) {
+	if (isset($globalMapUseBbox) && $globalMapUseBbox) {
 ?>
 	var livemarinedata = czmldsmarine.process('<?php print $globalURL; ?>/live-czml.php?marine&coord='+bbox()+'&update=' + lastupdatemarine);
 <?php
-    } else {
+	} else {
 ?>
 	var livemarinedata = czmldsmarine.process('<?php print $globalURL; ?>/live-czml.php?marine&update=' + lastupdatemarine);
 <?php
-    }
+	}
 ?>
 	livemarinedata.then(function (data) { 
 		displayMarineData(data);
@@ -131,11 +131,11 @@ 
 }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
 camera.moveEnd.addEventListener(function() {
 <?php
-    if (isset($globalMapUseBbox) && $globalMapUseBbox) {
+	if (isset($globalMapUseBbox) && $globalMapUseBbox) {
 ?>
 	updateMarineData();
 <?php
-    }
+	}
 ?>
 });
 

install/class.update_db.php

Braces +1151 added lines, -399 removed lines

@@ -26,7 +26,9 @@ 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 		curl_setopt($ch, CURLOPT_TIMEOUT, 20);
-		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
+		if ($referer != '') {
+			curl_setopt($ch, CURLOPT_REFERER, $referer);
+		}
 		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_FILE, $fp);
 		curl_exec($ch);
@@ -37,12 +39,16 @@ 
 	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 ($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');
-			else {
+			if (function_exists('gzopen')) {
+				$file = gzopen($in_file,'rb');
+			} elseif (function_exists('gzopen64')) {
+				$file = gzopen64($in_file,'rb');
+			} else {
 				echo 'gzopen not available';
 				die;
 			}
@@ -63,8 +69,12 @@ 
 			if ($res === TRUE) {
 				$zip->extractTo($path);
 				$zip->close();
-			} else return false;
-		} else return false;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
 	}
 	
 	public static function connect_sqlite($database) {
@@ -79,7 +89,9 @@ 
 	public static function retrieve_route_sqlite_to_dest($database_file) {
 		global $globalDebug, $globalTransaction;
 		//$query = 'TRUNCATE TABLE routes';
-		if ($globalDebug) echo " - Delete previous routes from DB -";
+		if ($globalDebug) {
+			echo " - Delete previous routes from DB -";
+		}
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
 		$Connection = new Connection();
 		try {
@@ -90,7 +102,9 @@ 
                         return "error : ".$e->getMessage();
                 }
 
-    		if ($globalDebug) echo " - Add routes to DB -";
+    		if ($globalDebug) {
+    			echo " - Add routes to DB -";
+    		}
     		update_db::connect_sqlite($database_file);
 		//$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID';
 		$query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID";
@@ -105,15 +119,21 @@ 
 		$Connection = new Connection();
 		$sth_dest = $Connection->db->prepare($query_dest);
 		try {
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
 				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
 				$sth_dest->execute($query_dest_values);
             		}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		} catch(PDOException $e) {
-			if ($globalTransaction) $Connection->db->rollBack(); 
+			if ($globalTransaction) {
+				$Connection->db->rollBack();
+			}
 			return "error : ".$e->getMessage();
 		}
                 return '';
@@ -121,7 +141,9 @@ 
 	public static function retrieve_route_oneworld($database_file) {
 		global $globalDebug, $globalTransaction;
 		//$query = 'TRUNCATE TABLE routes';
-		if ($globalDebug) echo " - Delete previous routes from DB -";
+		if ($globalDebug) {
+			echo " - Delete previous routes from DB -";
+		}
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
 		$Connection = new Connection();
 		try {
@@ -132,14 +154,18 @@ 
                         return "error : ".$e->getMessage();
                 }
 
-    		if ($globalDebug) echo " - Add routes to DB -";
+    		if ($globalDebug) {
+    			echo " - Add routes to DB -";
+    		}
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
 		if ($fh = fopen($database_file,"r")) {
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (!feof($fh)) {
 				$line = fgetcsv($fh,9999,',');
 				if ($line[0] != '') {
@@ -148,13 +174,17 @@ 
 							$query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld');
 							$sth_dest->execute($query_dest_values);
 						} catch(PDOException $e) {
-							if ($globalTransaction) $Connection->db->rollBack(); 
+							if ($globalTransaction) {
+								$Connection->db->rollBack();
+							}
 							return "error : ".$e->getMessage();
 						}
 					}
 				}
 			}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
                 return '';
 	}
@@ -162,7 +192,9 @@ 
 	public static function retrieve_route_skyteam($database_file) {
 		global $globalDebug, $globalTransaction;
 		//$query = 'TRUNCATE TABLE routes';
-		if ($globalDebug) echo " - Delete previous routes from DB -";
+		if ($globalDebug) {
+			echo " - Delete previous routes from DB -";
+		}
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
 		$Connection = new Connection();
 		try {
@@ -173,7 +205,9 @@ 
                         return "error : ".$e->getMessage();
                 }
 
-    		if ($globalDebug) echo " - Add routes to DB -";
+    		if ($globalDebug) {
+    			echo " - Add routes to DB -";
+    		}
 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
@@ -182,7 +216,9 @@ 
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
-				if ($globalTransaction) $Connection->db->beginTransaction();
+				if ($globalTransaction) {
+					$Connection->db->beginTransaction();
+				}
 				while (!feof($fh)) {
 					$line = fgetcsv($fh,9999,',');
 					if ($line[0] != '') {
@@ -193,9 +229,13 @@ 
 						}
 					}
 				}
-				if ($globalTransaction) $Connection->db->commit();
+				if ($globalTransaction) {
+					$Connection->db->commit();
+				}
 			} catch(PDOException $e) {
-				if ($globalTransaction) $Connection->db->rollBack(); 
+				if ($globalTransaction) {
+					$Connection->db->rollBack();
+				}
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -238,11 +278,16 @@ 
 		$sth_dest = $Connection->db->prepare($query_dest);
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
 		try {
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
-				if ($values['UserString4'] == 'M') $type = 'military';
-				else $type = null;
+				if ($values['UserString4'] == 'M') {
+					$type = 'military';
+				} else {
+					$type = null;
+				}
 				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
 				$sth_dest->execute($query_dest_values);
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
@@ -250,7 +295,9 @@ 
 				    $sth_dest_owner->execute($query_dest_owner_values);
 				}
             		}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		} catch(PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
@@ -287,7 +334,9 @@ 
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
-				if ($globalTransaction) $Connection->db->beginTransaction();
+				if ($globalTransaction) {
+					$Connection->db->beginTransaction();
+				}
             			while (!feof($fh)) {
             				$values = array();
             				$line = $Common->hex2str(fgets($fh,9999));
@@ -298,7 +347,9 @@ 
             				// Check if we can find ICAO, else set it to GLID
             				$aircraft_name_split = explode(' ',$aircraft_name);
             				$search_more = '';
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+            				}
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
             				$sth_search = $Connection->db->prepare($query_search);
 					try {
@@ -311,7 +362,9 @@ 
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
-					if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
+					if (!isset($values['ICAOTypeCode'])) {
+						$values['ICAOTypeCode'] = 'GLID';
+					}
 					// Add data to db
 					if ($values['Registration'] != '' && $values['Registration'] != '0000') {
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
@@ -320,7 +373,9 @@ 
 						$sth_dest->execute($query_dest_values);
 					}
 				}
-				if ($globalTransaction) $Connection->db->commit();
+				if ($globalTransaction) {
+					$Connection->db->commit();
+				}
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
@@ -356,7 +411,9 @@ 
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
-				if ($globalTransaction) $Connection->db->beginTransaction();
+				if ($globalTransaction) {
+					$Connection->db->beginTransaction();
+				}
 				$tmp = fgetcsv($fh,9999,',',"'");
             			while (!feof($fh)) {
             				$line = fgetcsv($fh,9999,',',"'");
@@ -370,13 +427,17 @@ 
             				// Check if we can find ICAO, else set it to GLID
             				$aircraft_name_split = explode(' ',$aircraft_name);
             				$search_more = '';
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+            				}
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
             				$sth_search = $Connection->db->prepare($query_search);
 					try {
                                     		$sth_search->execute();
 	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
-	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
+	            				if (isset($result['icao']) && $result['icao'] != '') {
+	            					$values['ICAOTypeCode'] = $result['icao'];
+	            				}
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
@@ -389,7 +450,9 @@ 
 						$sth_dest->execute($query_dest_values);
 					}
 				}
-				if ($globalTransaction) $Connection->db->commit();
+				if ($globalTransaction) {
+					$Connection->db->commit();
+				}
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
@@ -428,7 +491,9 @@ 
 			$sth_dest = $Connection->db->prepare($query_dest);
 			$sth_modes = $Connection->db->prepare($query_modes);
 			try {
-				if ($globalTransaction) $Connection->db->beginTransaction();
+				if ($globalTransaction) {
+					$Connection->db->beginTransaction();
+				}
 				$tmp = fgetcsv($fh,9999,',','"');
             			while (!feof($fh)) {
             				$line = fgetcsv($fh,9999,',','"');
@@ -438,16 +503,22 @@ 
             				    $values['registration'] = $line[0];
             				    $values['base'] = $line[4];
             				    $values['owner'] = $line[5];
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+            				    if ($line[6] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+					    }
 					    $values['cancel'] = $line[7];
 					} elseif ($country == 'EI') {
 					    // TODO : add modeS & reg to aircraft_modes
             				    $values['registration'] = $line[0];
             				    $values['base'] = $line[3];
             				    $values['owner'] = $line[2];
-            				    if ($line[1] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
+            				    if ($line[1] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
+					    }
 					    $values['cancel'] = '';
 					    $values['modes'] = $line[7];
 					    $values['icao'] = $line[8];
@@ -466,16 +537,22 @@ 
             				    $values['registration'] = $line[3];
             				    $values['base'] = null;
             				    $values['owner'] = $line[5];
-            				    if ($line[18] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
+            				    if ($line[18] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == 'VH') {
 					    // TODO : add modeS & reg to aircraft_modes
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[12];
-            				    if ($line[28] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
+            				    if ($line[28] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
+					    }
 
 					    $values['cancel'] = $line[39];
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
@@ -494,29 +571,41 @@ 
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[8];
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+            				    if ($line[7] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == 'PP') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[4];
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+            				    if ($line[6] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+					    }
 					    $values['cancel'] = $line[7];
 					} elseif ($country == 'E7') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[4];
-            				    if ($line[5] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
+            				    if ($line[5] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == '8Q') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[3];
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+            				    if ($line[7] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == 'ZK') {
             				    $values['registration'] = $line[0];
@@ -561,7 +650,9 @@ 
 						$sth_modes->execute($query_modes_values);
 					}
 				}
-				if ($globalTransaction) $Connection->db->commit();
+				if ($globalTransaction) {
+					$Connection->db->commit();
+				}
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
@@ -697,25 +788,45 @@ 
 		    VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)";
 		$Connection = new Connection();
 		$sth_dest = $Connection->db->prepare($query_dest);
-		if ($globalTransaction) $Connection->db->beginTransaction();
+		if ($globalTransaction) {
+			$Connection->db->beginTransaction();
+		}
   
 		$i = 0;
 		while($row = sparql_fetch_array($result))
 		{
 			if ($i >= 1) {
 			//print_r($row);
-			if (!isset($row['iata'])) $row['iata'] = '';
-			if (!isset($row['icao'])) $row['icao'] = '';
-			if (!isset($row['type'])) $row['type'] = '';
-			if (!isset($row['altitude'])) $row['altitude'] = '';
+			if (!isset($row['iata'])) {
+				$row['iata'] = '';
+			}
+			if (!isset($row['icao'])) {
+				$row['icao'] = '';
+			}
+			if (!isset($row['type'])) {
+				$row['type'] = '';
+			}
+			if (!isset($row['altitude'])) {
+				$row['altitude'] = '';
+			}
 			if (isset($row['city_bis'])) {
 				$row['city'] = $row['city_bis'];
 			}
-			if (!isset($row['city'])) $row['city'] = '';
-			if (!isset($row['country'])) $row['country'] = '';
-			if (!isset($row['homepage'])) $row['homepage'] = '';
-			if (!isset($row['wikipedia_page'])) $row['wikipedia_page'] = '';
-			if (!isset($row['name'])) continue;
+			if (!isset($row['city'])) {
+				$row['city'] = '';
+			}
+			if (!isset($row['country'])) {
+				$row['country'] = '';
+			}
+			if (!isset($row['homepage'])) {
+				$row['homepage'] = '';
+			}
+			if (!isset($row['wikipedia_page'])) {
+				$row['wikipedia_page'] = '';
+			}
+			if (!isset($row['name'])) {
+				continue;
+			}
 			if (!isset($row['image'])) {
 				$row['image'] = '';
 				$row['image_thumb'] = '';
@@ -771,7 +882,9 @@ 
 
 			$i++;
 		}
-		if ($globalTransaction) $Connection->db->commit();
+		if ($globalTransaction) {
+			$Connection->db->commit();
+		}
 		/*
 		echo "Delete duplicate rows...\n";
 		$query = 'ALTER IGNORE TABLE airport ADD UNIQUE INDEX icaoidx (icao)';
@@ -814,7 +927,9 @@ 
 		$delimiter = ',';
 		$out_file = $tmp_dir.'airports.csv';
 		update_db::download('http://ourairports.com/data/airports.csv',$out_file);
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
+		if (!file_exists($out_file) || !is_readable($out_file)) {
+			return FALSE;
+		}
 		echo "Add data from ourairports.com...\n";
 
 		$header = NULL;
@@ -824,8 +939,9 @@ 
 			//$Connection->db->beginTransaction();
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if(!$header) $header = $row;
-				else {
+				if(!$header) {
+					$header = $row;
+				} else {
 					$data = array();
 					$data = array_combine($header, $row);
 					try {
@@ -866,7 +982,9 @@ 
 		echo "Download data from another free database...\n";
 		$out_file = $tmp_dir.'GlobalAirportDatabase.zip';
 		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file);
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
+		if (!file_exists($out_file) || !is_readable($out_file)) {
+			return FALSE;
+		}
 		update_db::unzip($out_file);
 		$header = NULL;
 		echo "Add data from another free database...\n";
@@ -877,8 +995,9 @@ 
 			//$Connection->db->beginTransaction();
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if(!$header) $header = $row;
-				else {
+				if(!$header) {
+					$header = $row;
+				} else {
 					$data = $row;
 
 					$query = 'UPDATE airport SET city = :city, country = :country WHERE icao = :icao';
@@ -1047,7 +1166,9 @@ 
 		if (($handle = fopen($tmp_dir.'MASTER.txt', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1060,7 +1181,9 @@ 
 					}
 					$result_search = $sths->fetchAll(PDO::FETCH_ASSOC);
 					if (!empty($result_search)) {
-						if ($globalDebug) echo '.';
+						if ($globalDebug) {
+							echo '.';
+						}
 							//if ($globalDBdriver == 'mysql') {
 							//	$queryi = 'INSERT INTO faamfr (mfr,icao) VALUES (:mfr,:icao) ON DUPLICATE KEY UPDATE icao = :icao';
 							//} else {
@@ -1082,8 +1205,12 @@ 
 						}
 						$result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC);
 						if (!empty($result_search_mfr)) {
-							if (trim($data[16]) == '' && trim($data[23]) != '') $data[16] = $data[23];
-							if (trim($data[16]) == '' && trim($data[15]) != '') $data[16] = $data[15];
+							if (trim($data[16]) == '' && trim($data[23]) != '') {
+								$data[16] = $data[23];
+							}
+							if (trim($data[16]) == '' && trim($data[15]) != '') {
+								$data[16] = $data[15];
+							}
 							$queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)';
 							try {
 								$sthf = $Connection->db->prepare($queryf);
@@ -1094,7 +1221,9 @@ 
 						}
 					}
 					if (strtotime($data[29]) > time()) {
-						if ($globalDebug) echo 'i';
+						if ($globalDebug) {
+							echo 'i';
+						}
 						$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
 						try {
 							$sth = $Connection->db->prepare($query);
@@ -1105,13 +1234,19 @@ 
 					}
 				}
 				if ($i % 90 == 0) {
-					if ($globalTransaction) $Connection->db->commit();
-					if ($globalTransaction) $Connection->db->beginTransaction();
+					if ($globalTransaction) {
+						$Connection->db->commit();
+					}
+					if ($globalTransaction) {
+						$Connection->db->beginTransaction();
+					}
 				}
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
 	}
@@ -1131,11 +1266,15 @@ 
 		if (($handle = fopen($tmp_dir.'modes.tsv', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
-					if ($data[1] == 'NULL') $data[1] = $data[0];
+					if ($data[1] == 'NULL') {
+						$data[1] = $data[0];
+					}
 					$query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)';
 					try {
 						$sth = $Connection->db->prepare($query);
@@ -1147,7 +1286,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
 	}
@@ -1179,11 +1320,15 @@ 
 		if (($handle = fopen($tmp_dir.'airlines.tsv', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
-					if ($data[1] == 'NULL') $data[1] = $data[0];
+					if ($data[1] == 'NULL') {
+						$data[1] = $data[0];
+					}
 					$query = 'INSERT INTO airlines (airline_id,name,alias,iata,icao,callsign,country,active,type,home_link,wikipedia_link,alliance,ban_eu) VALUES (0,:name,:alias,:iata,:icao,:callsign,:country,:active,:type,:home,:wikipedia_link,:alliance,:ban_eu)';
 					try {
 						$sth = $Connection->db->prepare($query);
@@ -1195,7 +1340,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		/*
 		$query = "UNLOCK TABLES";
@@ -1225,7 +1372,9 @@ 
 		if (($handle = fopen($tmp_dir.'owners.tsv', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1241,7 +1390,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1261,7 +1412,9 @@ 
 		if (($handle = fopen($tmp_dir.'routes.tsv', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1270,13 +1423,17 @@ 
 						$sth = $Connection->db->prepare($query);
 						$sth->execute(array(':CallSign' => $data[0],':Operator_ICAO' => $data[1],':FromAirport_ICAO' => $data[2],':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4],':ToAirport_Time' => $data[5],':RouteStop' => $data[6],':source' => 'website_fam'));
 					} catch(PDOException $e) {
-						if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data);
+						if ($globalDebug) {
+							echo "error: ".$e->getMessage()." - data: ".implode(',',$data);
+						}
 					}
 				}
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1301,7 +1458,9 @@ 
 			$i = 0;
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
 			//$Connection->db->beginTransaction();
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1317,7 +1476,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1337,7 +1498,9 @@ 
 		if (($handle = fopen($tmp_dir.'satellite.tsv', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1354,7 +1517,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
 	}
@@ -1373,7 +1538,9 @@ 
 		$Connection = new Connection();
 		if (($handle = fopen($tmp_dir.'ban_eu.csv', 'r')) !== FALSE)
 		{
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000)) !== FALSE)
 			{
 				$query = 'UPDATE airlines SET ban_eu = 1 WHERE icao = :icao AND forsource IS NULL';
@@ -1388,7 +1555,9 @@ 
 				}
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1464,9 +1633,14 @@ 
 				if ($i > 0 && $data[0] != '') {
 					$sources = trim($data[28].' '.$data[29].' '.$data[30].' '.$data[31].' '.$data[32].' '.$data[33]);
 					$period = str_replace(',','',$data[14]);
-					if (!empty($period) && strpos($period,'days')) $period = str_replace(' days','',$period)*24*60;
-					if ($data[18] != '') $launch_date = date('Y-m-d',strtotime($data[18]));
-					else $launch_date = NULL;
+					if (!empty($period) && strpos($period,'days')) {
+						$period = str_replace(' days','',$period)*24*60;
+					}
+					if ($data[18] != '') {
+						$launch_date = date('Y-m-d',strtotime($data[18]));
+					} else {
+						$launch_date = NULL;
+					}
 					$data = array_map(function($value) {
 						return trim($value) === '' ? null : $value;
 					}, $data);
@@ -1829,7 +2003,9 @@ 
 		if (($handle = fopen($filename, 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				$i++;
@@ -1857,7 +2033,9 @@ 
 				}
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
 	}
@@ -1900,7 +2078,9 @@ 
 		$Connection = new Connection();
 		if (($handle = fopen($filename, 'r')) !== FALSE)
 		{
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if(count($row) > 1) {
@@ -1914,7 +2094,9 @@ 
 				}
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1934,8 +2116,9 @@ 
 	        }
 
 
-		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
-		else {
+		if ($globalDBdriver == 'mysql') {
+			update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
+		} else {
 			update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql');
 			$query = "CREATE EXTENSION postgis";
 			$Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']);
@@ -1954,7 +2137,9 @@ 
 		global $tmp_dir, $globalDebug;
 		include_once('class.create_db.php');
 		require_once(dirname(__FILE__).'/../require/class.NOTAM.php');
-		if ($globalDebug) echo "NOTAM from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "NOTAM from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5',$tmp_dir.'notam.txt.gz.md5');
 		$error = '';
 		if (file_exists($tmp_dir.'notam.txt.gz.md5')) {
@@ -1964,20 +2149,34 @@ 
 				update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
 				if (file_exists($tmp_dir.'notam.txt.gz')) {
 					if (md5_file($tmp_dir.'notam.txt.gz') == $notam_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.'notam.txt.gz');
-						if ($globalDebug) echo "Add to DB...";
+						if ($globalDebug) {
+							echo "Add to DB...";
+						}
 						//$error = create_db::import_file($tmp_dir.'notam.sql');
 						$NOTAM = new NOTAM();
 						$NOTAM->updateNOTAMfromTextFile($tmp_dir.'notam.txt');
 						update_db::insert_notam_version($notam_md5);
-					} else $error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed.";
-				} else $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
-			} elseif ($globalDebug) echo "No new version.";
-		} else $error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed.";
+					}
+				} else {
+					$error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
+				}
+			} elseif ($globalDebug) {
+				echo "No new version.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
@@ -2032,68 +2231,114 @@ 
 		//update_db::download('http://fr.mirror.ivao.aero/software/ivae_feb2013.zip',$tmp_dir.'ivae_feb2013.zip');
 		if (extension_loaded('zip')) {
 			if (file_exists($tmp_dir.'ivae_feb2013.zip')) {
-				if ($globalDebug) echo "Unzip...";
+				if ($globalDebug) {
+					echo "Unzip...";
+				}
 				update_db::unzip($tmp_dir.'ivae_feb2013.zip');
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				update_db::ivao_airlines($tmp_dir.'data/airlines.dat');
-				if ($globalDebug) echo "Copy airlines logos to airlines images directory...";
+				if ($globalDebug) {
+					echo "Copy airlines logos to airlines images directory...";
+				}
 				if (is_writable(dirname(__FILE__).'/../images/airlines')) {
-					if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
-				} else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
-			} else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
-		} else $error = "ZIP module not loaded but required for IVAO.";
+					if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) {
+						$error = "Failed to copy airlines logo.";
+					}
+				} else {
+					$error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
+				}
+			} else {
+				$error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
+			}
+		} else {
+			$error = "ZIP module not loaded but required for IVAO.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_routes() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Routes : Download...";
+		if ($globalDebug) {
+			echo "Routes : Download...";
+		}
 		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz');
 		if (file_exists($tmp_dir.'StandingData.sqb.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'StandingData.sqb.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_route_sqlite_to_dest($tmp_dir.'StandingData.sqb');
-		} else $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_oneworld() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Schedules Oneworld : Download...";
+		if ($globalDebug) {
+			echo "Schedules Oneworld : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
 		if (file_exists($tmp_dir.'oneworld.csv.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'oneworld.csv.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_route_oneworld($tmp_dir.'oneworld.csv');
-		} else $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_skyteam() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Schedules Skyteam : Download...";
+		if ($globalDebug) {
+			echo "Schedules Skyteam : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
 		if (file_exists($tmp_dir.'skyteam.csv.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'skyteam.csv.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_route_skyteam($tmp_dir.'skyteam.csv');
-		} else $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_ModeS() {
@@ -2110,340 +2355,590 @@ 
 			exit;
 		} elseif ($globalDebug) echo "Done\n";
 */
-		if ($globalDebug) echo "Modes : Download...";
-//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
+		if ($globalDebug) {
+			echo "Modes : Download...";
+		}
+		//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
 		update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz');
 
 //		if (file_exists($tmp_dir.'basestation_latest.zip')) {
 		if (file_exists($tmp_dir.'BaseStation.sqb.gz')) {
-			if ($globalDebug) echo "Unzip...";
-//			update_db::unzip($tmp_dir.'basestation_latest.zip');
+			if ($globalDebug) {
+				echo "Unzip...";
+			}
+			//			update_db::unzip($tmp_dir.'basestation_latest.zip');
 			update_db::gunzip($tmp_dir.'BaseStation.sqb.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'BaseStation.sqb');
 //			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'basestation.sqb');
-		} else $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_ModeS_faa() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Modes FAA: Download...";
+		if ($globalDebug) {
+			echo "Modes FAA: Download...";
+		}
 		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip');
 		if (file_exists($tmp_dir.'ReleasableAircraft.zip')) {
-			if ($globalDebug) echo "Unzip...";
+			if ($globalDebug) {
+				echo "Unzip...";
+			}
 			update_db::unzip($tmp_dir.'ReleasableAircraft.zip');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::modes_faa();
-		} else $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_ModeS_flarm() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Modes Flarmnet: Download...";
+		if ($globalDebug) {
+			echo "Modes Flarmnet: Download...";
+		}
 		update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln');
 		if (file_exists($tmp_dir.'data.fln')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln');
-		} else $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_ModeS_ogn() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Modes OGN: Download...";
+		if ($globalDebug) {
+			echo "Modes OGN: Download...";
+		}
 		update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv');
 		if (file_exists($tmp_dir.'ogn.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv');
-		} else $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_owner() {
 		global $tmp_dir, $globalDebug, $globalMasterSource;
 		
-		if ($globalDebug) echo "Owner France: Download...";
+		if ($globalDebug) {
+			echo "Owner France: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv');
 		if (file_exists($tmp_dir.'owner_f.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F');
-		} else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		
-		if ($globalDebug) echo "Owner Ireland: Download...";
+		if ($globalDebug) {
+			echo "Owner Ireland: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv');
 		if (file_exists($tmp_dir.'owner_ei.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI');
-		} else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Switzerland: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Switzerland: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv');
 		if (file_exists($tmp_dir.'owner_hb.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB');
-		} else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Czech Republic: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Czech Republic: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv');
 		if (file_exists($tmp_dir.'owner_ok.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK');
-		} else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Australia: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Australia: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv');
 		if (file_exists($tmp_dir.'owner_vh.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH');
-		} else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Austria: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Austria: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv');
 		if (file_exists($tmp_dir.'owner_oe.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE');
-		} else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Chile: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Chile: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv');
 		if (file_exists($tmp_dir.'owner_cc.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC');
-		} else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Colombia: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Colombia: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv');
 		if (file_exists($tmp_dir.'owner_hj.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ');
-		} else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Bosnia Herzegobina: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Bosnia Herzegobina: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv');
 		if (file_exists($tmp_dir.'owner_e7.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7');
-		} else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Brazil: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Brazil: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv');
 		if (file_exists($tmp_dir.'owner_pp.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP');
-		} else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Cayman Islands: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Cayman Islands: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv');
 		if (file_exists($tmp_dir.'owner_vp.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP');
-		} else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Croatia: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Croatia: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv');
 		if (file_exists($tmp_dir.'owner_9a.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A');
-		} else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Luxembourg: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Luxembourg: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv');
 		if (file_exists($tmp_dir.'owner_lx.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX');
-		} else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Maldives: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Maldives: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv');
 		if (file_exists($tmp_dir.'owner_8q.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q');
-		} else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner New Zealand: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner New Zealand: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv');
 		if (file_exists($tmp_dir.'owner_zk.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK');
-		} else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Papua New Guinea: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Papua New Guinea: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv');
 		if (file_exists($tmp_dir.'owner_p2.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2');
-		} else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Slovakia: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Slovakia: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv');
 		if (file_exists($tmp_dir.'owner_om.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM');
-		} else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Ecuador: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Ecuador: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv');
 		if (file_exists($tmp_dir.'owner_hc.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC');
-		} else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Iceland: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Iceland: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv');
 		if (file_exists($tmp_dir.'owner_tf.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF');
-		} else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Isle of Man: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Isle of Man: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv');
 		if (file_exists($tmp_dir.'owner_m.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M');
-		} else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		if ($globalMasterSource) {
-			if ($globalDebug) echo "ModeS Netherlands: Download...";
+			if ($globalDebug) {
+				echo "ModeS Netherlands: Download...";
+			}
 			update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv');
 			if (file_exists($tmp_dir.'owner_ph.csv')) {
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH');
-			} else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
+			}
 			if ($error != '') {
 				return $error;
-			} elseif ($globalDebug) echo "Done\n";
-			if ($globalDebug) echo "ModeS Denmark: Download...";
+			} elseif ($globalDebug) {
+				echo "Done\n";
+			}
+			if ($globalDebug) {
+				echo "ModeS Denmark: Download...";
+			}
 			update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv');
 			if (file_exists($tmp_dir.'owner_oy.csv')) {
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY');
-			} else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
+			}
 			if ($error != '') {
 				return $error;
-			} elseif ($globalDebug) echo "Done\n";
-		} elseif ($globalDebug) echo "Done\n";
+			} elseif ($globalDebug) {
+				echo "Done\n";
+			}
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_translation() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Translation : Download...";
+		if ($globalDebug) {
+			echo "Translation : Download...";
+		}
 		update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip');
 		if (file_exists($tmp_dir.'translation.zip')) {
-			if ($globalDebug) echo "Unzip...";
+			if ($globalDebug) {
+				echo "Unzip...";
+			}
 			update_db::unzip($tmp_dir.'translation.zip');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::translation();
-		} else $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_translation_fam() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Translation from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Translation from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz');
 		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5',$tmp_dir.'translation.tsv.gz.md5');
 		if (file_exists($tmp_dir.'translation.tsv.gz') && file_exists($tmp_dir.'translation.tsv.gz')) {
 			$translation_md5_file = explode(' ',file_get_contents($tmp_dir.'translation.tsv.gz.md5'));
 			$translation_md5 = $translation_md5_file[0];
 			if (md5_file($tmp_dir.'translation.tsv.gz') == $translation_md5) {
-				if ($globalDebug) echo "Gunzip...";
+				if ($globalDebug) {
+					echo "Gunzip...";
+				}
 				update_db::gunzip($tmp_dir.'translation.tsv.gz');
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::translation_fam();
-			} else $error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed.";
-		} else $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_ModeS_fam() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "ModeS from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "ModeS from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz');
 		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5',$tmp_dir.'modes.tsv.gz.md5');
 		if (file_exists($tmp_dir.'modes.tsv.gz') && file_exists($tmp_dir.'modes.tsv.gz.md5')) {
 			$modes_md5_file = explode(' ',file_get_contents($tmp_dir.'modes.tsv.gz.md5'));
 			$modes_md5 = $modes_md5_file[0];
 			if (md5_file($tmp_dir.'modes.tsv.gz') == $modes_md5) {
-				if ($globalDebug) echo "Gunzip...";
+				if ($globalDebug) {
+					echo "Gunzip...";
+				}
 				update_db::gunzip($tmp_dir.'modes.tsv.gz');
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::modes_fam();
-			} else $error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed.";
-		} else $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_airlines_fam() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Airlines from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Airlines from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5',$tmp_dir.'airlines.tsv.gz.md5');
 		if (file_exists($tmp_dir.'airlines.tsv.gz.md5')) {
 			$airlines_md5_file = explode(' ',file_get_contents($tmp_dir.'airlines.tsv.gz.md5'));
@@ -2452,26 +2947,42 @@ 
 				update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz',$tmp_dir.'airlines.tsv.gz');
 				if (file_exists($tmp_dir.'airlines.tsv.gz')) {
 					if (md5_file($tmp_dir.'airlines.tsv.gz') == $airlines_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.'airlines.tsv.gz');
-						if ($globalDebug) echo "Add to DB...";
+						if ($globalDebug) {
+							echo "Add to DB...";
+						}
 						$error = update_db::airlines_fam();
 						update_db::insert_airlines_version($airlines_md5);
-					} else $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed.";
-			    } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed.";
-			} elseif ($globalDebug) echo "No update.";
-		} else $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed.";
+					}
+			    } else {
+			    	$error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed.";
+			    }
+			} elseif ($globalDebug) {
+				echo "No update.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
 		} else {
-			if ($globalDebug) echo "Done\n";
+			if ($globalDebug) {
+				echo "Done\n";
+			}
 		}
 		return '';
 	}
 
 	public static function update_owner_fam() {
 		global $tmp_dir, $globalDebug, $globalOwner;
-		if ($globalDebug) echo "owner from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "owner from FlightAirMap website : Download...";
+		}
 		$error = '';
 		if ($globalOwner === TRUE) {
 			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz');
@@ -2484,35 +2995,57 @@ 
 			$owners_md5_file = explode(' ',file_get_contents($tmp_dir.'owners.tsv.gz.md5'));
 			$owners_md5 = $owners_md5_file[0];
 			if (md5_file($tmp_dir.'owners.tsv.gz') == $owners_md5) {
-				if ($globalDebug) echo "Gunzip...";
+				if ($globalDebug) {
+					echo "Gunzip...";
+				}
 				update_db::gunzip($tmp_dir.'owners.tsv.gz');
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::owner_fam();
-			} else $error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed.";
-		} else $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_routes_fam() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Routes from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Routes from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz');
 		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5',$tmp_dir.'routes.tsv.gz.md5');
 		if (file_exists($tmp_dir.'routes.tsv.gz') && file_exists($tmp_dir.'routes.tsv.gz.md5')) {
 			$routes_md5_file = explode(' ',file_get_contents($tmp_dir.'routes.tsv.gz.md5'));
 			$routes_md5 = $routes_md5_file[0];
 			if (md5_file($tmp_dir.'routes.tsv.gz') == $routes_md5) {
-				if ($globalDebug) echo "Gunzip...";
+				if ($globalDebug) {
+					echo "Gunzip...";
+				}
 				update_db::gunzip($tmp_dir.'routes.tsv.gz');
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::routes_fam();
-			} else $error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed.";
-		} else $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_marine_identity_fam() {
@@ -2522,21 +3055,33 @@ 
 			$marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5'));
 			$marine_identity_md5 = $marine_identity_md5_file[0];
 			if (!update_db::check_marine_identity_version($marine_identity_md5)) {
-				if ($globalDebug) echo "Marine identity from FlightAirMap website : Download...";
+				if ($globalDebug) {
+					echo "Marine identity from FlightAirMap website : Download...";
+				}
 				update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz');
 				if (file_exists($tmp_dir.'marine_identity.tsv.gz')) {
 					if (md5_file($tmp_dir.'marine_identity.tsv.gz') == $marine_identity_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.'marine_identity.tsv.gz');
-						if ($globalDebug) echo "Add to DB...";
+						if ($globalDebug) {
+							echo "Add to DB...";
+						}
 						$error = update_db::marine_identity_fam();
-					} else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed.";
-				} else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed.";
+					}
+				} else {
+					$error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed.";
+				}
 				if ($error != '') {
 					return $error;
 				} else {
 					update_db::insert_marine_identity_version($marine_identity_md5);
-					if ($globalDebug) echo "Done\n";
+					if ($globalDebug) {
+						echo "Done\n";
+					}
 				}
 			}
 		}
@@ -2550,21 +3095,33 @@ 
 			$satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5'));
 			$satellite_md5 = $satellite_md5_file[0];
 			if (!update_db::check_satellite_version($satellite_md5)) {
-				if ($globalDebug) echo "Satellite from FlightAirMap website : Download...";
+				if ($globalDebug) {
+					echo "Satellite from FlightAirMap website : Download...";
+				}
 				update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz');
 				if (file_exists($tmp_dir.'satellite.tsv.gz')) {
 					if (md5_file($tmp_dir.'satellite.tsv.gz') == $satellite_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.'satellite.tsv.gz');
-						if ($globalDebug) echo "Add to DB...";
+						if ($globalDebug) {
+							echo "Add to DB...";
+						}
 						$error = update_db::satellite_fam();
-					} else $error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed.";
-				} else $error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed.";
+					}
+				} else {
+					$error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed.";
+				}
 				if ($error != '') {
 					return $error;
 				} else {
 					update_db::insert_satellite_version($satellite_md5);
-					if ($globalDebug) echo "Done\n";
+					if ($globalDebug) {
+						echo "Done\n";
+					}
 				}
 			}
 		}
@@ -2572,17 +3129,25 @@ 
 	}
 	public static function update_banned_fam() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Banned airlines in Europe from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv');
 		if (file_exists($tmp_dir.'ban_eu.csv')) {
 			//if ($globalDebug) echo "Gunzip...";
 			//update_db::gunzip($tmp_dir.'ban_ue.csv');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::banned_fam();
-		} else $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
@@ -2590,7 +3155,9 @@ 
 		global $tmp_dir, $globalDebug, $globalDBdriver;
 		include_once('class.create_db.php');
 		$error = '';
-		if ($globalDebug) echo "Airspace from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Airspace from FlightAirMap website : Download...";
+		}
 		if ($globalDBdriver == 'mysql') {
 			update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
 		} else {
@@ -2607,9 +3174,13 @@ 
 				}
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
 					if (md5_file($tmp_dir.'airspace.sql.gz') == $airspace_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.'airspace.sql.gz');
-						if ($globalDebug) echo "Add to DB...";
+						if ($globalDebug) {
+							echo "Add to DB...";
+						}
 						$Connection = new Connection();
 						if ($Connection->tableExists('airspace')) {
 							$query = 'DROP TABLE airspace';
@@ -2622,20 +3193,30 @@ 
 						}
 						$error = create_db::import_file($tmp_dir.'airspace.sql');
 						update_db::insert_airspace_version($airspace_md5);
-					} else $error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed.";
-				} else $error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed.";
+					}
+				} else {
+					$error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed.";
+				}
 			}
-		} else $error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_geoid_fam() {
 		global $tmp_dir, $globalDebug, $globalGeoidSource;
 		$error = '';
-		if ($globalDebug) echo "Geoid from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Geoid from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5');
 		if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) {
 			$geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5'));
@@ -2644,76 +3225,116 @@ 
 				update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz');
 				if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) {
 					if (md5_file($tmp_dir.$globalGeoidSource.'.pgm.gz') == $geoid_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm');
 						if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) {
 							update_db::insert_geoid_version($geoid_md5);
 						}
-					} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed.";
-				} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed.";
+					}
+				} else {
+					$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed.";
+				}
 			}
-		} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_tle() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Download TLE : Download...";
+		if ($globalDebug) {
+			echo "Download TLE : Download...";
+		}
 		$alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt',
 		'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt',
 		'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt','visual.txt','sarsat.txt','argos.txt','ses.txt','iridium-NEXT.txt','beidou.txt');
 		foreach ($alltle as $filename) {
-			if ($globalDebug) echo "downloading ".$filename.'...';
+			if ($globalDebug) {
+				echo "downloading ".$filename.'...';
+			}
 			update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename);
 			if (file_exists($tmp_dir.$filename)) {
-				if ($globalDebug) echo "Add to DB ".$filename."...";
+				if ($globalDebug) {
+					echo "Add to DB ".$filename."...";
+				}
 				$error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename));
-			} else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
+			}
 			if ($error != '') {
 				echo $error."\n";
-			} elseif ($globalDebug) echo "Done\n";
+			} elseif ($globalDebug) {
+				echo "Done\n";
+			}
 		}
 		return '';
 	}
 
 	public static function update_ucsdb() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Download UCS DB : Download...";
+		if ($globalDebug) {
+			echo "Download UCS DB : Download...";
+		}
 		update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/4-11-17-update/UCS_Satellite_Database_officialname_1-1-17.txt',$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
 		if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
-		} else $error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			echo $error."\n";
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_celestrak() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Download Celestrak DB : Download...";
+		if ($globalDebug) {
+			echo "Download Celestrak DB : Download...";
+		}
 		update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt');
 		if (file_exists($tmp_dir.'satcat.txt')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::satellite_celestrak($tmp_dir.'satcat.txt');
-		} else $error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			echo $error."\n";
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_models() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Models from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Models from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum');
 		if (file_exists($tmp_dir.'models.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2732,19 +3353,29 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading model '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "glTF 2.0 Models from FlightAirMap website : Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "glTF 2.0 Models from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',$tmp_dir.'modelsgltf2.md5sum');
 		if (file_exists($tmp_dir.'modelsgltf2.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'modelsgltf2.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2763,25 +3394,35 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading model '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.com/data/models/gltf2/'.$key,dirname(__FILE__).'/../models/gltf2/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',dirname(__FILE__).'/../models/gltf2/models.md5sum');
-		} else $error = "File ".$tmp_dir.'modelsgltf2.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'modelsgltf2.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_liveries() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Liveries from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Liveries from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',$tmp_dir.'liveries.md5sum');
 		if (file_exists($tmp_dir.'liveries.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'liveries.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2800,25 +3441,35 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading liveries '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading liveries '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/'.$key,dirname(__FILE__).'/../models/gltf2/liveries/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum');
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_space_models() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Space models from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Space models from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum');
 		if (file_exists($tmp_dir.'space_models.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2837,25 +3488,35 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading space model '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum');
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_vehicules_models() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Vehicules models from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum');
 		if (file_exists($tmp_dir.'vehicules_models.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2874,15 +3535,21 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading vehicules model '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum');
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
@@ -2925,7 +3592,9 @@ 
                 }
 
 		$error = '';
-		if ($globalDebug) echo "Notam : Download...";
+		if ($globalDebug) {
+			echo "Notam : Download...";
+		}
 		update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss');
 		if (file_exists($tmp_dir.'notam.rss')) {
 			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true);
@@ -2940,14 +3609,30 @@ 
 				$data['fir'] = $q[0];
 				$data['code'] = $q[1];
 				$ifrvfr = $q[2];
-				if ($ifrvfr == 'IV') $data['rules'] = 'IFR/VFR';
-				if ($ifrvfr == 'I') $data['rules'] = 'IFR';
-				if ($ifrvfr == 'V') $data['rules'] = 'VFR';
-				if ($q[4] == 'A') $data['scope'] = 'Airport warning';
-				if ($q[4] == 'E') $data['scope'] = 'Enroute warning';
-				if ($q[4] == 'W') $data['scope'] = 'Navigation warning';
-				if ($q[4] == 'AE') $data['scope'] = 'Airport/Enroute warning';
-				if ($q[4] == 'AW') $data['scope'] = 'Airport/Navigation warning';
+				if ($ifrvfr == 'IV') {
+					$data['rules'] = 'IFR/VFR';
+				}
+				if ($ifrvfr == 'I') {
+					$data['rules'] = 'IFR';
+				}
+				if ($ifrvfr == 'V') {
+					$data['rules'] = 'VFR';
+				}
+				if ($q[4] == 'A') {
+					$data['scope'] = 'Airport warning';
+				}
+				if ($q[4] == 'E') {
+					$data['scope'] = 'Enroute warning';
+				}
+				if ($q[4] == 'W') {
+					$data['scope'] = 'Navigation warning';
+				}
+				if ($q[4] == 'AE') {
+					$data['scope'] = 'Airport/Enroute warning';
+				}
+				if ($q[4] == 'AW') {
+					$data['scope'] = 'Airport/Navigation warning';
+				}
 				//$data['scope'] = $q[4];
 				$data['lower_limit'] = $q[5];
 				$data['upper_limit'] = $q[6];
@@ -2955,8 +3640,12 @@ 
 				sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius);
 				$latitude = $Common->convertDec($las,'latitude');
 				$longitude = $Common->convertDec($lns,'longitude');
-				if ($lac == 'S') $latitude = '-'.$latitude;
-				if ($lnc == 'W') $longitude = '-'.$longitude;
+				if ($lac == 'S') {
+					$latitude = '-'.$latitude;
+				}
+				if ($lnc == 'W') {
+					$longitude = '-'.$longitude;
+				}
 				$data['center_latitude'] = $latitude;
 				$data['center_longitude'] = $longitude;
 				$data['radius'] = intval($radius);
@@ -2986,10 +3675,14 @@ 
 				$NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
 				unset($data);
 			} 
-		} else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	
@@ -3014,7 +3707,9 @@ 
 		$airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json');
 		$airspace_json = json_decode($airspace_lst,true);
 		foreach ($airspace_json['records'] as $airspace) {
-			if ($globalDebug) echo $airspace['name']."...\n";
+			if ($globalDebug) {
+				echo $airspace['name']."...\n";
+			}
 			update_db::download($airspace['uri'],$tmp_dir.$airspace['name']);
 			if (file_exists($tmp_dir.$airspace['name'])) {
 				file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name'])));
@@ -3058,8 +3753,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_update() {
@@ -3084,8 +3782,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return true;
-                else return false;
+                if ($row['nb'] > 0) {
+                	return true;
+                } else {
+                	return false;
+                }
 	}
 
 	public static function check_geoid_version($version) {
@@ -3098,8 +3799,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return true;
-                else return false;
+                if ($row['nb'] > 0) {
+                	return true;
+                } else {
+                	return false;
+                }
 	}
 
 	public static function check_marine_identity_version($version) {
@@ -3112,8 +3816,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return true;
-		else return false;
+		if ($row['nb'] > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	public static function check_satellite_version($version) {
@@ -3126,8 +3833,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return true;
-		else return false;
+		if ($row['nb'] > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	public static function check_airlines_version($version) {
@@ -3140,8 +3850,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return true;
-		else return false;
+		if ($row['nb'] > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	public static function check_notam_version($version) {
@@ -3154,8 +3867,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return true;
-		else return false;
+		if ($row['nb'] > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	public static function insert_airlines_version($version) {
@@ -3245,8 +3961,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_notam_update() {
@@ -3276,8 +3995,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_airspace_update() {
@@ -3307,8 +4029,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_geoid_update() {
@@ -3338,8 +4063,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_owner_update() {
@@ -3369,8 +4097,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_fires_update() {
@@ -3400,8 +4131,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_airlines_update() {
@@ -3431,8 +4165,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_schedules_update() {
@@ -3462,8 +4199,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_tle_update() {
@@ -3493,8 +4233,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_ucsdb_update() {
@@ -3524,8 +4267,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_celestrak_update() {
@@ -3555,8 +4301,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function check_last_satellite_update() {
@@ -3574,8 +4323,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_marine_identity_update() {