Ysurac / FlightAirMap

require/libs/Predict/Predict/QTH.php

Indentation +9 added lines, -9 removed lines

@@ -7,14 +7,14 @@
  */
 class Predict_QTH
 {
-     public $name;   /*!< Name, eg. callsign. */
-     public $loc;    /*!< Location, eg City, Country. */
-     public $desc;   /*!< Short description. */
-     public $lat;    /*!< Latitude in dec. deg. North. */
-     public $lon;    /*!< Longitude in dec. deg. East. */
-     public $alt;    /*!< Altitude above sea level in meters. */
-     public $qra;    /*!< QRA locator */
-     public $wx;     /*!< Weather station code (4 chars). */
+	 public $name;   /*!< Name, eg. callsign. */
+	 public $loc;    /*!< Location, eg City, Country. */
+	 public $desc;   /*!< Short description. */
+	 public $lat;    /*!< Latitude in dec. deg. North. */
+	 public $lon;    /*!< Longitude in dec. deg. East. */
+	 public $alt;    /*!< Altitude above sea level in meters. */
+	 public $qra;    /*!< QRA locator */
+	 public $wx;     /*!< Weather station code (4 chars). */
 
-     public $data;   /*!< Raw data from cfg file. */
+	 public $data;   /*!< Raw data from cfg file. */
 }

Spacing +9 added lines, -9 removed lines

@@ -7,14 +7,14 @@
  */
 class Predict_QTH
 {
-     public $name;   /*!< Name, eg. callsign. */
-     public $loc;    /*!< Location, eg City, Country. */
-     public $desc;   /*!< Short description. */
-     public $lat;    /*!< Latitude in dec. deg. North. */
-     public $lon;    /*!< Longitude in dec. deg. East. */
-     public $alt;    /*!< Altitude above sea level in meters. */
-     public $qra;    /*!< QRA locator */
-     public $wx;     /*!< Weather station code (4 chars). */
+     public $name; /*!< Name, eg. callsign. */
+     public $loc; /*!< Location, eg City, Country. */
+     public $desc; /*!< Short description. */
+     public $lat; /*!< Latitude in dec. deg. North. */
+     public $lon; /*!< Longitude in dec. deg. East. */
+     public $alt; /*!< Altitude above sea level in meters. */
+     public $qra; /*!< QRA locator */
+     public $wx; /*!< Weather station code (4 chars). */
 
-     public $data;   /*!< Raw data from cfg file. */
+     public $data; /*!< Raw data from cfg file. */
 }

require/libs/Predict/Predict/Vector.php

Indentation +4 added lines, -4 removed lines

@@ -6,8 +6,8 @@
  */
 class Predict_Vector
 {
-    public $x = 0;
-    public $y = 0;
-    public $z = 0;
-    public $w = 0;
+	public $x = 0;
+	public $y = 0;
+	public $z = 0;
+	public $w = 0;
 }

require/class.Satellite.php

Spacing +17 added lines, -17 removed lines

@@ -19,7 +19,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':name' => $name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -31,7 +31,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -43,7 +43,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -55,7 +55,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':type' => $type));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -63,27 +63,27 @@ 
 		else return array();
 	}
 	
-	public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) {
+	public function position_all($timestamp_begin = '', $timestamp_end = '', $second = 10) {
 		$all_sat = $this->get_tle_names();
 		$result = array();
 		foreach ($all_sat as $sat) {
-			$position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
-			$result = array_merge($position,$result);
+			$position = $this->position($sat['tle_name'], $timestamp_begin, $timestamp_end, $second);
+			$result = array_merge($position, $result);
 		}
 		return $result;
 	}
 
-	public function position_all_type($type,$timestamp_begin = '',$timestamp_end = '',$second = 10) {
+	public function position_all_type($type, $timestamp_begin = '', $timestamp_end = '', $second = 10) {
 		$all_sat = $this->get_tle_names_type($type);
 		$result = array();
 		foreach ($all_sat as $sat) {
-			$position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
-			$result = array_merge($position,$result);
+			$position = $this->position($sat['tle_name'], $timestamp_begin, $timestamp_end, $second);
+			$result = array_merge($position, $result);
 		}
 		return $result;
 	}
 	
-	public function position($name,$timestamp_begin = '',$timestamp_end = '',$second = 10) {
+	public function position($name, $timestamp_begin = '', $timestamp_end = '', $second = 10) {
 		$qth = new Predict_QTH();
 		$qth->lat = 37.790252;
 		$qth->lon = -122.419968;
@@ -91,7 +91,7 @@ 
 		$tle_file = $this->get_tle($name);
 		//print_r($tle_file);
 		$type = $tle_file['tle_type'];
-		$tle = new Predict_TLE($tle_file['tle_name'],$tle_file['tle_tle1'],$tle_file['tle_tle2']);
+		$tle = new Predict_TLE($tle_file['tle_name'], $tle_file['tle_tle1'], $tle_file['tle_tle2']);
 		$sat = new Predict_Sat($tle);
 		$predict = new Predict();
 		//if ($timestamp == '') $now = Predict_Time::get_current_daynum();
@@ -99,15 +99,15 @@ 
 		if ($timestamp_end == '') {
 			$now = Predict_Time::unix2daynum($timestamp_begin);
 			//echo $now;
-			$predict->predict_calc($sat,$qth,$now);
-			return array('name' => $name, 'latitude' => $sat->ssplat,'longitude' => $sat->ssplon, 'altitude' => $sat->alt,'speed' => $sat->velo*60*60,'timestamp' => $timestamp_begin,'type' => $type);
+			$predict->predict_calc($sat, $qth, $now);
+			return array('name' => $name, 'latitude' => $sat->ssplat, 'longitude' => $sat->ssplon, 'altitude' => $sat->alt, 'speed' => $sat->velo*60*60, 'timestamp' => $timestamp_begin, 'type' => $type);
 		} else {
-			for ($timestamp = $timestamp_begin; $timestamp <= $timestamp_end; $timestamp=$timestamp+$second) {
+			for ($timestamp = $timestamp_begin; $timestamp <= $timestamp_end; $timestamp = $timestamp + $second) {
 				//echo $timestamp."\n";
 				$now = Predict_Time::unix2daynum($timestamp);
 				//echo $now;
-				$predict->predict_calc($sat,$qth,$now);
-				$result[] = array('name' => $name,'latitude' => $sat->ssplat,'longitude' => $sat->ssplon, 'altitude' => $sat->alt,'speed' => $sat->velo*60*60,'timestamp' => $timestamp,'type' => $type);
+				$predict->predict_calc($sat, $qth, $now);
+				$result[] = array('name' => $name, 'latitude' => $sat->ssplat, 'longitude' => $sat->ssplon, 'altitude' => $sat->alt, 'speed' => $sat->velo*60*60, 'timestamp' => $timestamp, 'type' => $type);
 			}
 			return $result;
 		}

Braces +23 added lines, -9 removed lines

@@ -23,8 +23,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result[0];
-		else return array();
+		if (isset($result[0])) {
+			return $result[0];
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_types() {
 		$query = 'SELECT DISTINCT tle_type FROM tle ORDER BY tle_type';
@@ -35,8 +38,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_names() {
 		$query = 'SELECT DISTINCT tle_name, tle_type FROM tle';
@@ -47,8 +53,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_names_type($type) {
 		$query = 'SELECT tle_name, tle_type FROM tle WHERE tle_type = :type ORDER BY tle_name';
@@ -59,8 +68,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	
 	public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) {
@@ -95,7 +107,9 @@ 
 		$sat = new Predict_Sat($tle);
 		$predict = new Predict();
 		//if ($timestamp == '') $now = Predict_Time::get_current_daynum();
-		if ($timestamp_begin == '') $timestamp_begin = time();
+		if ($timestamp_begin == '') {
+			$timestamp_begin = time();
+		}
 		if ($timestamp_end == '') {
 			$now = Predict_Time::unix2daynum($timestamp_begin);
 			//echo $now;

install/populate_all.php

Indentation +31 added lines, -31 removed lines

@@ -1,48 +1,48 @@
 #!/usr/bin/php
 <?php
-    require_once('../require/settings.php');
-    if ($globalInstalled) {
-        echo '$globalInstalled must be set to FALSE in require/settings.php';
-        exit;
-    }
-    require('class.update_db.php');
-    echo "Populate all tables...\n";
-    update_db::update_all();
-    echo "\nInstall waypoints...(VERY slow!)";
-    update_db::update_waypoints();
-    echo "Done !\n";
-    echo "Install airspace...";
-    update_db::update_airspace();
-    echo "Done !\n";
-    echo "Install countries...";
-    update_db::update_countries();
-    echo "Done !\n";
-    if (isset($globalOwner) && $globalOwner) {
+	require_once('../require/settings.php');
+	if ($globalInstalled) {
+		echo '$globalInstalled must be set to FALSE in require/settings.php';
+		exit;
+	}
+	require('class.update_db.php');
+	echo "Populate all tables...\n";
+	update_db::update_all();
+	echo "\nInstall waypoints...(VERY slow!)";
+	update_db::update_waypoints();
+	echo "Done !\n";
+	echo "Install airspace...";
+	update_db::update_airspace();
+	echo "Done !\n";
+	echo "Install countries...";
+	update_db::update_countries();
+	echo "Done !\n";
+	if (isset($globalOwner) && $globalOwner) {
 	echo "Install private owners...";
 	update_db::update_owner();
-        echo "Done !\n";
-    }
-    /*
+		echo "Done !\n";
+	}
+	/*
     if (isset($globalIVAO) && $globalIVAO) {
         echo "Install IVAO airlines and logos...";
         update_db::update_IVAO();
 	echo "Done !\n";
     }
     */
-    if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
+	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 	echo "Install NOTAM from notaminfo.com...";
-        update_db:update_notam();
-        echo "Done !\n";
-    }
-    if (isset($globalMap3D) && $globalMap3D) {
+		update_db:update_notam();
+		echo "Done !\n";
+	}
+	if (isset($globalMap3D) && $globalMap3D) {
 	echo "Install 3D models...";
 	update_db::update_models();
 	echo "Done !\n";
 	if (isset($globalMapSatellites) && $globalMapSatellites) {
-	    echo "Install Space 3D models...";
-	    update_db::update_space_models();
-	    echo "Done !\n";
-        }
-    }
+		echo "Install Space 3D models...";
+		update_db::update_space_models();
+		echo "Done !\n";
+		}
+	}
 
 ?>
\ No newline at end of file

header.php

Braces +32 added lines, -7 removed lines

@@ -5,8 +5,11 @@ 
 $file_path = pathinfo($_SERVER['SCRIPT_NAME']);
 $current_page = $file_path['filename'];
 date_default_timezone_set($globalTimezone);
-if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') $MapType = $_COOKIE['MapType'];
-else $MapType = $globalMapProvider;
+if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') {
+	$MapType = $_COOKIE['MapType'];
+} else {
+	$MapType = $globalMapProvider;
+}
 ?>
 <!DOCTYPE html>
 <html>
@@ -181,7 +184,13 @@ 
 <script src="<?php print $globalURL; ?>/js/Marker.Rotate.js"></script>
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) {
+	print '&latitude='.$latitude;
+}
+?><?php if(isset($longitude)) {
+	print '&longitude='.$longitude;
+}
+?>&<?php print time(); ?>"></script>
 <?php
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
 ?>
@@ -235,7 +244,13 @@ 
 <script src="<?php print $globalURL; ?>/js/Marker.Rotate.js"></script>
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) {
+	print '&latitude='.$latitude;
+}
+?><?php if(isset($longitude)) {
+	print '&longitude='.$longitude;
+}
+?>&<?php print time(); ?>"></script>
 <?php
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
 ?>
@@ -308,7 +323,12 @@ 
         <span class="icon-bar"></span>
       </button>
       <a href="<?php print $globalURL; ?>/search" class="navbar-toggle navbar-toggle-search"><i class="fa fa-search"></i></a>
-      <a class="navbar-brand" href="<?php if ($globalURL == '') print '/'; else print $globalURL; ?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
+      <a class="navbar-brand" href="<?php if ($globalURL == '') {
+	print '/';
+} else {
+	print $globalURL;
+}
+?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
     </div>
     <div class="collapse navbar-collapse">
       <ul class="nav navbar-nav">
@@ -386,7 +406,9 @@ 
   		        $alllang = $Language->getLanguages();
   		        foreach ($alllang as $key => $lang) {
   		            print '<option value="'.$key.'"';
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
+  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) {
+  		            	print ' selected ';
+  		            }
   		            print '>'.$lang[0].'</option>';
   		        }
   		    ?>
@@ -533,4 +555,7 @@ 
 
 ?>
 
-<section class="container main-content <?php if (strtolower($current_page) == 'index') print 'index '; ?>clear">
+<section class="container main-content <?php if (strtolower($current_page) == 'index') {
+	print 'index ';
+}
+?>clear">

Spacing +22 added lines, -22 removed lines

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

Indentation +42 added lines, -42 removed lines

@@ -28,7 +28,7 @@ 
 // When button "Remove all filters" is clicked
 if (isset($_POST['removefilters'])) {
 	$allfilters = array_filter(array_keys($_COOKIE),function($key) {
-	    return strpos($key,'filter_') === 0;
+		return strpos($key,'filter_') === 0;
 	});
 	foreach ($allfilters as $filt) {
 		unset($_COOKIE[$filt]);
@@ -167,16 +167,16 @@ 
 	}
 ?>
 <?php 
-    if (isset($_POST['archive'])) {
+	if (isset($_POST['archive'])) {
 ?>
 <?php 
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 
 <script src="<?php print $globalURL; ?>/js/map.js.php?<?php print time(); ?>&archive&begindate=<?php print strtotime($_POST['start_date']); ?>&enddate=<?php print strtotime($_POST['end_date']); ?>&archivespeed=<?php print $_POST['archivespeed']; ?>"></script>
 <?php    
-	    }
-    } else {
+		}
+	} else {
 ?>
 <?php
 /*	if (isset($globalBeta) && $globalBeta) {
@@ -188,18 +188,18 @@ 
 */
 ?>
 <?php 
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 <script src="<?php print $globalURL; ?>/js/leaflet-playback.js"></script>
 <script src="<?php print $globalURL; ?>/js/map.js.php?<?php print time(); ?>"></script>
 <?php
-	    }
+		}
 ?>
 <?php
 //	}
 ?>
 <?php
-    }
+	}
 }
 ?>
 <?php
@@ -359,23 +359,23 @@ 
             <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li>
             <?php
-        	if ($globalACARS) {
-        	    if (isset($globalDemo) && $globalDemo) {
-    	    ?>
+			if ($globalACARS) {
+				if (isset($globalDemo) && $globalDemo) {
+			?>
             <li><hr /></li>
             <li><i><?php echo _('ACARS data not available publicly'); ?></i></li>
             <li><a href=""><?php echo _('Latest ACARS messages'); ?></a></li>
             <li><a href=""><?php echo _('Archive ACARS messages'); ?></a></li>
             <?php
-        	    } else {
-    	    ?>
+				} else {
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li>
             <?php
-        	    }
-        	}
-    	    ?>
+				}
+			}
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li>
@@ -417,14 +417,14 @@ 
   	    <form>
   		<select class="selectpicker" data-width="120px" onchange="language(this);">
   		    <?php
-  		        $Language = new Language();
-  		        $alllang = $Language->getLanguages();
-  		        foreach ($alllang as $key => $lang) {
-  		            print '<option value="'.$key.'"';
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
-  		            print '>'.$lang[0].'</option>';
-  		        }
-  		    ?>
+  				$Language = new Language();
+  				$alllang = $Language->getLanguages();
+  				foreach ($alllang as $key => $lang) {
+  					print '<option value="'.$key.'"';
+  					if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
+  					print '>'.$lang[0].'</option>';
+  				}
+  			?>
   		</select>
   	    </form>
   	</div>
@@ -455,18 +455,18 @@ 
 ?>
     <div class="top-header clear" role="main">
 <?php
-    if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
+	if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
 ?>
     <div id="archive-map"></div>
 <?php
-    }
+	}
 ?>
     </div>
 <?php
 }
 if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false))
 {
-    ?>
+	?>
     <div class="top-header clear" role="main">
         <div id="map"></div>
 	<link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" />
@@ -477,15 +477,15 @@ 
         var zoom = 13;
 //create the map
 <?php
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
+	if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
 <?php
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
+	} elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
     var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map);
@@ -493,22 +493,22 @@ 
     var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
     var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
 <?php
-    } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
+	} elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    }
+	}
 ?>
   //initialize the layer group for the aircrft markers
   var layer_data = L.layerGroup();
 
   //a few title layers
 <?php
-    if ($globalMapProvider == 'Mapbox') {
+	if ($globalMapProvider == 'Mapbox') {
 ?>
   L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
     maxZoom: 18,
@@ -519,7 +519,7 @@ 
     token : '<?php print $globalMapboxToken; ?>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'OpenStreetMap') {
+	} elseif ($globalMapProvider == 'OpenStreetMap') {
 ?>
   L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -527,7 +527,7 @@ 
       '<a href="http://www.openstreetmap.org/copyright">Open Database Licence</a>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'MapQuest-OSM') {
+	} elseif ($globalMapProvider == 'MapQuest-OSM') {
 ?>
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -536,7 +536,7 @@ 
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'MapQuest-Aerial') {
+	} elseif ($globalMapProvider == 'MapQuest-Aerial') {
 ?>
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -545,27 +545,27 @@ 
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>, Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency"'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'Google-Roadmap') {
+	} elseif ($globalMapProvider == 'Google-Roadmap') {
 ?>
     var googleLayer = new L.Google('ROADMAP');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Satellite') {
+	} elseif ($globalMapProvider == 'Google-Satellite') {
 ?>
     var googleLayer = new L.Google('SATELLITE');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Hybrid') {
+	} elseif ($globalMapProvider == 'Google-Hybrid') {
 ?>
     var googleLayer = new L.Google('HYBRID');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Terrain') {
+	} elseif ($globalMapProvider == 'Google-Terrain') {
 ?>
     var googleLayer = new L.Google('Terrain');
     map.addLayer(googleLayer);
 <?php
-    }
+	}
 ?>
         </script>
     </div>

live-sat-czml.php

Spacing +20 added lines, -20 removed lines

@@ -20,17 +20,17 @@ 
 
 $spotter_array = array();
 if (isset($_COOKIE['sattypes']) && $_COOKIE['sattypes'] != '') {
-	$sattypes = explode(',',$_COOKIE['sattypes']);
+	$sattypes = explode(',', $_COOKIE['sattypes']);
 	foreach ($sattypes as $sattype) {
-		$spotter_array = array_merge($Satellite->position_all_type($sattype,$timeb-$globalLiveInterval,$timeb),$spotter_array);
+		$spotter_array = array_merge($Satellite->position_all_type($sattype, $timeb - $globalLiveInterval, $timeb), $spotter_array);
 	}
 }
 if (isset($_COOKIE['displayiss']) && $_COOKIE['displayiss']) {
-	$spotter_array = array_merge($Satellite->position('ISS (ZARYA)',time()-$globalLiveInterval,time()),$spotter_array);
-	$spotter_array = array_merge($Satellite->position('TIANGONG 1',time()-$globalLiveInterval,time()),$spotter_array);
-	$spotter_array = array_merge($Satellite->position('TIANGONG-2',time()-$globalLiveInterval,time()),$spotter_array);
+	$spotter_array = array_merge($Satellite->position('ISS (ZARYA)', time() - $globalLiveInterval, time()), $spotter_array);
+	$spotter_array = array_merge($Satellite->position('TIANGONG 1', time() - $globalLiveInterval, time()), $spotter_array);
+	$spotter_array = array_merge($Satellite->position('TIANGONG-2', time() - $globalLiveInterval, time()), $spotter_array);
 }
-$spotter_array = array_unique($spotter_array,SORT_REGULAR);
+$spotter_array = array_unique($spotter_array, SORT_REGULAR);
 /*
 $modelsdb = array();
 if (file_exists('models/space/space_modelsdb')) {
@@ -54,14 +54,14 @@ 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "LOOP_STOP","step": "SYSTEM_CLOCK_MULTIPLIER"}';
 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
-$output .= ',"clock": {"currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
+$output .= ',"clock": {"currentTime" : "'.date("c", time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
 //$output .= ',"clock": {"currentTime" : "%minitime%","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"step": "SYSTEM_CLOCK_MULTIPLIER"}';
 $output .= '},';
 if (!empty($spotter_array) && is_array($spotter_array))
 {
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		$j++;
 		date_default_timezone_set('UTC');
@@ -76,7 +76,7 @@ 
 			$orientation = '';
 			$prev_satname = $spotter_item['name'];
 			$output .= '{';
-			$output .= '"id": "'.trim(str_replace(array('[+]','[-]'),'',$spotter_item['name'])).'",';
+			$output .= '"id": "'.trim(str_replace(array('[+]', '[-]'), '', $spotter_item['name'])).'",';
 			$output .= '"properties": {';
 			// Not yet supported in CZML with Cesium
 			$output .= '},';
@@ -114,23 +114,23 @@ 
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/cubiesat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
 				} elseif ($spotter_item['name'] == 'TERRA') {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/terra.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'O3B') !== false) {
+				} elseif (strpos($spotter_item['name'], 'O3B') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/o3b.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'GLOBALSTAR') !== false) {
+				} elseif (strpos($spotter_item['name'], 'GLOBALSTAR') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/globalstar.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'GPS') !== false) {
+				} elseif (strpos($spotter_item['name'], 'GPS') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/gps.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'GENESIS') !== false) {
+				} elseif (strpos($spotter_item['name'], 'GENESIS') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/genesis.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'OSCAR 7') !== false) {
+				} elseif (strpos($spotter_item['name'], 'OSCAR 7') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/oscar7.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'FLOCK') !== false) {
+				} elseif (strpos($spotter_item['name'], 'FLOCK') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/cubesat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'PLEIADES') !== false) {
+				} elseif (strpos($spotter_item['name'], 'PLEIADES') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/pleiades.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'DUCHIFAT') !== false) {
+				} elseif (strpos($spotter_item['name'], 'DUCHIFAT') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/duchifat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'FORMOSAT-2') !== false) {
+				} elseif (strpos($spotter_item['name'], 'FORMOSAT-2') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/formosat2.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
 				} elseif ($spotter_item['type'] == 'iridium') {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/iridium.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
@@ -151,14 +151,14 @@ 
 	//		$output .= '"interpolationDegree" : 5,';
 	//		$output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", ';
 			$output .= '"cartographicDegrees": [';
-			$output .= '"'.date("c",$spotter_item['timestamp']).'", ';
+			$output .= '"'.date("c", $spotter_item['timestamp']).'", ';
 			$output .= $spotter_item['longitude'].', ';
 			$output .= $spotter_item['latitude'].', ';
 			$output .= $spotter_item['altitude']*1000;
 			$orientation = '"orientation" : { ';
 			$orientation .= '"unitQuaternion": [';
 		} else {
-			$output .= ',"'.date("c",$spotter_item['timestamp']).'", ';
+			$output .= ',"'.date("c", $spotter_item['timestamp']).'", ';
 			$output .= $spotter_item['longitude'].', ';
 			$output .= $spotter_item['latitude'].', ';
 			$output .= $spotter_item['altitude']*1000;

require/class.Stats.php

Doc Comments +32 added lines

@@ -13,6 +13,10 @@ 
 		$this->db = $Connection->db();
         }
               
+	/**
+	 * @param string $type
+	 * @param string $stats_date
+	 */
 	public function addLastStatsUpdate($type,$stats_date) {
                 $query = "DELETE FROM config WHERE name = :type;
             		INSERT INTO config (name,value) VALUES (:type,:stats_date);";
@@ -578,6 +582,11 @@ 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
         }
+
+	/**
+	 * @param string $type
+	 * @param string $year
+	 */
 	public function getSumStats($type,$year,$stats_airline = '') {
     		global $globalArchiveMonths, $globalDBdriver;
     		if ($globalDBdriver == 'mysql') {
@@ -677,6 +686,10 @@ 
                 return $all[0]['total'];
         }
 
+	/**
+	 * @param string $type
+	 * @param string $stats_date
+	 */
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -708,6 +721,10 @@ 
                         return "error : ".$e->getMessage();
                 }
         }
+
+	/**
+	 * @param string $date
+	 */
 	public function getStatsSource($date,$stats_type = '') {
 		if ($stats_type == '') {
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name";
@@ -726,6 +743,9 @@ 
                 return $all;
         }
 
+	/**
+	 * @param string $stats_type
+	 */
 	public function addStatSource($data,$source_name,$stats_type,$date) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -741,6 +761,10 @@ 
                         return "error : ".$e->getMessage();
                 }
         }
+
+	/**
+	 * @param string $type
+	 */
 	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '') {
                 $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline) VALUES (:type,:flight_date,:cnt,:stats_airline)";
                 $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline);
@@ -927,6 +951,10 @@ 
                         return "error : ".$e->getMessage();
                 }
         }
+
+	/**
+	 * @param string $type
+	 */
 	public function deleteStatFlight($type) {
                 $query = "DELETE FROM stats_flight WHERE stats_type = :type";
                 $query_values = array(':type' => $type);
@@ -937,6 +965,10 @@ 
                         return "error : ".$e->getMessage();
                 }
         }
+
+	/**
+	 * @param string $type
+	 */
 	public function deleteStatAirport($type) {
                 $query = "DELETE FROM stats_airport WHERE stats_type = :type";
                 $query_values = array(':type' => $type);

Braces +386 added lines, -134 removed lines

@@ -12,7 +12,9 @@ 
 	
 	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();
         }
@@ -59,7 +61,9 @@ 
                 }
         }
 	public function getAllAirlineNames($filter_name = '') {
-		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);
@@ -71,7 +75,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);
@@ -83,7 +89,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);
@@ -95,7 +103,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);
@@ -110,9 +120,14 @@ 
 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
-		else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
+		} else {
+			$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -132,9 +147,14 @@ 
 	}
 	public function countAllAirlineCountries($limit = true,$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country 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 FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country 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 FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
@@ -154,9 +174,14 @@ 
 	}
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		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 ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		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));
@@ -177,9 +202,14 @@ 
 
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country 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 FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country 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 FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -199,9 +229,14 @@ 
 	}
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country 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 FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country 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 FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -222,9 +257,14 @@ 
 
 	public function countAllAirlines($limit = true,$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		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 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 ORDER BY airline_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		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 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 ORDER BY airline_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
@@ -245,9 +285,14 @@ 
 	}
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		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 ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		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));
@@ -267,9 +312,14 @@ 
 	}
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		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 ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		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));
@@ -289,10 +339,15 @@ 
 	}
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '') {
 		$Connection = new Connection();
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($Connection->tableExists('countries')) {
-			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));
@@ -313,9 +368,14 @@ 
 	}
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		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 ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		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));
@@ -335,9 +395,14 @@ 
 	}
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		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 ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		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));
@@ -357,9 +422,14 @@ 
 	}
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		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 FROM stats_airport WHERE 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 FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		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 FROM stats_airport WHERE 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 FROM stats_airport WHERE 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));
@@ -385,7 +455,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) {
@@ -397,9 +469,14 @@ 
 	}
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		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 FROM stats_airport WHERE 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 FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		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 FROM stats_airport WHERE 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 FROM stats_airport WHERE 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));
@@ -425,7 +502,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) {
@@ -438,13 +517,21 @@ 
 	}
 	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 ($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);
                  try {
@@ -468,7 +555,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;
+		}
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
                  try {
@@ -490,7 +579,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 ($globalDBdriver == 'mysql') {
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		} else {
@@ -516,7 +607,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;
+		}
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
                  try {
@@ -538,7 +631,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 {
@@ -560,7 +655,9 @@ 
 	}
 	public function countAllMonths($stats_airline = '',$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 = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
                  try {
                         $sth = $this->db->prepare($query);
@@ -581,7 +678,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);
@@ -602,9 +701,14 @@ 
 	}
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
-		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 ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+		} 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 ($orderby == 'hour') {
 			/*
 			if ($globalDBdriver == 'mysql') {
@@ -613,7 +717,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(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
@@ -634,7 +740,9 @@ 
 	
 	public function countOverallFlights($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$all = $this->getSumStats('flights_bymonth',date('Y'),$stats_airline,$filter_name);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
@@ -648,7 +756,9 @@ 
 	}
 	public function countOverallMilitaryFlights($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$all = $this->getSumStats('military_flights_bymonth',date('Y'),'',$filter_name);
 		if (empty($all)) {
 		        $filters = array();
@@ -662,7 +772,9 @@ 
 	}
 	public function countOverallArrival($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$all = $this->getSumStats('realarrivals_bymonth',date('Y'),$stats_airline,$filter_name);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
@@ -676,7 +788,9 @@ 
 	}
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$all = $this->getSumStats('aircrafts_bymonth',date('Y'),$stats_airline,$filter_name);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
@@ -690,7 +804,9 @@ 
 	}
 	public function countOverallAirlines($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
                  try {
                         $sth = $this->db->prepare($query);
@@ -713,7 +829,9 @@ 
 	}
 	public function countOverallOwners($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		/*
 		$query = "SELECT COUNT(*) AS nb_owner FROM stats_owner";
                  try {
@@ -738,7 +856,9 @@ 
 	}
 	public function countOverallPilots($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$all = $this->getSumStats('pilots_bymonth',date('Y'),$stats_airline,$filter_name);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
@@ -752,7 +872,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;
+		}
 		$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
 		$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
@@ -765,7 +887,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 {
@@ -778,7 +902,9 @@ 
                 return $all;
         }
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
     		global $globalArchiveMonths, $globalDBdriver;
     		if ($globalDBdriver == 'mysql') {
 	                $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -797,7 +923,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 ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		} else {
@@ -815,7 +943,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 ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
                 } else {
@@ -832,7 +962,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 {
@@ -849,7 +981,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 {
@@ -866,7 +1000,9 @@ 
         }
 	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 {
@@ -884,7 +1020,9 @@ 
 
 	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 {
@@ -900,7 +1038,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 {
@@ -1383,47 +1523,69 @@ 
 			$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
 		} else {
 		*/
-			if ($globalDebug) echo 'Update stats !'."\n";
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
+			if ($globalDebug) {
+				echo 'Update stats !'."\n";
+			}
+			if ($globalDebug) {
+				echo 'Count all aircraft types...'."\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';
+			}
 			$Spotter = new Spotter($this->db);
 			$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']);
 			}
-			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']);
 			}
-			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']);
 			}
-			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']);
 			}
-			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']);
 			}
-			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) {
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source']);
 			}
 			
-			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) {
@@ -1434,7 +1596,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) {
@@ -1444,11 +1608,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']);
 			}
-			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'];
@@ -1458,7 +1628,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) {
@@ -1469,7 +1641,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']);
 			}
 			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);
 				foreach ($alldata as $number) {
@@ -1481,46 +1655,66 @@ 
 			// 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";
+			}
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllMonths();
 			$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();
 			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();
 			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();
 			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();
 			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();
 			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();
 			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();
@@ -1640,37 +1834,53 @@ 
 
 			// Count by airlines
 			echo '--- Stats by airlines ---'."\n";
-			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']);
 			}
-			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']);
 			}
-			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']);
 			}
-			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']);
 			}
-			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']);
 			}
-			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'];
@@ -1691,11 +1901,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']);
 			}
-			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'];
@@ -1716,35 +1932,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'],$number['airline_icao']);
 			}
-			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();
 			$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();
 			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();
 			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();
 			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();
 			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) {
@@ -1767,7 +1997,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) {
@@ -1791,13 +2023,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();
 			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());
 			$values = array();
@@ -1810,14 +2048,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');
 			foreach ($alldata as $number) {
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
 			}
 			
 
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
+				$globalStatsFilters = array();
+			}
 			foreach ($globalStatsFilters as $name => $filter) {
 				//$filter_name = $filter['name'];
 				$filter_name = $name;
@@ -1825,10 +2067,14 @@ 
 				$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
 				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';
+				}
 
 				// 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);
 				$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
 				foreach ($alldata as $number) {
@@ -1866,7 +2112,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) {
@@ -1887,7 +2135,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) {
@@ -1901,7 +2151,9 @@ 
 				$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);
 				}
 				$alldata = $Spotter->countAllMonthsOwners($filter);

Indentation +851 added lines, -851 removed lines

@@ -15,33 +15,33 @@ 
 		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-        }
+		}
               
 	public function addLastStatsUpdate($type,$stats_date) {
-                $query = "DELETE FROM config WHERE name = :type;
+				$query = "DELETE FROM config WHERE name = :type;
             		INSERT INTO config (name,value) VALUES (:type,:stats_date);";
-                $query_values = array('type' => $type,':stats_date' => $stats_date);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array('type' => $type,':stats_date' => $stats_date);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
 	public function getLastStatsUpdate($type = 'last_update_stats') {
-                $query = "SELECT value FROM config WHERE name = :type";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':type' => $type));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
-        public function deleteStats($filter_name = '') {
-        	/*
+				$query = "SELECT value FROM config WHERE name = :type";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':type' => $type));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
+		public function deleteStats($filter_name = '') {
+			/*
         	$query = "DELETE FROM config WHERE name = 'last_update_stats'";
                  try {
                         $sth = $this->db->prepare($query);
@@ -50,80 +50,80 @@ 
                         return "error : ".$e->getMessage();
                 }
                 */
-        	$query = "DELETE FROM stats WHERE filter_name = :filter_name;DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_airport WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_flight WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
-        public function deleteOldStats($filter_name = '') {
+			$query = "DELETE FROM stats WHERE filter_name = :filter_name;DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_airport WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_flight WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
+		public function deleteOldStats($filter_name = '') {
         	
-        	$query = "DELETE FROM config WHERE name = 'last_update_stats'";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+			$query = "DELETE FROM config WHERE name = 'last_update_stats'";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
                 
-        	$query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+			$query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function getAllAirlineNames($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);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				$query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
-                $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
-                $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				$query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
-                $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				$query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 
 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '') {
@@ -131,66 +131,66 @@ 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            	    $filters = array('airlines' => array($stats_airline));
-            	    if ($filter_name != '') {
-            		    $filters = array_merge($filters,$globalStatsFilters[$filter_name]);
-            	    }
-            	    $Spotter = new Spotter($this->db);
-            	    $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$filters = array('airlines' => array($stats_airline));
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+					}
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
+				}
+				return $all;
 	}
 	public function countAllAirlineCountries($limit = true,$filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country 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 FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$Spotter = new Spotter($this->db);
-            		$filters = array();
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
-			}
-            		$all = $Spotter->countAllAirlineCountries($limit,$filters);
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$filters = array();
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+			}
+					$all = $Spotter->countAllAirlineCountries($limit,$filters);
+				}
+				return $all;
 	}
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		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));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$filters = array('airlines' => array($stats_airline));
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$filters = array('airlines' => array($stats_airline));
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
+					$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllAircraftManufacturers($filters);
-                }
-                return $all;
+				}
+				return $all;
 	}
 
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '') {
@@ -198,44 +198,44 @@ 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country 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 FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllArrivalCountries($limit,$filters);
-                }
-                return $all;
+				}
+				return $all;
 	}
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country 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 FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllDepartureCountries($filters);
-                }
-                return $all;
+				}
+				return $all;
 	}
 
 	public function countAllAirlines($limit = true,$filter_name = '') {
@@ -243,45 +243,45 @@ 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		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 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 ORDER BY airline_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-	                $Spotter = new Spotter($this->db);
-            		$filters = array();
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$filters = array();
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
 
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
-                }
-                return $all;
+					$all = $Spotter->countAllAirlines($limit,0,'',$filters);
+				}
+				return $all;
 	}
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		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));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-	                $Spotter = new Spotter($this->db);
-    		        $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
-                }
-                return $all;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
+				}
+				return $all;
 	}
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
@@ -318,7 +318,7 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                /*
+				/*
                 if (empty($all)) {
 	                $Spotter = new Spotter($this->db);
     		        $all = $Spotter->countAllFlightOverCountries($limit);
@@ -334,84 +334,84 @@ 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		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));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllPilots($limit,0,'',$filters);
-                }
-                return $all;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllPilots($limit,0,'',$filters);
+				}
+				return $all;
 	}
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		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));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllOwners($limit,0,'',$filters);
-                }
-                return $all;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllOwners($limit,0,'',$filters);
+				}
+				return $all;
 	}
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		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 FROM stats_airport WHERE 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 FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
-			}
-            		$Spotter = new Spotter($this->db);
-            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
-        		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
-        		$all = array();
-        		foreach ($pall as $value) {
-        			$icao = $value['airport_departure_icao'];
-        			$all[$icao] = $value;
-        		}
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+			}
+					$Spotter = new Spotter($this->db);
+					$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
+				$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
+				$all = array();
+				foreach ($pall as $value) {
+					$icao = $value['airport_departure_icao'];
+					$all[$icao] = $value;
+				}
         		
-        		foreach ($dall as $value) {
-        			$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;
-        		}
-        		$count = array();
-        		foreach ($all as $key => $row) {
-        			$count[$key] = $row['airport_departure_icao_count'];
-        		}
-        		array_multisort($count,SORT_DESC,$all);
-                }
-                return $all;
+				foreach ($dall as $value) {
+					$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;
+				}
+				$count = array();
+				foreach ($all as $key => $row) {
+					$count[$key] = $row['airport_departure_icao_count'];
+				}
+				array_multisort($count,SORT_DESC,$all);
+				}
+				return $all;
 	}
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
@@ -433,26 +433,26 @@ 
 			$Spotter = new Spotter($this->db);
 			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
 			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
-        		$all = array();
-        		foreach ($pall as $value) {
-        			$icao = $value['airport_arrival_icao'];
-        			$all[$icao] = $value;
-        		}
+				$all = array();
+				foreach ($pall as $value) {
+					$icao = $value['airport_arrival_icao'];
+					$all[$icao] = $value;
+				}
         		
-        		foreach ($dall as $value) {
-        			$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;
-        		}
-        		$count = array();
-        		foreach ($all as $key => $row) {
-        			$count[$key] = $row['airport_arrival_icao_count'];
-        		}
-        		array_multisort($count,SORT_DESC,$all);
-                }
+				foreach ($dall as $value) {
+					$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;
+				}
+				$count = array();
+				foreach ($all as $key => $row) {
+					$count[$key] = $row['airport_arrival_icao_count'];
+				}
+				array_multisort($count,SORT_DESC,$all);
+				}
  
-                return $all;
+				return $all;
 	}
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
@@ -465,23 +465,23 @@ 
 			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);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_data);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_data);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllMonthsLastYear($filters);
-                }
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllMonthsLastYear($filters);
+				}
                 
-                return $all;
+				return $all;
 	}
 	
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
@@ -489,22 +489,22 @@ 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_data);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_data);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllDatesLastMonth($filters);
-                }
-                return $all;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllDatesLastMonth($filters);
+				}
+				return $all;
 	}
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
@@ -515,108 +515,108 @@ 
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		}
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_data);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_data);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllDatesLast7Days($filters);
-                }
-                return $all;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllDatesLast7Days($filters);
+				}
+				return $all;
 	}
 	public function countAllDates($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_data);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_data);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllDates($filters);
-                }
-                return $all;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllDates($filters);
+				}
+				return $all;
 	}
 	public function countAllDatesByAirlines($filter_name = '') {
 		global $globalStatsFilters;
 		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 {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_data);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$filters = array();
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
-			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllDatesByAirlines($filters);
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_data);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$filters = array();
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+			}
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllDatesByAirlines($filters);
+				}
+				return $all;
 	}
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
 		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 = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+			$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllMonths($filters);
-                }
-                return $all;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllMonths($filters);
+				}
+				return $all;
 	}
 	public function countAllMilitaryMonths($filter_name = '') {
 		global $globalStatsFilters;
 		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);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$filters = array();
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
-			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllMilitaryMonths($filters);
-                }
-                return $all;
+			$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);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$filters = array();
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+			}
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllMilitaryMonths($filters);
+				}
+				return $all;
 	}
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
@@ -632,22 +632,22 @@ 
 			$query .= " ORDER BY CAST(flight_date AS integer) ASC";
 		}
 		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllHours($orderby,$filters);
-                }
-                return $all;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllHours($orderby,$filters);
+				}
+				return $all;
 	}
 	
 	public function countOverallFlights($stats_airline = '', $filter_name = '') {
@@ -669,9 +669,9 @@ 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$all = $this->getSumStats('military_flights_bymonth',date('Y'),'',$filter_name);
 		if (empty($all)) {
-		        $filters = array();
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array();
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countOverallMilitaryFlights($filters);
@@ -710,19 +710,19 @@ 
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $result = $sth->fetchAll(PDO::FETCH_ASSOC);
-                $all = $result[0]['nb_airline'];
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
+				$all = $result[0]['nb_airline'];
 		//$all = $this->getSumStats('airlines_bymonth',date('Y'));
 		if (empty($all)) {
-            		$filters = array();
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+					$filters = array();
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countOverallAirlines($filters);
@@ -773,166 +773,166 @@ 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
 		$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
 	}
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
-                $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
-                $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				$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 {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
-    		global $globalArchiveMonths, $globalDBdriver;
-    		if ($globalDBdriver == 'mysql') {
-	                $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
-	        } else {
-            		$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
-                }
-                $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+			global $globalArchiveMonths, $globalDBdriver;
+			if ($globalDBdriver == 'mysql') {
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			} else {
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
+				}
+				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
-    		global $globalArchiveMonths, $globalDBdriver;
+			global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-    		if ($globalDBdriver == 'mysql') {
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		} else {
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
-                }
-                $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+				}
+				$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
-    		global $globalArchiveMonths, $globalDBdriver;
+			global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-    		if ($globalDBdriver == 'mysql') {
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
-                } else {
+				} else {
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
-                }
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+				}
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 	public function getStatsAirlineTotal($filter_name = '') {
-    		global $globalArchiveMonths, $globalDBdriver;
+			global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-    		if ($globalDBdriver == 'mysql') {
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
-                } else {
+				} else {
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
-                }
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+				}
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 	public function getStatsOwnerTotal($filter_name = '') {
-    		global $globalArchiveMonths, $globalDBdriver;
+			global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-    		if ($globalDBdriver == 'mysql') {
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
 		} else {
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
-                }
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+				}
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 	public function getStatsPilotTotal($filter_name = '') {
-    		global $globalArchiveMonths, $globalDBdriver;
+			global $globalArchiveMonths, $globalDBdriver;
 		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 {
-            		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
-            	}
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+			if ($globalDBdriver == 'mysql') {
+					$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
+				} else {
+					$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
+				}
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver;
 		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 {
+				} else {
 			$query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver;
 		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 {
-            		//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
+					//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
-                }
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				}
+				$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function getStatsSource($date,$stats_type = '') {
 		if ($stats_type == '') {
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name";
@@ -941,15 +941,15 @@ 
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date AND stats_type = :stats_type ORDER BY source_name";
 			$query_values = array(':date' => $date,':stats_type' => $stats_type);
 		}
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 
 	public function addStatSource($data,$source_name,$stats_type,$date) {
 		global $globalDBdriver;
@@ -957,25 +957,25 @@ 
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
 		} else {
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; 
-                }
-                $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				}
+				$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
-                $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
-                $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
+				$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -983,14 +983,14 @@ 
 		} else {
 			$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -998,14 +998,14 @@ 
 		} else {
 			$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatCountry($iso2,$iso3,$name,$cnt,$filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1013,14 +1013,14 @@ 
 		} else {
 			$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1028,14 +1028,14 @@ 
 		} else {
 			$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1043,14 +1043,14 @@ 
 		} else {
 			$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1058,14 +1058,14 @@ 
 		} else {
 			$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1073,14 +1073,14 @@ 
 		} else {
 			$query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; 
 		}
-                $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1088,14 +1088,14 @@ 
 		} else {
 			$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1103,14 +1103,14 @@ 
 		} else {
 			$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1118,14 +1118,14 @@ 
 		} else {
 			$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1133,52 +1133,52 @@ 
 		} else {
 			$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
 	public function deleteStat($id) {
-                $query = "DELETE FROM stats WHERE stats_id = :id";
-                $query_values = array(':id' => $id);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query = "DELETE FROM stats WHERE stats_id = :id";
+				$query_values = array(':id' => $id);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function deleteStatFlight($type) {
-                $query = "DELETE FROM stats_flight WHERE stats_type = :type";
-                $query_values = array(':type' => $type);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query = "DELETE FROM stats_flight WHERE stats_type = :type";
+				$query_values = array(':type' => $type);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function deleteStatAirport($type) {
-                $query = "DELETE FROM stats_airport WHERE stats_type = :type";
-                $query_values = array(':type' => $type);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query = "DELETE FROM stats_airport WHERE stats_type = :type";
+				$query_values = array(':type' => $type);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
         
-        public function addOldStats() {
-    		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats;
-    		$Common = new Common();
-    		$Connection = new Connection();
-    		date_default_timezone_set('UTC');
-    		$last_update = $this->getLastStatsUpdate('last_update_stats');
+		public function addOldStats() {
+			global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats;
+			$Common = new Common();
+			$Connection = new Connection();
+			date_default_timezone_set('UTC');
+			$last_update = $this->getLastStatsUpdate('last_update_stats');
 		//print_r($last_update);
 		/*
 		$flightsbymonth = $this->getStats('flights_by_month');
@@ -1440,24 +1440,24 @@ 
 			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";
-        		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
+				$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
 			if ($globalDebug) echo 'Order departure airports...'."\n";
-	        	$alldata = array();
+				$alldata = array();
 	        	
-    			foreach ($pall as $value) {
-	        		$icao = $value['airport_departure_icao'];
-    				$alldata[$icao] = $value;
-	        	}
-	        	foreach ($dall as $value) {
-    				$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;
-			}
-    			$count = array();
-    			foreach ($alldata as $key => $row) {
-    				$count[$key] = $row['airport_departure_icao_count'];
-        		}
+				foreach ($pall as $value) {
+					$icao = $value['airport_departure_icao'];
+					$alldata[$icao] = $value;
+				}
+				foreach ($dall as $value) {
+					$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;
+			}
+				$count = array();
+				foreach ($alldata as $key => $row) {
+					$count[$key] = $row['airport_departure_icao_count'];
+				}
 			array_multisort($count,SORT_DESC,$alldata);
 			foreach ($alldata as $number) {
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count']);
@@ -1465,25 +1465,25 @@ 
 			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";
-        		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
+				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
-	        	$alldata = array();
-    			foreach ($pall as $value) {
-	        		$icao = $value['airport_arrival_icao'];
-    				$alldata[$icao] = $value;
-	        	}
-	        	foreach ($dall as $value) {
-    				$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;
-    			}
-        		$count = array();
-        		foreach ($alldata as $key => $row) {
-        			$count[$key] = $row['airport_arrival_icao_count'];
-	        	}
-    			array_multisort($count,SORT_DESC,$alldata);
-                        foreach ($alldata as $number) {
+				$alldata = array();
+				foreach ($pall as $value) {
+					$icao = $value['airport_arrival_icao'];
+					$alldata[$icao] = $value;
+				}
+				foreach ($dall as $value) {
+					$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;
+				}
+				$count = array();
+				foreach ($alldata as $key => $row) {
+					$count[$key] = $row['airport_arrival_icao_count'];
+				}
+				array_multisort($count,SORT_DESC,$alldata);
+						foreach ($alldata as $number) {
 				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count']);
 			}
 			if ($Connection->tableExists('countries')) {
@@ -1543,8 +1543,8 @@ 
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
 			$pall = $Spotter->getLast7DaysAirportsDeparture();
-        		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
-        		/*
+				$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
+				/*
 	        	$alldata = array();
     			foreach ($pall as $value) {
 	        		$icao = $value['departure_airport_icao'];
@@ -1563,29 +1563,29 @@ 
 	        	}
     			array_multisort($count,SORT_DESC,$alldata);
     			*/
-    			foreach ($dall as $value) {
-    				$icao = $value['departure_airport_icao'];
-    				$ddate = $value['date'];
-    				$find = false;
-    				foreach ($pall as $pvalue) {
-    					if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
-    						$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
-    						$find = true;
-    						break;
-    					}
-    				}
-    				if ($find === false) {
-    					$pall[] = $value;
-    				}
-    			}
-    			$alldata = $pall;
+				foreach ($dall as $value) {
+					$icao = $value['departure_airport_icao'];
+					$ddate = $value['date'];
+					$find = false;
+					foreach ($pall as $pvalue) {
+						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
+							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
+							$find = true;
+							break;
+						}
+					}
+					if ($find === false) {
+						$pall[] = $value;
+					}
+				}
+				$alldata = $pall;
 			foreach ($alldata as $number) {
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
 			}
 			echo '...Arrival'."\n";
 			$pall = $Spotter->getLast7DaysAirportsArrival();
-        		$dall = $Spotter->getLast7DaysDetectedAirportsArrival();
-        		/*
+				$dall = $Spotter->getLast7DaysDetectedAirportsArrival();
+				/*
 	        	$alldata = array();
     			foreach ($pall as $value) {
 	        		$icao = $value['arrival_airport_icao'];
@@ -1605,22 +1605,22 @@ 
     			*/
 
 
-    			foreach ($dall as $value) {
-    				$icao = $value['arrival_airport_icao'];
-    				$ddate = $value['date'];
-    				$find = false;
-    				foreach ($pall as $pvalue) {
-    					if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
-    						$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
-    						$find = true;
-    						break;
-    					}
-    				}
-    				if ($find === false) {
-    					$pall[] = $value;
-    				}
-    			}
-    			$alldata = $pall;
+				foreach ($dall as $value) {
+					$icao = $value['arrival_airport_icao'];
+					$ddate = $value['date'];
+					$find = false;
+					foreach ($pall as $pvalue) {
+						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
+							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
+							$find = true;
+							break;
+						}
+					}
+					if ($find === false) {
+						$pall[] = $value;
+					}
+				}
+				$alldata = $pall;
 			foreach ($alldata as $number) {
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
 			}
@@ -1687,51 +1687,51 @@ 
 			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";
-       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
+	   			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
-	        	//$alldata = array();
-    			foreach ($dall as $value) {
-    				$icao = $value['airport_departure_icao'];
-    				$dicao = $value['airline_icao'];
-    				$find = false;
-    				foreach ($pall as $pvalue) {
-    					if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
-    						$pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-    						$find = true;
-    						break;
-    					}
-    				}
-    				if ($find === false) {
-    					$pall[] = $value;
-    				}
-    			}
-    			$alldata = $pall;
+				//$alldata = array();
+				foreach ($dall as $value) {
+					$icao = $value['airport_departure_icao'];
+					$dicao = $value['airline_icao'];
+					$find = false;
+					foreach ($pall as $pvalue) {
+						if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
+							$pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
+							$find = true;
+							break;
+						}
+					}
+					if ($find === false) {
+						$pall[] = $value;
+					}
+				}
+				$alldata = $pall;
 			foreach ($alldata as $number) {
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao']);
 			}
 			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";
-        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
+				$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
-	        	//$alldata = array();
-    			foreach ($dall as $value) {
-    				$icao = $value['airport_arrival_icao'];
-    				$dicao = $value['airline_icao'];
-    				$find = false;
-    				foreach ($pall as $pvalue) {
-    					if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
-    						$pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-    						$find = true;
-    						break;
-    					}
-    				}
-    				if ($find === false) {
-    					$pall[] = $value;
-    				}
-    			}
-    			$alldata = $pall;
-                        foreach ($alldata as $number) {
+				//$alldata = array();
+				foreach ($dall as $value) {
+					$icao = $value['airport_arrival_icao'];
+					$dicao = $value['airline_icao'];
+					$find = false;
+					foreach ($pall as $pvalue) {
+						if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
+							$pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
+							$find = true;
+							break;
+						}
+					}
+					if ($find === false) {
+						$pall[] = $value;
+					}
+				}
+				$alldata = $pall;
+						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'],$number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
@@ -1764,47 +1764,47 @@ 
 			}
 			if ($globalDebug) echo '...Departure'."\n";
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
-        		$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
-    			foreach ($dall as $value) {
-    				$icao = $value['departure_airport_icao'];
-    				$airline = $value['airline_icao'];
-    				$ddate = $value['date'];
-    				$find = false;
-    				foreach ($pall as $pvalue) {
-    					if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) {
-    						$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
-    						$find = true;
-    						break;
-    					}
-    				}
-    				if ($find === false) {
-    					$pall[] = $value;
-    				}
-    			}
-    			$alldata = $pall;
+				$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
+				foreach ($dall as $value) {
+					$icao = $value['departure_airport_icao'];
+					$airline = $value['airline_icao'];
+					$ddate = $value['date'];
+					$find = false;
+					foreach ($pall as $pvalue) {
+						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) {
+							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
+							$find = true;
+							break;
+						}
+					}
+					if ($find === false) {
+						$pall[] = $value;
+					}
+				}
+				$alldata = $pall;
 			foreach ($alldata as $number) {
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
 			}
 			if ($globalDebug) echo '...Arrival'."\n";
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
-        		$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
-    			foreach ($dall as $value) {
-    				$icao = $value['arrival_airport_icao'];
-    				$airline = $value['airline_icao'];
-    				$ddate = $value['date'];
-    				$find = false;
-    				foreach ($pall as $pvalue) {
-    					if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) {
-    						$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
-    						$find = true;
-    						break;
-    					}
-    				}
-    				if ($find === false) {
-    					$pall[] = $value;
-    				}
-    			}
-    			$alldata = $pall;
+				$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
+				foreach ($dall as $value) {
+					$icao = $value['arrival_airport_icao'];
+					$airline = $value['airline_icao'];
+					$ddate = $value['date'];
+					$find = false;
+					foreach ($pall as $pvalue) {
+						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) {
+							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
+							$find = true;
+							break;
+						}
+					}
+					if ($find === false) {
+						$pall[] = $value;
+					}
+				}
+				$alldata = $pall;
 			foreach ($alldata as $number) {
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
 			}
@@ -1873,44 +1873,44 @@ 
 					$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source']);
 				}
 				$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
-	       			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
-		        	$alldata = array();
-	    			foreach ($pall as $value) {
-		        		$icao = $value['airport_departure_icao'];
-    					$alldata[$icao] = $value;
-	    			}
-		        	foreach ($dall as $value) {
-	    				$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;
-				}
-	    			$count = array();
-    				foreach ($alldata as $key => $row) {
-    					$count[$key] = $row['airport_departure_icao_count'];
-    				}
+		   			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
+					$alldata = array();
+					foreach ($pall as $value) {
+						$icao = $value['airport_departure_icao'];
+						$alldata[$icao] = $value;
+					}
+					foreach ($dall as $value) {
+						$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;
+				}
+					$count = array();
+					foreach ($alldata as $key => $row) {
+						$count[$key] = $row['airport_departure_icao_count'];
+					}
 				array_multisort($count,SORT_DESC,$alldata);
 				foreach ($alldata as $number) {
-    					echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name);
+						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);
 				}
 				$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,$filter);
-    				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,$filter);
+					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,$filter);
 				$alldata = array();
-    				foreach ($pall as $value) {
-		        		$icao = $value['airport_arrival_icao'];
-    					$alldata[$icao] = $value;
-	    			}
-		        	foreach ($dall as $value) {
-	    				$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;
-	    			}
-        			$count = array();
-        			foreach ($alldata as $key => $row) {
-    					$count[$key] = $row['airport_arrival_icao_count'];
-		        	}
-        			array_multisort($count,SORT_DESC,$alldata);
+					foreach ($pall as $value) {
+						$icao = $value['airport_arrival_icao'];
+						$alldata[$icao] = $value;
+					}
+					foreach ($dall as $value) {
+						$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;
+					}
+					$count = array();
+					foreach ($alldata as $key => $row) {
+						$count[$key] = $row['airport_arrival_icao_count'];
+					}
+					array_multisort($count,SORT_DESC,$alldata);
 				foreach ($alldata as $number) {
 					echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name);
 				}
@@ -1943,45 +1943,45 @@ 
 				}
 				echo '...Departure'."\n";
 				$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
-        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
 				foreach ($dall as $value) {
-    					$icao = $value['departure_airport_icao'];
-    					$ddate = $value['date'];
-    					$find = false;
-    					foreach ($pall as $pvalue) {
-    						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
-    							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
-	    						$find = true;
-    							break;
-    						}
-    					}
-    					if ($find === false) {
-    						$pall[] = $value;
-	    				}
-    				}
-	    			$alldata = $pall;
+						$icao = $value['departure_airport_icao'];
+						$ddate = $value['date'];
+						$find = false;
+						foreach ($pall as $pvalue) {
+							if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
+								$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
+								$find = true;
+								break;
+							}
+						}
+						if ($find === false) {
+							$pall[] = $value;
+						}
+					}
+					$alldata = $pall;
 				foreach ($alldata as $number) {
 					$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],'',$filter_name);
 				}
 				echo '...Arrival'."\n";
 				$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
-    				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
 				foreach ($dall as $value) {
 					$icao = $value['arrival_airport_icao'];
 					$ddate = $value['date'];
-    					$find = false;
+						$find = false;
 					foreach ($pall as $pvalue) {
-    						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
-    							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
-    							$find = true;
-    							break;
-	    					}
-    					}
-    					if ($find === false) {
-    						$pall[] = $value;
-	    				}
-    				}
-    				$alldata = $pall;
+							if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
+								$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
+								$find = true;
+								break;
+							}
+						}
+						if ($find === false) {
+							$pall[] = $value;
+						}
+					}
+					$alldata = $pall;
 				foreach ($alldata as $number) {
 					$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],'',$filter_name);
 				}

Spacing +312 added lines, -312 removed lines

@@ -17,14 +17,14 @@ 
 		$this->db = $Connection->db();
         }
               
-	public function addLastStatsUpdate($type,$stats_date) {
+	public function addLastStatsUpdate($type, $stats_date) {
                 $query = "DELETE FROM config WHERE name = :type;
             		INSERT INTO config (name,value) VALUES (:type,:stats_date);";
-                $query_values = array('type' => $type,':stats_date' => $stats_date);
+                $query_values = array('type' => $type, ':stats_date' => $stats_date);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -34,7 +34,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':type' => $type));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -54,7 +54,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -64,7 +64,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 
@@ -72,7 +72,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -82,43 +82,43 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
         }
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
                 $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
         }
-	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
+	public function getAllManufacturers($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
                 $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
         }
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
                 $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -133,22 +133,22 @@ 
 		else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
             	    $filters = array('airlines' => array($stats_airline));
             	    if ($filter_name != '') {
-            		    $filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            		    $filters = array_merge($filters, $globalStatsFilters[$filter_name]);
             	    }
             	    $Spotter = new Spotter($this->db);
-            	    $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
+            	    $all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
                 }
                 return $all;
 	}
-	public function countAllAirlineCountries($limit = true,$filter_name = '') {
+	public function countAllAirlineCountries($limit = true, $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
@@ -156,7 +156,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -164,28 +164,28 @@ 
             		$Spotter = new Spotter($this->db);
             		$filters = array();
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
-            		$all = $Spotter->countAllAirlineCountries($limit,$filters);
+            		$all = $Spotter->countAllAirlineCountries($limit, $filters);
                 }
                 return $all;
 	}
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '') {
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		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));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
             		$filters = array('airlines' => array($stats_airline));
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllAircraftManufacturers($filters);
@@ -200,18 +200,18 @@ 
 		else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
                 }
                 return $all;
 	}
@@ -222,15 +222,15 @@ 
 		else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllDepartureCountries($filters);
@@ -238,7 +238,7 @@ 
                 return $all;
 	}
 
-	public function countAllAirlines($limit = true,$filter_name = '') {
+	public function countAllAirlines($limit = true, $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		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 ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
@@ -246,7 +246,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -254,58 +254,58 @@ 
 	                $Spotter = new Spotter($this->db);
             		$filters = array();
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
                 }
                 return $all;
 	}
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '') {
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		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));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 	                $Spotter = new Spotter($this->db);
-    		        $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
+    		        $all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
                 }
                 return $all;
 	}
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '') {
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		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));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
 		}
 		return $all;
 	}
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '') {
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '') {
 		$Connection = new Connection();
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($Connection->tableExists('countries')) {
@@ -313,8 +313,8 @@ 
 			else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
 			 try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -329,70 +329,70 @@ 
 			return array();
 		}
 	}
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '') {
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		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));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllPilots($limit,0,'',$filters);
+            		$all = $Spotter->countAllPilots($limit, 0, '', $filters);
                 }
                 return $all;
 	}
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '') {
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		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));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllOwners($limit,0,'',$filters);
+            		$all = $Spotter->countAllOwners($limit, 0, '', $filters);
                 }
                 return $all;
 	}
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '') {
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		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 FROM stats_airport WHERE 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 FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
-            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
-        		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
+            		$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
+        		$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
         		$all = array();
         		foreach ($pall as $value) {
         			$icao = $value['airport_departure_icao'];
@@ -409,30 +409,30 @@ 
         		foreach ($all as $key => $row) {
         			$count[$key] = $row['airport_departure_icao_count'];
         		}
-        		array_multisort($count,SORT_DESC,$all);
+        		array_multisort($count, SORT_DESC, $all);
                 }
                 return $all;
 	}
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '') {
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		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 FROM stats_airport WHERE 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 FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
         		$all = array();
         		foreach ($pall as $value) {
         			$icao = $value['airport_arrival_icao'];
@@ -449,12 +449,12 @@ 
         		foreach ($all as $key => $row) {
         			$count[$key] = $row['airport_arrival_icao_count'];
         		}
-        		array_multisort($count,SORT_DESC,$all);
+        		array_multisort($count, SORT_DESC, $all);
                 }
  
                 return $all;
 	}
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
@@ -464,18 +464,18 @@ 
 			if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 			else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		}
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_data);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
             		$all = $Spotter->countAllMonthsLastYear($filters);
@@ -484,29 +484,29 @@ 
                 return $all;
 	}
 	
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_data);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
             		$all = $Spotter->countAllDatesLastMonth($filters);
                 }
                 return $all;
 	}
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
@@ -514,40 +514,40 @@ 
 		} else {
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		}
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_data);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
             		$all = $Spotter->countAllDatesLast7Days($filters);
                 }
                 return $all;
 	}
-	public function countAllDates($stats_airline = '',$filter_name = '') {
+	public function countAllDates($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name";
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_data);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
             		$all = $Spotter->countAllDates($filters);
@@ -562,35 +562,35 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_data);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
             		$filters = array();
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
             		$all = $Spotter->countAllDatesByAirlines($filters);
                 }
                 return $all;
 	}
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		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 = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
             		$all = $Spotter->countAllMonths($filters);
@@ -604,21 +604,21 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
             		$filters = array();
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
             		$all = $Spotter->countAllMilitaryMonths($filters);
                 }
                 return $all;
 	}
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -635,17 +635,17 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllHours($orderby,$filters);
+            		$all = $Spotter->countAllHours($orderby, $filters);
                 }
                 return $all;
 	}
@@ -653,11 +653,11 @@ 
 	public function countOverallFlights($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		$all = $this->getSumStats('flights_bymonth',date('Y'),$stats_airline,$filter_name);
+		$all = $this->getSumStats('flights_bymonth', date('Y'), $stats_airline, $filter_name);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countOverallFlights($filters);
@@ -667,39 +667,39 @@ 
 	public function countOverallMilitaryFlights($filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		$all = $this->getSumStats('military_flights_bymonth',date('Y'),'',$filter_name);
+		$all = $this->getSumStats('military_flights_bymonth', date('Y'), '', $filter_name);
 		if (empty($all)) {
 		        $filters = array();
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countOverallMilitaryFlights($filters);
 		}
 		return $all;
 	}
-	public function countOverallArrival($stats_airline = '',$filter_name = '') {
+	public function countOverallArrival($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		$all = $this->getSumStats('realarrivals_bymonth',date('Y'),$stats_airline,$filter_name);
+		$all = $this->getSumStats('realarrivals_bymonth', date('Y'), $stats_airline, $filter_name);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countOverallArrival($filters);
 		}
 		return $all;
 	}
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '') {
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		$all = $this->getSumStats('aircrafts_bymonth',date('Y'),$stats_airline,$filter_name);
+		$all = $this->getSumStats('aircrafts_bymonth', date('Y'), $stats_airline, $filter_name);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countOverallAircrafts($filters);
@@ -713,7 +713,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -722,14 +722,14 @@ 
 		if (empty($all)) {
             		$filters = array();
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countOverallAirlines($filters);
 		}
 		return $all;
 	}
-	public function countOverallOwners($stats_airline = '',$filter_name = '') {
+	public function countOverallOwners($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		/*
@@ -743,25 +743,25 @@ 
                 $result = $sth->fetchAll(PDO::FETCH_ASSOC);
                 $all = $result[0]['nb_owner'];
                 */
-		$all = $this->getSumStats('owners_bymonth',date('Y'),$stats_airline,$filter_name);
+		$all = $this->getSumStats('owners_bymonth', date('Y'), $stats_airline, $filter_name);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countOverallOwners($filters);
 		}
 		return $all;
 	}
-	public function countOverallPilots($stats_airline = '',$filter_name = '') {
+	public function countOverallPilots($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		$all = $this->getSumStats('pilots_bymonth',date('Y'),$stats_airline,$filter_name);
+		$all = $this->getSumStats('pilots_bymonth', date('Y'), $stats_airline, $filter_name);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countOverallPilots($filters);
@@ -769,33 +769,33 @@ 
 		return $all;
 	}
 
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
-		$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
+		$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
 	}
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
                 $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
-                $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+                $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
         }
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '') {
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
     		global $globalArchiveMonths, $globalDBdriver;
     		if ($globalDBdriver == 'mysql') {
@@ -803,11 +803,11 @@ 
 	        } else {
             		$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
                 }
-                $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+                $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -825,7 +825,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -842,7 +842,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -859,7 +859,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -876,7 +876,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -893,14 +893,14 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all[0]['total'];
         }
 
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
@@ -908,15 +908,15 @@ 
                 } else {
 			$query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+                $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
@@ -925,219 +925,219 @@ 
             		//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
                 }
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+                $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function getStatsSource($date,$stats_type = '') {
+	public function getStatsSource($date, $stats_type = '') {
 		if ($stats_type == '') {
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name";
 			$query_values = array(':date' => $date);
 		} else {
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date AND stats_type = :stats_type ORDER BY source_name";
-			$query_values = array(':date' => $date,':stats_type' => $stats_type);
+			$query_values = array(':date' => $date, ':stats_type' => $stats_type);
 		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
         }
 
-	public function addStatSource($data,$source_name,$stats_type,$date) {
+	public function addStatSource($data, $source_name, $stats_type, $date) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
 		} else {
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; 
                 }
-                $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
+                $query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
                 $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
-                $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+                $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '') {
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) VALUES (:aircraft_icao,:registration,:cnt,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt";
 		} else {
 			$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
+                $query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '') {
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) VALUES (:callsign_icao,:airline_icao,:cnt,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt";
 		} else {
 			$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
+                $query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$filter_name = '') {
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) VALUES (:iso2,:iso3,:name,:cnt,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt";
 		} else {
 			$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
+                $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '') {
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline, filter_name) VALUES (:aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, stats_airline = :stats_airline";
 		} else {
 			$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
+                $query_values = array(':aircraft_icao' => $aircraft_icao, ':aircraft_name' => $aircraft_name, ':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '') {
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) VALUES (:airline_icao,:airline_name,:cnt,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt,airline_name = :airline_name";
 		} else {
 			$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
+                $query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '') {
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) VALUES (:owner_name,:cnt,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt";
 		} else {
 			$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+                $query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '') {
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) VALUES (:pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, pilot_name = :pilot_name";
 		} else {
 			$query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; 
 		}
-                $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
+                $query_values = array(':pilot_id' => $pilot_id, ':cnt' => $cnt, ':pilot_name' => $pilot_name, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':format_source' => $format_source);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) VALUES (:airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE departure = departure+:departure";
 		} else {
 			$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+                $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) VALUES (:airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE departure = :departure";
 		} else {
 			$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+                $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) VALUES (:airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE arrival = arrival+:arrival";
 		} else {
 			$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+                $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) VALUES (:airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE arrival = :arrival";
 		} else {
 			$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+                $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -1148,7 +1148,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -1158,7 +1158,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -1168,13 +1168,13 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
         
         public function addOldStats() {
-    		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats;
+    		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats;
     		$Common = new Common();
     		$Connection = new Connection();
     		date_default_timezone_set('UTC');
@@ -1407,40 +1407,40 @@ 
 				$last_update_day = $last_update[0]['value'];
 			} else $last_update_day = '2012-12-12 12:12:12';
 			$Spotter = new Spotter($this->db);
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer']);
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer']);
 			}
 			if ($globalDebug) echo 'Count all airlines...'."\n";
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name']);
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name']);
 			}
 			if ($globalDebug) echo 'Count all registrations...'."\n";
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao']);
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao']);
 			}
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao']);
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all owners...'."\n";
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatOwner($number['owner_name'],$number['owner_count']);
+				$this->addStatOwner($number['owner_name'], $number['owner_count']);
 			}
 			if ($globalDebug) echo 'Count all pilots...'."\n";
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source']);
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source']);
 			}
 			
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
-        		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
+        		$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order departure airports...'."\n";
 	        	$alldata = array();
 	        	
@@ -1458,14 +1458,14 @@ 
     			foreach ($alldata as $key => $row) {
     				$count[$key] = $row['airport_departure_icao_count'];
         		}
-			array_multisort($count,SORT_DESC,$alldata);
+			array_multisort($count, SORT_DESC, $alldata);
 			foreach ($alldata as $number) {
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count']);
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count']);
 			}
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
-        		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
+        		$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
 	        	$alldata = array();
     			foreach ($pall as $value) {
@@ -1482,16 +1482,16 @@ 
         		foreach ($alldata as $key => $row) {
         			$count[$key] = $row['airport_arrival_icao_count'];
 	        	}
-    			array_multisort($count,SORT_DESC,$alldata);
+    			array_multisort($count, SORT_DESC, $alldata);
                         foreach ($alldata as $number) {
-				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count']);
+				echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count']);
 			}
 			if ($Connection->tableExists('countries')) {
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
 				$SpotterArchive = new SpotterArchive();
-				$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
+				$alldata = $SpotterArchive->countAllFlightOverCountries(false, 0, $last_update_day);
 				foreach ($alldata as $number) {
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count']);
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count']);
 				}
 			}
 			
@@ -1505,37 +1505,37 @@ 
 			$lastyear = false;
 			foreach ($alldata as $number) {
 				if ($number['year_name'] != date('Y')) $lastyear = true;
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
 			$alldata = $Spotter->countAllMilitaryMonths();
 			foreach ($alldata as $number) {
-				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
 			$alldata = $Spotter->countAllMonthsOwners();
 			foreach ($alldata as $number) {
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
 			$alldata = $Spotter->countAllMonthsPilots();
 			foreach ($alldata as $number) {
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
 			$alldata = $Spotter->countAllMonthsAirlines();
 			foreach ($alldata as $number) {
-				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('airlines_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
 			$alldata = $Spotter->countAllMonthsAircrafts();
 			foreach ($alldata as $number) {
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
 			$alldata = $Spotter->countAllMonthsRealArrivals();
 			foreach ($alldata as $number) {
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Airports data...'."\n";
 			if ($globalDebug) echo '...Departure'."\n";
@@ -1580,7 +1580,7 @@ 
     			}
     			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
 			}
 			echo '...Arrival'."\n";
 			$pall = $Spotter->getLast7DaysAirportsArrival();
@@ -1622,7 +1622,7 @@ 
     			}
     			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
 			}
 
 			echo 'Flights data...'."\n";
@@ -1630,28 +1630,28 @@ 
 			echo '-> countAllDatesLastMonth...'."\n";
 			$alldata = $Spotter->countAllDatesLastMonth();
 			foreach ($alldata as $number) {
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
 			}
 			echo '-> countAllDates...'."\n";
 			$previousdata = $this->countAllDates();
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
 			$this->deleteStatFlight('date');
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates());
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates());
 			$values = array();
 			foreach ($alldata as $cnt) {
 				$values[] = $cnt['date_count'];
 			}
-			array_multisort($values,SORT_DESC,$alldata);
-			array_splice($alldata,11);
+			array_multisort($values, SORT_DESC, $alldata);
+			array_splice($alldata, 11);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
 			}
 			
 			$this->deleteStatFlight('hour');
 			echo '-> countAllHours...'."\n";
 			$alldata = $Spotter->countAllHours('hour');
 			foreach ($alldata as $number) {
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
 			}
 
 
@@ -1660,34 +1660,34 @@ 
 			echo '--- Stats 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);
+			$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']);
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao']);
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao']);
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao']);
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source']);
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source']);
 			}
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
-       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
+       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
 	        	//$alldata = array();
     			foreach ($dall as $value) {
@@ -1707,12 +1707,12 @@ 
     			}
     			$alldata = $pall;
 			foreach ($alldata as $number) {
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao']);
+				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']);
 			}
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
-        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
+        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
 	        	//$alldata = array();
     			foreach ($dall as $value) {
@@ -1732,7 +1732,7 @@ 
     			}
     			$alldata = $pall;
                         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'],$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']);
 			}
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
 			$Spotter = new Spotter($this->db);
@@ -1740,27 +1740,27 @@ 
 			$lastyear = false;
 			foreach ($alldata as $number) {
 				if ($number['year_name'] != date('Y')) $lastyear = true;
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines();
 			foreach ($alldata as $number) {
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines();
 			foreach ($alldata as $number) {
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines();
 			foreach ($alldata as $number) {
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines();
 			foreach ($alldata as $number) {
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo '...Departure'."\n";
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
@@ -1783,7 +1783,7 @@ 
     			}
     			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], $number['airline_icao']);
 			}
 			if ($globalDebug) echo '...Arrival'."\n";
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
@@ -1806,32 +1806,32 @@ 
     			}
     			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], $number['airline_icao']);
 			}
 
 			if ($globalDebug) echo 'Flights data...'."\n";
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines();
 			foreach ($alldata as $number) {
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
 			}
 			if ($globalDebug) echo '-> countAllDates...'."\n";
 			//$previousdata = $this->countAllDatesByAirlines();
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines());
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines());
 			$values = array();
 			foreach ($alldata as $cnt) {
 				$values[] = $cnt['date_count'];
 			}
-			array_multisort($values,SORT_DESC,$alldata);
-			array_splice($alldata,11);
+			array_multisort($values, SORT_DESC, $alldata);
+			array_splice($alldata, 11);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
 			}
 			
 			if ($globalDebug) echo '-> countAllHours...'."\n";
 			$alldata = $Spotter->countAllHoursByAirlines('hour');
 			foreach ($alldata as $number) {
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
 			}
 			
 
@@ -1848,32 +1848,32 @@ 
 				// Count by filter
 				if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
 				$Spotter = new Spotter($this->db);
-				$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name);
+					$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name);
 				}
-				$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name);
+					$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name);
 				}
-				$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name);
+					$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name);
 				}
-				$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name);
+					$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name);
 				}
-				$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name);
+					$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name);
 				}
-				$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source']);
+					$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source']);
 				}
-				$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
-	       			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
+				$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
+	       			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
 		        	$alldata = array();
 	    			foreach ($pall as $value) {
 		        		$icao = $value['airport_departure_icao'];
@@ -1889,12 +1889,12 @@ 
     				foreach ($alldata as $key => $row) {
     					$count[$key] = $row['airport_departure_icao_count'];
     				}
-				array_multisort($count,SORT_DESC,$alldata);
+				array_multisort($count, SORT_DESC, $alldata);
 				foreach ($alldata as $number) {
-    					echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name);
+    					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);
 				}
-				$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,$filter);
-    				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,$filter);
+				$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, $filter);
+    				$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, $filter);
 				$alldata = array();
     				foreach ($pall as $value) {
 		        		$icao = $value['airport_arrival_icao'];
@@ -1910,40 +1910,40 @@ 
         			foreach ($alldata as $key => $row) {
     					$count[$key] = $row['airport_arrival_icao_count'];
 		        	}
-        			array_multisort($count,SORT_DESC,$alldata);
+        			array_multisort($count, SORT_DESC, $alldata);
 				foreach ($alldata as $number) {
-					echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name);
+					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);
 				}
 				$Spotter = new Spotter($this->db);
 				$alldata = $Spotter->countAllMonths($filter);
 				$lastyear = false;
 				foreach ($alldata as $number) {
 					if ($number['year_name'] != date('Y')) $lastyear = true;
-					$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				$alldata = $Spotter->countAllMonthsOwners($filter);
 				foreach ($alldata as $number) {
-					$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				$alldata = $Spotter->countAllMonthsPilots($filter);
 				foreach ($alldata as $number) {
-					$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				$alldata = $Spotter->countAllMilitaryMonths($filter);
 				foreach ($alldata as $number) {
-					$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				$alldata = $Spotter->countAllMonthsAircrafts($filter);
 				foreach ($alldata as $number) {
-					$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				$alldata = $Spotter->countAllMonthsRealArrivals($filter);
 				foreach ($alldata as $number) {
-					$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				echo '...Departure'."\n";
-				$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
-        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
+				$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
+        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
 				foreach ($dall as $value) {
     					$icao = $value['departure_airport_icao'];
     					$ddate = $value['date'];
@@ -1961,11 +1961,11 @@ 
     				}
 	    			$alldata = $pall;
 				foreach ($alldata as $number) {
-					$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],'',$filter_name);
+					$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], '', $filter_name);
 				}
 				echo '...Arrival'."\n";
-				$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
-    				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
+				$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
+    				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
 				foreach ($dall as $value) {
 					$icao = $value['arrival_airport_icao'];
 					$ddate = $value['date'];
@@ -1983,40 +1983,40 @@ 
     				}
     				$alldata = $pall;
 				foreach ($alldata as $number) {
-					$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],'',$filter_name);
+					$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], '', $filter_name);
 				}
     
 				echo 'Flights data...'."\n";
 				echo '-> countAllDatesLastMonth...'."\n";
 				$alldata = $Spotter->countAllDatesLastMonth($filter);
 				foreach ($alldata as $number) {
-					$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
+					$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
 				}
 				echo '-> countAllDates...'."\n";
-				$previousdata = $this->countAllDates('',$filter_name);
-				$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
+				$previousdata = $this->countAllDates('', $filter_name);
+				$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
 				$values = array();
 				foreach ($alldata as $cnt) {
 					$values[] = $cnt['date_count'];
 				}
-				array_multisort($values,SORT_DESC,$alldata);
-				array_splice($alldata,11);
+				array_multisort($values, SORT_DESC, $alldata);
+				array_splice($alldata, 11);
 				foreach ($alldata as $number) {
-					$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
+					$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
 				}
 				
 				echo '-> countAllHours...'."\n";
-				$alldata = $Spotter->countAllHours('hour',$filter);
+				$alldata = $Spotter->countAllHours('hour', $filter);
 				foreach ($alldata as $number) {
-					$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
+					$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
 				}
 				echo 'Insert last stats update date...'."\n";
 				date_default_timezone_set('UTC');
-				$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s'));
+				$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s'));
 				if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) {
-					if (date('Y',strtotime($last_update_day)) != date('Y')) {
+					if (date('Y', strtotime($last_update_day)) != date('Y')) {
 						$this->deleteOldStats($filter_name);
-						$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00');
+						$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00');
 					}
 				}
 
@@ -2029,16 +2029,16 @@ 
 				// SUM all previous month to put as year
 				$previous_year = date('Y');
 				$previous_year--;
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
 				$allairlines = $this->getAllAirlineNames();
 				foreach ($allairlines as $data) {
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
 				}
 				
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
@@ -2047,7 +2047,7 @@ 
 						try {
 							$sth = $this->db->prepare($query);
 							$sth->execute();
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
 						}
 					}
@@ -2056,15 +2056,15 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
 					}
 				}
 				if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) {
 					$last_update = $this->getLastStatsUpdate('last_update_stats');
-					if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) {
+					if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) {
 						$this->deleteOldStats();
-						$this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00');
+						$this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00');
 						$lastyearupdate = true;
 					}
 				}
@@ -2086,7 +2086,7 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -2100,14 +2100,14 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 			}
 			if (!isset($lastyearupdate)) {
 				echo 'Insert last stats update date...'."\n";
 				date_default_timezone_set('UTC');
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
 			}
 		//}
 	}

require/class.SpotterLive.php

Doc Comments +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 	/**
 	* Get SQL query part for filter used
 	* @param Array $filter the filter
-	* @return Array the SQL part
+	* @return string the SQL part
 	*/
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter;

Braces +71 added lines, -24 removed lines

@@ -26,7 +26,9 @@ 
 				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
 			}
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -71,8 +73,11 @@ 
 				$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
 			}
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
 	}
@@ -108,7 +113,9 @@ 
 			$orderby_query = ' '.$search_orderby_array[$sort]['sql'];
 		}
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
 			$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query.$orderby_query;
@@ -133,7 +140,9 @@ 
 
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 //			$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL ".$globalLiveInterval." SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate$orderby_query";
 //			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, a.aircraft_shadow FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate INNER JOIN (SELECT * FROM aircraft) a on spotter_live.aircraft_icao = a.icao';
@@ -180,7 +189,9 @@ 
 
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 
 			$query  = 'SELECT a.aircraft_shadow, a.engine_type, a.engine_count, a.wake_category, spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
@@ -220,7 +231,9 @@ 
 		global $globalDBdriver, $globalLiveInterval;
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			//$query  = 'SELECT COUNT(*) as nb FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query;
 			$query = 'SELECT COUNT(DISTINCT spotter_live.flightaware_id) as nb FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
@@ -250,7 +263,9 @@ 
 	{
 		global $globalDBdriver, $globalLiveInterval;
 		$Spotter = new Spotter($this->db);
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		$filter_query = $this->getFilter($filter);
 
 		if (is_array($coord)) {
@@ -258,7 +273,9 @@ 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		} else return array();
+		} else {
+			return array();
+		}
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "SELECT spotter_output.* FROM spotter_output WHERE spotter_output.flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL ".$globalLiveInterval." SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.")";
 			$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query;
@@ -449,11 +466,15 @@ 
 		//$query  = self::$global_query.' WHERE spotter_live.flightaware_id = :id ORDER BY date';
 		if ($globalDBdriver == 'mysql') {
 			$query = 'SELECT spotter_live.* FROM spotter_live WHERE spotter_live.flightaware_id = :id';
-			if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
+			if ($liveinterval) {
+				$query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
+			}
 			$query .= ' ORDER BY date';
 		} else {
 			$query = 'SELECT spotter_live.* FROM spotter_live WHERE spotter_live.flightaware_id = :id';
-			if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
+			if ($liveinterval) {
+				$query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
+			}
 			$query .= ' ORDER BY date';
 		}
 
@@ -548,7 +569,9 @@ 
 				$i++;
 				$j++;
 				if ($j == 30) {
-					if ($globalDebug) echo ".";
+					if ($globalDebug) {
+						echo ".";
+					}
 				    	try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
@@ -856,7 +879,9 @@ 
 			{
 				return false;
 			}
-		} else return '';
+		} else {
+			return '';
+		}
 
 		if ($longitude != '')
 		{
@@ -864,7 +889,9 @@ 
 			{
 				return false;
 			}
-		} else return '';
+		} else {
+			return '';
+		}
 
 		if ($waypoints != '')
 		{
@@ -880,7 +907,9 @@ 
 			{
 				return false;
 			}
-		} else $altitude = 0;
+		} else {
+			$altitude = 0;
+		}
 
 		if ($heading != '')
 		{
@@ -888,7 +917,9 @@ 
 			{
 				return false;
 			}
-		} else $heading = 0;
+		} else {
+			$heading = 0;
+		}
 
 		if ($groundspeed != '')
 		{
@@ -896,9 +927,13 @@ 
 			{
 				return false;
 			}
-		} else $groundspeed = 0;
+		} else {
+			$groundspeed = 0;
+		}
 		date_default_timezone_set('UTC');
-		if ($date == '') $date = date("Y-m-d H:i:s", time());
+		if ($date == '') {
+			$date = date("Y-m-d H:i:s", time());
+		}
 
         
 		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
@@ -942,10 +977,18 @@ 
 		$arrival_airport_country = '';
 		
             	
-            	if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
-            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
+            	if ($squawk == '' || $Common->isInteger($squawk) === false ) {
+            		$squawk = NULL;
+            	}
+            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) {
+            		$verticalrate = NULL;
+            	}
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) {
+            		$groundspeed = 0;
+            	}
+            	if ($heading == '' || $Common->isInteger($heading) === false ) {
+            		$heading = 0;
+            	}
             	
 		$query  = 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country) 
 		VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_shadow,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name, :departure_airport_city, :departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date,:departure_airport_time,:arrival_airport_time,:squawk,:route_stop,:ModeS, :pilot_id, :pilot_name, :verticalrate, :ground, :format_source, :source_name, :over_country)';
@@ -960,9 +1003,13 @@ 
                 	return "error : ".$e->getMessage();
                 }
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
-		    if ($globalDebug) echo '(Add to SBS archive : ';
+		    if ($globalDebug) {
+		    	echo '(Add to SBS archive : ';
+		    }
 		    $result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
-		    if ($globalDebug) echo $result.')';
+		    if ($globalDebug) {
+		    	echo $result.')';
+		    }
 		}
 		return "success";
 

Indentation +204 added lines, -204 removed lines

@@ -12,10 +12,10 @@ 
 
 
 	/**
-	* Get SQL query part for filter used
-	* @param Array $filter the filter
-	* @return Array the SQL part
-	*/
+	 * Get SQL query part for filter used
+	 * @param Array $filter the filter
+	 * @return Array the SQL part
+	 */
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
 		$filters = array();
@@ -83,11 +83,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveSpotterData($limit = '', $sort = '', $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -126,11 +126,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveSpotterData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -181,11 +181,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data since xx seconds
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data since xx seconds
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLastLiveSpotterData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -199,7 +199,7 @@ 
 			$query  = 'SELECT a.aircraft_shadow, a.engine_type, a.engine_count, a.wake_category, spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live LEFT JOIN (SELECT aircraft_shadow,engine_type, engine_count, wake_category,icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
 			ORDER BY spotter_live.flightaware_id, spotter_live.date";
-                } else {
+				} else {
 /*
 			$query  = "SELECT a.aircraft_shadow, spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date 
@@ -211,7 +211,7 @@ 
 //			echo $query;
 		}
 
-    		try {
+			try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
 		} catch(PDOException $e) {
@@ -223,11 +223,11 @@ 
 	}
 
 	/**
-	* Gets number of latest data entry
-	*
-	* @return String number of entry
-	*
-	*/
+	 * Gets number of latest data entry
+	 *
+	 * @return String number of entry
+	 *
+	 */
 	public function getLiveSpotterCount($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -254,11 +254,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry and coord
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveSpotterDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -283,11 +283,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on a user's latitude and longitude
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on a user's latitude and longitude
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestSpotterForLayar($lat, $lng, $radius, $interval)
 	{
 		$Spotter = new Spotter($this->db);
@@ -297,145 +297,145 @@ 
 				return false;
 			}
 		}
-        if ($lng != '')
-                {
-                        if (!is_numeric($lng))
-                        {
-                                return false;
-                        }
-                }
-
-                if ($radius != '')
-                {
-                        if (!is_numeric($radius))
-                        {
-                                return false;
-                        }
-                }
+		if ($lng != '')
+				{
+						if (!is_numeric($lng))
+						{
+								return false;
+						}
+				}
+
+				if ($radius != '')
+				{
+						if (!is_numeric($radius))
+						{
+								return false;
+						}
+				}
 		$additional_query = '';
-        if ($interval != '')
-                {
-                        if (!is_string($interval))
-                        {
-                                //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
-			        return false;
-                        } else {
-                if ($interval == '1m')
-                {
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
-                } else if ($interval == '15m'){
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
-                } 
-            }
-                } else {
-         $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';   
-        }
-
-                $query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
+		if ($interval != '')
+				{
+						if (!is_string($interval))
+						{
+								//$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
+					return false;
+						} else {
+				if ($interval == '1m')
+				{
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
+				} else if ($interval == '15m'){
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
+				} 
+			}
+				} else {
+		 $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';   
+		}
+
+				$query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
                    WHERE spotter_live.latitude <> '' 
                                    AND spotter_live.longitude <> '' 
                    ".$additional_query."
                    HAVING distance < :radius  
                                    ORDER BY distance";
 
-                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
+				$spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
     
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveSpotterDataByIdent($ident)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveSpotterDataByIdent($ident,$date)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
-                $date = date('c',$date);
+				$date = date('c',$date);
 		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveSpotterDataById($id)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveSpotterDataById($id,$date)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
-                $date = date('c',$date);
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$date = date('c',$date);
 		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets altitude information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets altitude information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAltitudeLiveSpotterDataByIdent($ident)
 	{
 
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
+				$query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
 
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -448,12 +448,12 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveSpotterDataById($id,$liveinterval = false)
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -481,18 +481,18 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular ident
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular ident
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveSpotterDataByIdent($ident)
 	{
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = self::$global_query.' WHERE spotter_live.ident = :ident';
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -506,23 +506,23 @@ 
 
 
 	/**
-	* Deletes all info in the table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterData()
 	{
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= spotter_live.date";
 			$query  = 'DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= spotter_live.date';
-            		//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
+					//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
 		} else {
 			$query  = "DELETE FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date";
 		}
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute();
@@ -534,18 +534,18 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for aircraft not seen since 2 HOUR
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for aircraft not seen since 2 HOUR
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataNotUpdated()
 	{
 		global $globalDBdriver, $globalDebug;
 		if ($globalDBdriver == 'mysql') {
 			//$query = 'SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < spotter_live.date) LIMIT 800 OFFSET 0';
-    			$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
-    			try {
+				$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -553,8 +553,8 @@ 
 				return "error";
 			}
 			$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
-                        $i = 0;
-                        $j =0;
+						$i = 0;
+						$j =0;
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			foreach($all as $row)
 			{
@@ -562,20 +562,20 @@ 
 				$j++;
 				if ($j == 30) {
 					if ($globalDebug) echo ".";
-				    	try {
+						try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 						$sth->execute();
 					} catch(PDOException $e) {
 						return "error";
 					}
-                                	$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
-                                	$j = 0;
+									$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
+									$j = 0;
 				}
 				$query_delete .= "'".$row['flightaware_id']."',";
 			}
 			if ($i > 0) {
-    				try {
+					try {
 					
 					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 					$sth->execute();
@@ -586,9 +586,9 @@ 
 			return "success";
 		} elseif ($globalDBdriver == 'pgsql') {
 			//$query = "SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < spotter_live.date) LIMIT 800 OFFSET 0";
-    			//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
-    			$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
-    			try {
+				//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
+				$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -632,17 +632,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an ident
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an ident
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataByIdent($ident)
 	{
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM spotter_live WHERE ident = :ident';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -654,17 +654,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an id
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an id
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataById($id)
 	{
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
@@ -677,11 +677,11 @@ 
 
 
 	/**
-	* Gets the aircraft ident within the last hour
-	*
-	* @return String the ident
-	*
-	*/
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -707,14 +707,14 @@ 
 			$ident_result = $row['ident'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdentRecent($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -740,14 +740,14 @@ 
 			$ident_result = $row['flightaware_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by id
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft by id
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdRecent($id)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -773,14 +773,14 @@ 
 			$ident_result = $row['flightaware_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by ModeS
-	*
-	* @return String the ModeS
-	*
-	*/
+	 * Check recent aircraft by ModeS
+	 *
+	 * @return String the ModeS
+	 *
+	 */
 	public function checkModeSRecent($modes)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -807,19 +807,19 @@ 
 			$ident_result = $row['flightaware_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Adds a new spotter data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $aircraft_icao the aircraft type
-	* @param String $departure_airport_icao the departure airport
-	* @param String $arrival_airport_icao the arrival airport
-	* @return String success or false
-	*
-	*/
+	 * Adds a new spotter data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $aircraft_icao the aircraft type
+	 * @param String $departure_airport_icao the departure airport
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @return String success or false
+	 *
+	 */
 	public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '')
 	{
 		global $globalURL, $globalArchive, $globalDebug;
@@ -954,10 +954,10 @@ 
 		$arrival_airport_country = '';
 		
             	
-            	if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
-            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
+				if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
+				if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
+				if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
             	
 		$query  = 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country) 
 		VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_shadow,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name, :departure_airport_city, :departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date,:departure_airport_time,:arrival_airport_time,:squawk,:route_stop,:ModeS, :pilot_id, :pilot_name, :verticalrate, :ground, :format_source, :source_name, :over_country)';
@@ -967,14 +967,14 @@ 
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-                } catch(PDOException $e) {
-                	return "error : ".$e->getMessage();
-                }
+				} catch(PDOException $e) {
+					return "error : ".$e->getMessage();
+				}
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
-		    if ($globalDebug) echo '(Add to SBS archive : ';
-		    $SpotterArchive = new SpotterArchive($this->db);
-		    $result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
-		    if ($globalDebug) echo $result.')';
+			if ($globalDebug) echo '(Add to SBS archive : ';
+			$SpotterArchive = new SpotterArchive($this->db);
+			$result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
+			if ($globalDebug) echo $result.')';
 		}
 		return "success";
 

Spacing +111 added lines, -111 removed lines

@@ -16,64 +16,64 @@ 
 	* @param Array $filter the filter
 	* @return Array the SQL part
 	*/
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
-		foreach($filters as $flt) {
+		foreach ($filters as $flt) {
 			if (isset($flt['airlines']) && !empty($flt['airlines'])) {
 				if ($flt['airlines'][0] != '') {
 					if (isset($flt['source'])) {
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_live.flightaware_id";
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) so ON so.flightaware_id = spotter_live.flightaware_id";
 					} else {
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) so ON so.flightaware_id = spotter_live.flightaware_id";
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) so ON so.flightaware_id = spotter_live.flightaware_id";
 					}
 				}
 			}
 			if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_live.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) so ON so.flightaware_id = spotter_live.flightaware_id";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) so ON so.flightaware_id = spotter_live.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) so ON so.flightaware_id = spotter_live.flightaware_id";
 				}
 			}
 			if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']))) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_live.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) so ON so.flightaware_id = spotter_live.flightaware_id";
 				}
 			}
 		}
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
 			if ($filter['airlines'][0] != '') {
-				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_live.flightaware_id";
+				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_live.flightaware_id";
 			}
 		}
 		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id ";
 		}
 		if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) {
-			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) so ON so.flightaware_id = spotter_live.flightaware_id";
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) so ON so.flightaware_id = spotter_live.flightaware_id";
 		}
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
 			$filter_query_where = " WHERE ident = '".$filter['ident']."'";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
 			if ($filter_query_where == '') {
-				$filter_query_where = " WHERE format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+				$filter_query_where = " WHERE format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 			} else {
-				$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+				$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 			}
 		}
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
@@ -99,8 +99,8 @@ 
 		if ($limit != '')
 		{
 			$limit_array = explode(',', $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0];
@@ -120,7 +120,7 @@ 
 		} else {
 			$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query.$orderby_query;
 		}
-		$spotter_array = $Spotter->getDataFromDB($query.$limit_query,array(),'',true);
+		$spotter_array = $Spotter->getDataFromDB($query.$limit_query, array(), '', true);
 
 		return $spotter_array;
 	}
@@ -136,7 +136,7 @@ 
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
 
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 		if ($globalDBdriver == 'mysql') {
@@ -147,7 +147,7 @@ 
 			$query  = 'SELECT a.aircraft_shadow, spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao'.$filter_query." spotter_live.latitude <> 0 AND spotter_live.longitude <> 0";
 */
-			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
+			$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query." spotter_live.latitude <> 0 AND spotter_live.longitude <> 0";
 
 //			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= spotter_live.date ORDER BY spotter_live.date GROUP BY spotter_live.flightaware_id'.$filter_query;
@@ -162,7 +162,7 @@ 
 			FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao".$filter_query." spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'";
 */
 
-			$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
+			$query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query." spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'";
 
 
@@ -173,7 +173,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -193,7 +193,7 @@ 
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
 
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 		if ($globalDBdriver == 'mysql') {
@@ -202,7 +202,7 @@ 
 			FROM spotter_live LEFT JOIN (SELECT aircraft_shadow,engine_type, engine_count, wake_category,icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
 			ORDER BY spotter_live.flightaware_id, spotter_live.date";
 */
-			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
+			$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
 			ORDER BY spotter_live.flightaware_id, spotter_live.date";
                 } else {
@@ -211,7 +211,7 @@ 
 			FROM spotter_live LEFT JOIN (SELECT aircraft_shadow,engine_type, engine_count, wake_category, icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
 			ORDER BY spotter_live.flightaware_id, spotter_live.date";
 */
-			$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
+			$query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
 			ORDER BY spotter_live.flightaware_id, spotter_live.date";
 //			echo $query;
@@ -220,7 +220,7 @@ 
     		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -237,7 +237,7 @@ 
 	public function getLiveSpotterCount($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 		if ($globalDBdriver == 'mysql') {
@@ -250,7 +250,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -273,10 +273,10 @@ 
 		$filter_query = $this->getFilter($filter);
 
 		if (is_array($coord)) {
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 		} else return array();
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "SELECT spotter_output.* FROM spotter_output WHERE spotter_output.flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL ".$globalLiveInterval." SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.")";
@@ -329,7 +329,7 @@ 
                 if ($interval == '1m')
                 {
                     $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
-                } else if ($interval == '15m'){
+                } else if ($interval == '15m') {
                     $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
                 } 
             }
@@ -337,14 +337,14 @@ 
          $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';   
         }
 
-                $query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
+                $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
                    WHERE spotter_live.latitude <> '' 
                                    AND spotter_live.longitude <> '' 
                    ".$additional_query."
                    HAVING distance < :radius  
                                    ORDER BY distance";
 
-                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
+                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius));
 
                 return $spotter_array;
         }
@@ -362,9 +362,9 @@ 
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+                $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
-		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true);
+		$spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident), '', true);
 
 		return $spotter_array;
 	}
@@ -375,16 +375,16 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getDateLiveSpotterDataByIdent($ident,$date)
+	public function getDateLiveSpotterDataByIdent($ident, $date)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+                $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
-                $date = date('c',$date);
-		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
+                $date = date('c', $date);
+		$spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
 
 		return $spotter_array;
 	}
@@ -401,9 +401,9 @@ 
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+                $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
-		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true);
+		$spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id), '', true);
 
 		return $spotter_array;
 	}
@@ -414,15 +414,15 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getDateLiveSpotterDataById($id,$date)
+	public function getDateLiveSpotterDataById($id, $date)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
-                $date = date('c',$date);
-		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
+                $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+                $date = date('c', $date);
+		$spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true);
 
 		return $spotter_array;
 	}
@@ -439,13 +439,13 @@ 
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
+                $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
 
     		try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -460,7 +460,7 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getAllLiveSpotterDataById($id,$liveinterval = false)
+	public function getAllLiveSpotterDataById($id, $liveinterval = false)
 	{
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
@@ -479,7 +479,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -497,12 +497,12 @@ 
 	{
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-		$query  = self::$global_query.' WHERE spotter_live.ident = :ident';
+		$query = self::$global_query.' WHERE spotter_live.ident = :ident';
     		try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -532,7 +532,7 @@ 
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 
@@ -555,14 +555,14 @@ 
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error";
 			}
 			$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
                         $i = 0;
-                        $j =0;
+                        $j = 0;
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			foreach($all as $row)
+			foreach ($all as $row)
 			{
 				$i++;
 				$j++;
@@ -570,9 +570,9 @@ 
 					if ($globalDebug) echo ".";
 				    	try {
 						
-						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
+						$sth = $this->db->prepare(substr($query_delete, 0, -1).")");
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error";
 					}
                                 	$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
@@ -583,9 +583,9 @@ 
 			if ($i > 0) {
     				try {
 					
-					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
+					$sth = $this->db->prepare(substr($query_delete, 0, -1).")");
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error";
 				}
 			}
@@ -598,7 +598,7 @@ 
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error";
 			}
 /*			$query_delete = "DELETE FROM spotter_live WHERE flightaware_id IN (";
@@ -646,13 +646,13 @@ 
 	public function deleteLiveSpotterDataByIdent($ident)
 	{
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-		$query  = 'DELETE FROM spotter_live WHERE ident = :ident';
+		$query = 'DELETE FROM spotter_live WHERE ident = :ident';
         
     		try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 
@@ -668,13 +668,13 @@ 
 	public function deleteLiveSpotterDataById($id)
 	{
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-		$query  = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
+		$query = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
         
     		try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 
@@ -692,13 +692,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = 'SELECT spotter_live.ident FROM spotter_live 
+			$query = 'SELECT spotter_live.ident FROM spotter_live 
 				WHERE spotter_live.ident = :ident 
 				AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) 
 				AND spotter_live.date < UTC_TIMESTAMP()';
 			$query_data = array(':ident' => $ident);
 		} else {
-			$query  = "SELECT spotter_live.ident FROM spotter_live 
+			$query = "SELECT spotter_live.ident FROM spotter_live 
 				WHERE spotter_live.ident = :ident 
 				AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 				AND spotter_live.date < now() AT TIME ZONE 'UTC'";
@@ -707,8 +707,8 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-		$ident_result='';
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		$ident_result = '';
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
 		}
@@ -725,13 +725,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live 
+			$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live 
 				WHERE spotter_live.ident = :ident 
 				AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; 
 //				AND spotter_live.date < UTC_TIMESTAMP()";
 			$query_data = array(':ident' => $ident);
 		} else {
-			$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live 
+			$query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live 
 				WHERE spotter_live.ident = :ident 
 				AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'";
 //				AND spotter_live.date < now() AT TIME ZONE 'UTC'";
@@ -740,8 +740,8 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-		$ident_result='';
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		$ident_result = '';
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['flightaware_id'];
 		}
@@ -758,13 +758,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live 
+			$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live 
 				WHERE spotter_live.flightaware_id = :id 
 				AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; 
 //				AND spotter_live.date < UTC_TIMESTAMP()";
 			$query_data = array(':id' => $id);
 		} else {
-			$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live 
+			$query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live 
 				WHERE spotter_live.flightaware_id = :id 
 				AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'";
 //				AND spotter_live.date < now() AT TIME ZONE 'UTC'";
@@ -773,8 +773,8 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-		$ident_result='';
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		$ident_result = '';
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['flightaware_id'];
 		}
@@ -791,13 +791,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live 
+			$query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live 
 				WHERE spotter_live.ModeS = :modes 
 				AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; 
 //				AND spotter_live.date < UTC_TIMESTAMP()";
 			$query_data = array(':modes' => $modes);
 		} else {
-			$query  = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live 
+			$query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live 
 				WHERE spotter_live.ModeS = :modes 
 				AND spotter_live.date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '30 MINUTE'";
 //			//	AND spotter_live.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
@@ -806,8 +806,8 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-		$ident_result='';
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		$ident_result = '';
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			//$ident_result = $row['spotter_live_id'];
 			$ident_result = $row['flightaware_id'];
@@ -826,7 +826,7 @@ 
 	* @return String success or false
 	*
 	*/
-	public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '')
+	public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false, $registration = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false, $format_source = '', $source_name = '', $over_country = '')
 	{
 		global $globalURL, $globalArchive, $globalDebug;
 		$Common = new Common();
@@ -919,26 +919,26 @@ 
 		if ($date == '') $date = date("Y-m-d H:i:s", time());
 
         
-		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING);
-		$altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT);
-		$route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING);
-		$ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING);
-		$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING);
-		$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
-		$source_name = filter_var($source_name,FILTER_SANITIZE_STRING);
-		$over_country = filter_var($over_country,FILTER_SANITIZE_STRING);
-		$verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT);
+		$flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING);
+		$altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT);
+		$route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING);
+		$ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING);
+		$pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING);
+		$pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
+		$source_name = filter_var($source_name, FILTER_SANITIZE_STRING);
+		$over_country = filter_var($over_country, FILTER_SANITIZE_STRING);
+		$verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT);
 
 		$airline_name = '';
 		$airline_icao = '';
@@ -960,26 +960,26 @@ 
 		$arrival_airport_country = '';
 		
             	
-            	if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
-            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
+            	if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
+            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
+            	if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
             	
-		$query  = 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country) 
+		$query = 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country) 
 		VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_shadow,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name, :departure_airport_city, :departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date,:departure_airport_time,:arrival_airport_time,:squawk,:route_stop,:ModeS, :pilot_id, :pilot_name, :verticalrate, :ground, :format_source, :source_name, :over_country)';
 
-		$query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident, ':registration' => $registration,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,':aircraft_icao' => $aircraft_icao,':aircraft_shadow' => $aircraft_shadow,':aircraft_type' => $aircraft_type,':aircraft_manufacturer' => $aircraft_manufacturer,':departure_airport_icao' => $departure_airport_icao,':departure_airport_name' => $departure_airport_name,':departure_airport_city' => $departure_airport_city,':departure_airport_country' => $departure_airport_country,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk,':route_stop' => $route_stop,':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source,':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country);
+		$query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_type' => $aircraft_type, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country);
 		try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                 	return "error : ".$e->getMessage();
                 }
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
 		    if ($globalDebug) echo '(Add to SBS archive : ';
 		    $SpotterArchive = new SpotterArchive($this->db);
-		    $result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
+		    $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time, $arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name, $verticalrate, $format_source, $source_name, $over_country);
 		    if ($globalDebug) echo $result.')';
 		}
 		return "success";
@@ -988,7 +988,7 @@ 
 
 	public function getOrderBy()
 	{
-		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC"));
+		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC"));
 		return $orderby;
 	}
 

statistics-sub-menu.php

Spacing +6 added lines, -6 removed lines

@@ -13,7 +13,7 @@ 
 					} else {
 						print '<option value="">All</option>';
 					}
-					foreach($airlines as $airline) {
+					foreach ($airlines as $airline) {
 						if (isset($airline_icao) && $airline_icao == $airline['airline_icao']) {
 							print '<option value="'.$airline['airline_icao'].'" selected>'.$airline['airline_name'].'</option>';
 						} else {
@@ -28,7 +28,7 @@ 
 <div class="sub-menu sub-menu-container">
 	<ul class="nav">
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#" >
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#" >
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu">
@@ -39,7 +39,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airline"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -49,7 +49,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -60,7 +60,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Route"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -69,7 +69,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">

Braces +3 added lines, -1 removed lines

@@ -7,7 +7,9 @@
 				<?php
 					require_once('require/class.Stats.php');
 					$Stats = new Stats();
-					if (!isset($filter_name)) $filter_name = '';
+					if (!isset($filter_name)) {
+						$filter_name = '';
+					}
 					$airlines = $Stats->getAllAirlineNames($filter_name);
 					if (isset($airline_icao) && ($airline_icao == '' || $airline_icao == 'all')) {
 						print '<option value="all" selected>All</option>';