Ysurac / FlightAirMap

require/class.Stats.php

Doc Comments +35 added lines

@@ -18,6 +18,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);";
@@ -1368,6 +1372,10 @@ 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
+
+	/**
+	 * @param string $type
+	 */
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1379,6 +1387,11 @@ 
 			echo "error : ".$e->getMessage();
 		}
 	}
+
+	/**
+	 * @param string $type
+	 * @param string $year
+	 */
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		global $globalArchiveMonths, $globalDBdriver;
@@ -1578,6 +1591,10 @@ 
                 else return 0;
         }
 
+	/**
+	 * @param string $type
+	 * @param string $stats_date
+	 */
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
@@ -1631,6 +1648,9 @@ 
         }
         */
 
+	/**
+	 * @param string $stats_type
+	 */
 	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
 		global $globalDBdriver;
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
@@ -1674,6 +1694,9 @@ 
 		return $all;
 	}
 
+	/**
+	 * @param string $stats_type
+	 */
 	public function addStatSource($data,$source_name,$stats_type,$date) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1689,6 +1712,10 @@ 
                         return "error : ".$e->getMessage();
                 }
         }
+
+	/**
+	 * @param string $type
+	 */
 	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);
@@ -1955,6 +1982,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);
@@ -1965,6 +1996,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);

Indentation +537 added lines, -537 removed lines

@@ -16,33 +16,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);
@@ -51,35 +51,35 @@ 
                         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 = '') {
-        	if ($filter_name == '') {
-        		$query = "DELETE FROM config WHERE name = 'last_update_stats'";
-        	} else {
-        		$query = "DELETE FROM config WHERE name = 'last_update_stats_".$filter_name."'";
-        	}
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        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 = '') {
+			if ($filter_name == '') {
+				$query = "DELETE FROM config WHERE name = 'last_update_stats'";
+			} else {
+				$query = "DELETE FROM config WHERE name = 'last_update_stats_".$filter_name."'";
+			}
+				 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";
@@ -227,17 +227,17 @@ 
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		} else $all = array();
-                if (empty($all)) {
-            		$Spotter = new Spotter($this->db);
-            		$filters = array();
-            		$filters = array('year' => $year,'month' => $month);
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
-			}
-            		//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
-            		$all = $Spotter->countAllAirlineCountries($limit,$filters);
-                }
-                return $all;
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$filters = array();
+					$filters = array('year' => $year,'month' => $month);
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+			}
+					//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
+					$all = $Spotter->countAllAirlineCountries($limit,$filters);
+				}
+				return $all;
 	}
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
@@ -402,17 +402,17 @@ 
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		} else $all = array();
-                if (empty($all)) {
-	                $Spotter = new Spotter($this->db);
-            		$filters = array();
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$filters = array();
 			$filters = array('year' => $year,'month' => $month);
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
-    		        $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 = '',$year = '',$month = '') {
 		global $globalStatsFilters;
@@ -942,22 +942,22 @@ 
 		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]);
+				 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;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllDatesByAirlines($filters);
+				}
+				return $all;
 	}
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters, $globalDBdriver;
@@ -1011,19 +1011,19 @@ 
 		} else {
 			$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year, EXTRACT(MONTH FROM stats_date) as month,cnt as count FROM stats WHERE stats_type = 'fatalities_bymonth' ORDER BY stats_date";
 		}
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 
-                if (empty($all)) {
-            		$Accident = new Accident($this->db);
-            		$all = $Accident->countFatalitiesLast12Months();
-                }
-                return $all;
+				if (empty($all)) {
+					$Accident = new Accident($this->db);
+					$all = $Accident->countFatalitiesLast12Months();
+				}
+				return $all;
 	}
 	public function countFatalitiesByYear() {
 		global $globalStatsFilters, $globalDBdriver;
@@ -1032,40 +1032,40 @@ 
 		} else {
 			$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year, cnt as count FROM stats WHERE stats_type = 'fatalities_byyear' ORDER BY stats_date";
 		}
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 
-                if (empty($all)) {
-            		$Accident = new Accident($this->db);
-            		$all = $Accident->countFatalitiesByYear();
-                }
-                return $all;
+				if (empty($all)) {
+					$Accident = new Accident($this->db);
+					$all = $Accident->countFatalitiesByYear();
+				}
+				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]);
+			$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;
+					$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;
@@ -1140,10 +1140,10 @@ 
 		if ($year == '') $year = date('Y');
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
 		if (empty($all)) {
-		        $filters = array();
+				$filters = array();
 			$filters = array('year' => $year,'month' => $month);
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
@@ -1235,10 +1235,10 @@ 
 			$all = $result[0]['nb_airline'];
 		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
 		if (empty($all)) {
-            		$filters = array();
+					$filters = array();
 			$filters = array('year' => $year,'month' => $month);
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
@@ -1499,119 +1499,119 @@ 
 		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 getStatsOwner($owner_name,$filter_name = '') {
-    		global $globalArchiveMonths, $globalDBdriver;
+			global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
-                else return 0;
-        }
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (isset($all[0]['cnt'])) return $all[0]['cnt'];
+				else return 0;
+		}
 	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 getStatsPilot($pilot,$filter_name = '') {
-    		global $globalArchiveMonths, $globalDBdriver;
+			global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
-                else return 0;
-        }
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (isset($all[0]['cnt'])) return $all[0]['cnt'];
+				else return 0;
+		}
 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($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";
@@ -1680,25 +1680,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 = '',$reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1714,14 +1714,14 @@ 
 				$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 = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1737,14 +1737,14 @@ 
 				$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,$airline_icao = '',$filter_name = '',$reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1760,14 +1760,14 @@ 
 				$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);"; 
 			}
 		}
-                $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
-                 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,':airline' => $airline_icao);
+				 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 = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1783,14 +1783,14 @@ 
 				$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 = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1806,14 +1806,14 @@ 
 				$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 = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1829,14 +1829,14 @@ 
 				$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 = '',$reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1852,14 +1852,14 @@ 
 				$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 = '',$reset = false) {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
@@ -1883,8 +1883,8 @@ 
 			} 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 ($airport_icao != '') {
@@ -1900,8 +1900,8 @@ 
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
-                }
-        }
+				}
+		}
 	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
@@ -1918,15 +1918,15 @@ 
 					$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) {
-            		        return "error : ".$e->getMessage();
-	                }
-	        }
-        }
+							$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 ($airport_icao != '') {
@@ -1942,46 +1942,46 @@ 
 			} 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,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
-    		$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,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
+			$Common = new Common();
+			$Connection = new Connection();
+			date_default_timezone_set('UTC');
+			$last_update = $this->getLastStatsUpdate('last_update_stats');
 			if ($globalDebug) echo 'Update stats !'."\n";
 			if (isset($last_update[0]['value'])) {
 				$last_update_day = $last_update[0]['value'];
@@ -2029,24 +2029,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;
+				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'];
-        		}
+				$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'],'','',$reset);
@@ -2054,25 +2054,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'],'','',$reset);
 			}
 			if ($Connection->tableExists('countries')) {
@@ -2151,8 +2151,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'];
@@ -2171,29 +2171,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'];
@@ -2213,22 +2213,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']);
 			}
@@ -2305,51 +2305,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'],'',$reset);
 			}
 			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) {
 				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
 			}
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
@@ -2382,47 +2382,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']);
 			}
@@ -2507,44 +2507,44 @@ 
 					$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
 				}
 				$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
-	       			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
-		        	$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,$reset);
+						echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset);
 				}
 				$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
-    				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
+					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$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,$reset);
 				}
@@ -2577,45 +2577,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 +540 added lines, -540 removed lines

@@ -18,14 +18,14 @@ 
 		$this->db = $Connection->db();
         }
               
-	public function addLastStatsUpdate($type,$stats_date) {
+	public function addLastStatsUpdate($type, $stats_date) {
                 $query = "DELETE FROM config WHERE name = :type;
             		INSERT INTO config (name,value) VALUES (:type,:stats_date);";
-                $query_values = array('type' => $type,':stats_date' => $stats_date);
+                $query_values = array('type' => $type, ':stats_date' => $stats_date);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -35,7 +35,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':type' => $type));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -55,7 +55,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -68,7 +68,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 
@@ -76,7 +76,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -86,77 +86,77 @@ 
 		 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->getAllAirlineNames('',NULL,$filters);
+			$all = $Spotter->getAllAirlineNames('', NULL, $filters);
 		}
 		return $all;
 	}
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
-	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
+	public function getAllManufacturers($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
 
-	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
+	public function getAllOwnerNames($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
 
-	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
+	public function getAllPilotNames($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -164,23 +164,23 @@ 
 	}
 
 
-	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
+	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -191,29 +191,29 @@ 
 				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
+			$all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
 		}
 		return $all;
 	}
-	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
+	public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -222,7 +222,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);
@@ -230,32 +230,32 @@ 
                 if (empty($all)) {
             		$Spotter = new Spotter($this->db);
             		$filters = array();
-            		$filters = array('year' => $year,'month' => $month);
+            		$filters = array('year' => $year, 'month' => $month);
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
-            		$all = $Spotter->countAllAirlineCountries($limit,$filters);
+            		$all = $Spotter->countAllAirlineCountries($limit, $filters);
                 }
                 return $all;
 	}
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
+				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -266,21 +266,21 @@ 
 				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month);
@@ -289,23 +289,23 @@ 
 		return $all;
 	}
 
-	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
+	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
+				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -316,61 +316,61 @@ 
 				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
 		}
 		return $all;
 	}
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
-			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
+			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
+			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
 			$query_values = array(':filter_name' => $filter_name);
 		} else {
 			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
 			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
-			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+			$query_values = array(':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);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
@@ -379,7 +379,7 @@ 
 		return $all;
 	}
 
-	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
+	public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -388,7 +388,7 @@ 
 			if (isset($forsource)) {
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
-				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
+				$query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource);
 			} else {
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
@@ -397,7 +397,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);
@@ -405,32 +405,32 @@ 
                 if (empty($all)) {
 	                $Spotter = new Spotter($this->db);
             		$filters = array();
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
                 }
                 return $all;
 	}
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
+				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -441,45 +441,45 @@ 
 				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
+			$all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
 		}
 		return $all;
 	}
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
+				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -490,46 +490,46 @@ 
 				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
 				 try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
 		}
 		return $all;
 	}
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		$Connection = new Connection();
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($Connection->tableExists('countries')) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
 				$Spotter = new Spotter($this->db);
-				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 				if ($year == '' && $month == '') {
 					$alliance_airlines = array();
 					foreach ($airlines as $airline) {
-						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+						$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 					}
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
+					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
+					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
 					 try {
 						$sth = $this->db->prepare($query);
 						$sth->execute(array(':filter_name' => $filter_name));
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						echo "error : ".$e->getMessage();
 					}
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -541,8 +541,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);
@@ -559,7 +559,7 @@ 
 			return array();
 		}
 	}
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -567,41 +567,41 @@ 
 			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		} else $all = array();
 		if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllPilots($limit,0,'',$filters);
+			$all = $Spotter->countAllPilots($limit, 0, '', $filters);
 		}
 		return $all;
 	}
 
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			if ($year == '' && $month == '') {
 				$alliance_airlines = array();
 				foreach ($airlines as $airline) {
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 				}
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
+				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -612,45 +612,45 @@ 
 				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllOwners($limit,0,'',$filters);
+			$all = $Spotter->countAllOwners($limit, 0, '', $filters);
 		}
 		return $all;
 	}
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			if ($year == '' && $month == '') {
 				$alliance_airlines = array();
 				foreach ($airlines as $airline) {
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 				}
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -661,27 +661,27 @@ 
 				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
-			$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
-			$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
+			$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
+			$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
 			$all = array();
 			foreach ($pall as $value) {
 				$icao = $value['airport_departure_icao'];
@@ -697,27 +697,27 @@ 
 			foreach ($all as $key => $row) {
 				$count[$key] = $row['airport_departure_icao_count'];
 			}
-			array_multisort($count,SORT_DESC,$all);
+			array_multisort($count, SORT_DESC, $all);
 		}
 		return $all;
 	}
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			if ($year == '' && $month == '') {
 				$alliance_airlines = array();
 				foreach ($airlines as $airline) {
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 				}
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -728,27 +728,27 @@ 
 				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 //			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month);
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
 			$all = array();
 			foreach ($pall as $value) {
 				$icao = $value['airport_arrival_icao'];
@@ -764,26 +764,26 @@ 
 			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 (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
 			} else {
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
 			}
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
@@ -794,23 +794,23 @@ 
 				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)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$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);
@@ -818,57 +818,57 @@ 
 		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;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
 			$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)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$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 (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
 			} else {
-				$query = "SELECT flight_date as date_name, SUM(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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+				$query = "SELECT flight_date as date_name, SUM(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 IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
 			}
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
@@ -877,60 +877,60 @@ 
 			} 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)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$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;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC";
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$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);
@@ -945,34 +945,34 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_data);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 if (empty($all)) {
             		$filters = array();
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
             		$Spotter = new Spotter($this->db);
             		$all = $Spotter->countAllDatesByAirlines($filters);
                 }
                 return $all;
 	}
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
+				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
 			} else {
-				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
+				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
 			}
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
@@ -986,18 +986,18 @@ 
 		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)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$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);
@@ -1014,7 +1014,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1035,7 +1035,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1053,32 +1053,32 @@ 
                  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 (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
-			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
-			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
 			if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1096,37 +1096,37 @@ 
 		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)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$filters = array('airlines' => array($stats_airline));
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
-			$all = $Spotter->countAllHours($orderby,$filters);
+			$all = $Spotter->countAllHours($orderby, $filters);
 		}
 		return $all;
 	}
-	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
+	public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '') $year = date('Y');
-		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
+		$all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
@@ -1134,16 +1134,16 @@ 
 		}
 		return $all;
 	}
-	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
+	public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '') $year = date('Y');
-		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
+		$all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month);
 		if (empty($all)) {
 		        $filters = array();
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
@@ -1151,19 +1151,19 @@ 
 		}
 		return $all;
 	}
-	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
+	public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '') $year = date('Y');
-		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
+		$all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallArrival($filters,$year,$month);
@@ -1171,48 +1171,48 @@ 
 		}
 		return $all;
 	}
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			if ($year == '' && $month == '') {
 				$alliance_airlines = array();
 				foreach ($airlines as $airline) {
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 				}
-				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 				$all = $result[0]['nb'];
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
 		} else {
 			if ($year == '' && $month == '') {
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline));
-				} catch(PDOException $e) {
+					$sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 				$all = $result[0]['nb'];
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallAircrafts($filters,$year,$month);
@@ -1220,7 +1220,7 @@ 
 		}
 		return $all;
 	}
-	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
+	public function countOverallAirlines($filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -1228,17 +1228,17 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 			$all = $result[0]['nb_airline'];
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
+		} else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month);
 		if (empty($all)) {
             		$filters = array();
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
@@ -1246,29 +1246,29 @@ 
 		}
 		return $all;
 	}
-	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
+	public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			if ($year == '' && $month == '') {
 				$alliance_airlines = array();
 				foreach ($airlines as $airline) {
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 				}
-				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 				$query_values = array(':filter_name' => $filter_name);
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 				$all = $result[0]['nb'];
 			} else {
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
 			}
 		} else {
 			if ($year == '' && $month == '') {
@@ -1277,23 +1277,23 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 				$all = $result[0]['nb'];
 			} else {
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
 			}
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallOwners($filters,$year,$month);
@@ -1301,7 +1301,7 @@ 
 		}
 		return $all;
 	}
-	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		//if ($year == '') $year = date('Y');
@@ -1311,18 +1311,18 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 			$all = $result[0]['nb'];
 		} else {
-			$all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month);
+			$all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month);
 		}
 		if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallPilots($filters,$year,$month);
@@ -1331,104 +1331,104 @@ 
 		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;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
-			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
-			$query_values = array(':airport_icao' => $airport_icao,':filter_name' => $filter_name);
+			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
+			$query_values = array(':airport_icao' => $airport_icao, ':filter_name' => $filter_name);
 		} else {
 			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
-			$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
-	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
+	public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 	}
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		global $globalArchiveMonths, $globalDBdriver;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
 				if ($month == '') {
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
 				} else {
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
 				}
 			} else {
 				if ($month == '') {
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
 				} else {
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
 				}
 			}
 		} else {
 			if ($globalDBdriver == 'mysql') {
 				if ($month == '') {
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 				} else {
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
 				}
 			} else {
 				if ($month == '') {
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 				} else {
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
 				}
 			}
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1437,17 +1437,17 @@ 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$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 IN ('".implode("','", $alliance_airlines)."') 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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$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 IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 			}
 			$query_values = array(':type' => $type, ':filter_name' => $filter_name);
 		} else {
@@ -1461,7 +1461,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);
@@ -1470,17 +1470,17 @@ 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 			} else {
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 			}
 		} else {
 			if ($globalDBdriver == 'mysql') {
@@ -1492,7 +1492,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);
@@ -1509,7 +1509,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);
@@ -1526,20 +1526,20 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all[0]['total'];
         }
-	public function getStatsOwner($owner_name,$filter_name = '') {
+	public function getStatsOwner($owner_name, $filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1557,20 +1557,20 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all[0]['total'];
         }
-	public function getStatsPilot($pilot,$filter_name = '') {
+	public function getStatsPilot($pilot, $filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
                  try {
                         $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
-                } catch(PDOException $e) {
+                        $sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot));
+                } catch (PDOException $e) {
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1578,7 +1578,7 @@ 
                 else return 0;
         }
 
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
@@ -1586,15 +1586,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') {
@@ -1603,11 +1603,11 @@ 
             		//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
                 }
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+                $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -1631,75 +1631,75 @@ 
         }
         */
 
-	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
+	public function getStatsSource($stats_type, $year = '', $month = '', $day = '') {
 		global $globalDBdriver;
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
 		$query_values = array();
 		if ($globalDBdriver == 'mysql') {
 			if ($year != '') {
 				$query .= ' AND YEAR(stats_date) = :year';
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 			if ($month != '') {
 				$query .= ' AND MONTH(stats_date) = :month';
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 			if ($day != '') {
 				$query .= ' AND DAY(stats_date) = :day';
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		} else {
 			if ($year != '') {
 				$query .= ' AND EXTRACT(YEAR FROM stats_date) = :year';
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 			if ($month != '') {
 				$query .= ' AND EXTRACT(MONTH FROM stats_date) = :month';
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 			if ($day != '') {
 				$query .= ' AND EXTRACT(DAY FROM stats_date) = :day';
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " ORDER BY source_name";
-		$query_values = array_merge($query_values,array(':stats_type' => $stats_type));
+		$query_values = array_merge($query_values, array(':stats_type' => $stats_type));
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
 
-	public function addStatSource($data,$source_name,$stats_type,$date) {
+	public function addStatSource($data, $source_name, $stats_type, $date) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
 		} else {
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; 
                 }
-                $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
+                $query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
                 $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
-                $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+                $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1714,15 +1714,15 @@ 
 				$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
 		}
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
+                $query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1737,15 +1737,15 @@ 
 				$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; 
 			}
 		}
-                $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
+                $query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1760,15 +1760,15 @@ 
 				$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);"; 
 			}
 		}
-                $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
+                $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1783,15 +1783,15 @@ 
 				$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
 		}
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
+                $query_values = array(':aircraft_icao' => $aircraft_icao, ':aircraft_name' => $aircraft_name, ':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1806,15 +1806,15 @@ 
 				$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; 
 			}
 		}
-                $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
+                $query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1829,15 +1829,15 @@ 
 				$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
 		}
-                $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+                $query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1852,15 +1852,15 @@ 
 				$query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; 
 			}
 		}
-                $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
+                $query_values = array(':pilot_id' => $pilot_id, ':cnt' => $cnt, ':pilot_name' => $pilot_name, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':format_source' => $format_source);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -1876,16 +1876,16 @@ 
 					$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
 				}
 			}
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
                 }
         }
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -1893,16 +1893,16 @@ 
 			} else {
 				$query = "UPDATE stats_airport SET departure = :departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 			 try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
                 }
         }
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -1918,16 +1918,16 @@ 
 					$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
 				}
 			}
-	                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+	                $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 			 try {
                     		$sth = $this->db->prepare($query);
 	                        $sth->execute($query_values);
-    		        } catch(PDOException $e) {
+    		        } catch (PDOException $e) {
             		        return "error : ".$e->getMessage();
 	                }
 	        }
         }
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -1935,11 +1935,11 @@ 
 			} else {
 				$query = "UPDATE stats_airport SET arrival = :arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
                 }
@@ -1951,7 +1951,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -1961,7 +1961,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -1971,13 +1971,13 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
         
         public function addOldStats() {
-    		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
+    		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents;
     		$Common = new Common();
     		$Connection = new Connection();
     		date_default_timezone_set('UTC');
@@ -1995,41 +1995,41 @@ 
 			$Spotter = new Spotter($this->db);
 
 			if ($globalDebug) echo 'Count all aircraft types...'."\n";
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset);
 			}
 			if ($globalDebug) echo 'Count all airlines...'."\n";
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all registrations...'."\n";
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset);
 			}
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all owners...'."\n";
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset);
 			}
 			if ($globalDebug) echo 'Count all pilots...'."\n";
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
 				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset);
 			}
 			
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
-        		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
+        		$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order departure airports...'."\n";
 	        	$alldata = array();
 	        	
@@ -2047,14 +2047,14 @@ 
     			foreach ($alldata as $key => $row) {
     				$count[$key] = $row['airport_departure_icao_count'];
         		}
-			array_multisort($count,SORT_DESC,$alldata);
+			array_multisort($count, SORT_DESC, $alldata);
 			foreach ($alldata as $number) {
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset);
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', '', $reset);
 			}
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
-        		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
+        		$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
 	        	$alldata = array();
     			foreach ($pall as $value) {
@@ -2071,18 +2071,18 @@ 
         		foreach ($alldata as $key => $row) {
         			$count[$key] = $row['airport_arrival_icao_count'];
 	        	}
-    			array_multisort($count,SORT_DESC,$alldata);
+    			array_multisort($count, SORT_DESC, $alldata);
                         foreach ($alldata as $number) {
-				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
+				echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', '', $reset);
 			}
 			if ($Connection->tableExists('countries')) {
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
 				//$SpotterArchive = new SpotterArchive();
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
 				$Spotter = new Spotter($this->db);
-				$alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day);
+				$alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day);
 				foreach ($alldata as $number) {
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset);
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset);
 				}
 			}
 			
@@ -2092,12 +2092,12 @@ 
 				$this->deleteStatsByType('fatalities_byyear');
 				$alldata = $Accident->countFatalitiesByYear();
 				foreach ($alldata as $number) {
-					$this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year'])));
+					$this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year'])));
 				}
 				$this->deleteStatsByType('fatalities_bymonth');
 				$alldata = $Accident->countFatalitiesLast12Months();
 				foreach ($alldata as $number) {
-					$this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year'])));
+					$this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year'])));
 				}
 			}
 
@@ -2113,37 +2113,37 @@ 
 			$lastyear = false;
 			foreach ($alldata as $number) {
 				if ($number['year_name'] != date('Y')) $lastyear = true;
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('airlines_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Airports data...'."\n";
 			if ($globalDebug) echo '...Departure'."\n";
@@ -2188,7 +2188,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();
@@ -2230,7 +2230,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";
@@ -2238,28 +2238,28 @@ 
 			echo '-> countAllDatesLastMonth...'."\n";
 			$alldata = $Spotter->countAllDatesLastMonth($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
 			}
 			echo '-> countAllDates...'."\n";
 			$previousdata = $this->countAllDates();
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
 			$this->deleteStatFlight('date');
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month));
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month));
 			$values = array();
 			foreach ($alldata as $cnt) {
 				$values[] = $cnt['date_count'];
 			}
-			array_multisort($values,SORT_DESC,$alldata);
-			array_splice($alldata,11);
+			array_multisort($values, SORT_DESC, $alldata);
+			array_splice($alldata, 11);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
 			}
 			
 			$this->deleteStatFlight('hour');
 			echo '-> countAllHours...'."\n";
-			$alldata = $Spotter->countAllHours('hour',$filter_last_month);
+			$alldata = $Spotter->countAllHours('hour', $filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
 			}
 
 
@@ -2270,42 +2270,42 @@ 
 				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
 				$SpotterArchive = new SpotterArchive();
 				//$Spotter = new Spotter($this->db);
-				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
+				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day);
 				//$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
 				foreach ($alldata as $number) {
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset);
 				}
 			}
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
 			$Spotter = new Spotter($this->db);
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset);
 			}
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
-       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
+       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
 	        	//$alldata = array();
     			foreach ($dall as $value) {
@@ -2325,12 +2325,12 @@ 
     			}
     			$alldata = $pall;
 			foreach ($alldata as $number) {
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset);
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
-        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
+        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
 	        	//$alldata = array();
     			foreach ($dall as $value) {
@@ -2350,7 +2350,7 @@ 
     			}
     			$alldata = $pall;
                         foreach ($alldata as $number) {
-				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
+				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
 			$Spotter = new Spotter($this->db);
@@ -2358,27 +2358,27 @@ 
 			$lastyear = false;
 			foreach ($alldata as $number) {
 				if ($number['year_name'] != date('Y')) $lastyear = true;
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo '...Departure'."\n";
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
@@ -2401,7 +2401,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();
@@ -2424,32 +2424,32 @@ 
     			}
     			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], $number['airline_icao']);
 			}
 
 			if ($globalDebug) echo 'Flights data...'."\n";
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
 			}
 			if ($globalDebug) echo '-> countAllDates...'."\n";
 			//$previousdata = $this->countAllDatesByAirlines();
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month));
 			$values = array();
 			foreach ($alldata as $cnt) {
 				$values[] = $cnt['date_count'];
 			}
-			array_multisort($values,SORT_DESC,$alldata);
-			array_splice($alldata,11);
+			array_multisort($values, SORT_DESC, $alldata);
+			array_splice($alldata, 11);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
 			}
 			
 			if ($globalDebug) echo '-> countAllHours...'."\n";
-			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
+			$alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
 			}
 			
 
@@ -2473,7 +2473,7 @@ 
 						$last_update_day = date('Y').'-01-01 00:00:00';
 					}
 				}
-				if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) {
+				if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) {
 					$last_update_day = date('Y').'-01-01 00:00:00';
 					$reset = true;
 				}
@@ -2482,32 +2482,32 @@ 
 				// Count by filter
 				if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
 				$Spotter = new Spotter($this->db);
-				$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
+					$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset);
 				}
-				$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
+					$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset);
 				}
-				$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
+					$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset);
 				}
-				$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
+					$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset);
 				}
-				$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
+					$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset);
 				}
-				$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
+				$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
 				foreach ($alldata as $number) {
-					$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
+					$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset);
 				}
-				$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
-	       			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
+				$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
+	       			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
 		        	$alldata = array();
 	    			foreach ($pall as $value) {
 		        		$icao = $value['airport_departure_icao'];
@@ -2523,12 +2523,12 @@ 
     				foreach ($alldata as $key => $row) {
     					$count[$key] = $row['airport_departure_icao_count'];
     				}
-				array_multisort($count,SORT_DESC,$alldata);
+				array_multisort($count, SORT_DESC, $alldata);
 				foreach ($alldata as $number) {
-    					echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset);
+    					echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', $filter_name, $reset);
 				}
-				$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
-    				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
+				$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter);
+    				$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter);
 				$alldata = array();
     				foreach ($pall as $value) {
 		        		$icao = $value['airport_arrival_icao'];
@@ -2544,40 +2544,40 @@ 
         			foreach ($alldata as $key => $row) {
     					$count[$key] = $row['airport_arrival_icao_count'];
 		        	}
-        			array_multisort($count,SORT_DESC,$alldata);
+        			array_multisort($count, SORT_DESC, $alldata);
 				foreach ($alldata as $number) {
-					echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset);
+					echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', $filter_name, $reset);
 				}
 				$Spotter = new Spotter($this->db);
 				$alldata = $Spotter->countAllMonths($filter);
 				$lastyear = false;
 				foreach ($alldata as $number) {
 					if ($number['year_name'] != date('Y')) $lastyear = true;
-					$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				$alldata = $Spotter->countAllMonthsOwners($filter);
 				foreach ($alldata as $number) {
-					$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				$alldata = $Spotter->countAllMonthsPilots($filter);
 				foreach ($alldata as $number) {
-					$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				$alldata = $Spotter->countAllMilitaryMonths($filter);
 				foreach ($alldata as $number) {
-					$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				$alldata = $Spotter->countAllMonthsAircrafts($filter);
 				foreach ($alldata as $number) {
-					$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				$alldata = $Spotter->countAllMonthsRealArrivals($filter);
 				foreach ($alldata as $number) {
-					$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+					$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 				}
 				echo '...Departure'."\n";
-				$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
-        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
+				$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
+        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
 				foreach ($dall as $value) {
     					$icao = $value['departure_airport_icao'];
     					$ddate = $value['date'];
@@ -2595,11 +2595,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'];
@@ -2617,40 +2617,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');
 					}
 				}
 
@@ -2663,16 +2663,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) {
@@ -2681,7 +2681,7 @@ 
 						try {
 							$sth = $this->db->prepare($query);
 							$sth->execute();
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
 						}
 					}
@@ -2690,15 +2690,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;
 					}
 				}
@@ -2720,7 +2720,7 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -2734,14 +2734,14 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 			}
 			if (!isset($lastyearupdate)) {
 				echo 'Insert last stats update date...'."\n";
 				date_default_timezone_set('UTC');
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
 			}
 			if ($globalStatsResetYear) {
 				require_once(dirname(__FILE__).'/../install/class.settings.php');

Braces +580 added lines, -204 removed lines

@@ -13,7 +13,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();
         }
@@ -81,7 +83,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);
@@ -101,7 +105,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);
@@ -113,7 +119,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);
@@ -125,7 +133,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);
@@ -138,7 +148,9 @@ 
 	}
 
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
 		try {
 			$sth = $this->db->prepare($query);
@@ -151,7 +163,9 @@ 
 	}
 
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
 		try {
 			$sth = $this->db->prepare($query);
@@ -166,7 +180,9 @@ 
 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -175,8 +191,11 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+				if ($limit) {
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -184,11 +203,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+				if ($limit) {
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND 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));
@@ -196,7 +220,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -215,10 +241,15 @@ 
 	}
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
+			if ($limit) {
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
+			} else {
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
+			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':filter_name' => $filter_name));
@@ -226,7 +257,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
                 if (empty($all)) {
             		$Spotter = new Spotter($this->db);
             		$filters = array();
@@ -241,7 +274,9 @@ 
 	}
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -250,8 +285,11 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
+				if ($limit) {
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -259,11 +297,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
+				if ($limit) {
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -271,7 +314,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -291,7 +336,9 @@ 
 
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -300,8 +347,11 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
+				if ($limit) {
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -309,11 +359,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
+				if ($limit) {
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -321,7 +376,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -340,7 +397,9 @@ 
 	}
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -348,12 +407,18 @@ 
 			foreach ($airlines as $airline) {
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
-			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
+			if ($limit) {
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
+			} else {
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
+			}
 			$query_values = array(':filter_name' => $filter_name);
 		} else {
-			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
+			if ($limit) {
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
+			} else {
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
+			}
 			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
 		}
 		try {
@@ -381,17 +446,29 @@ 
 
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($globalVATSIM) $forsource = 'vatsim';
-			if ($globalIVAO) $forsource = 'ivao';
+			if ($globalVATSIM) {
+				$forsource = 'vatsim';
+			}
+			if ($globalIVAO) {
+				$forsource = 'ivao';
+			}
 			if (isset($forsource)) {
-				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
+				if ($limit) {
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
+				}
 				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
 			} else {
-				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
+				if ($limit) {
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
+				}
 				$query_values = array(':filter_name' => $filter_name);
 			}
 			try {
@@ -401,7 +478,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
                 if (empty($all)) {
 	                $Spotter = new Spotter($this->db);
             		$filters = array();
@@ -416,7 +495,9 @@ 
 	}
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -425,8 +506,11 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
+				if ($limit) {
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -434,11 +518,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
+				if ($limit) {
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -446,7 +535,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -465,7 +556,9 @@ 
 	}
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -474,8 +567,11 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
+				if ($limit) {
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
+				}
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -483,11 +579,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
+				if ($limit) {
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
+				}
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -495,7 +596,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -514,7 +617,9 @@ 
 	}
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		$Connection = new Connection();
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($Connection->tableExists('countries')) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 				$Spotter = new Spotter($this->db);
@@ -524,8 +629,11 @@ 
 					foreach ($airlines as $airline) {
 						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 					}
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
+					if ($limit) {
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
+					} else {
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
+					}
 					 try {
 						$sth = $this->db->prepare($query);
 						$sth->execute(array(':filter_name' => $filter_name));
@@ -534,11 +642,16 @@ 
 					}
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 					return $all;
-				} else return array();
+				} else {
+					return array();
+				}
 			} else {
 				if ($year == '' && $month == '') {
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
+					if ($limit) {
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
+					} else {
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
+					}
 					 try {
 						$sth = $this->db->prepare($query);
 						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -547,7 +660,9 @@ 
 					}
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 					return $all;
-				} else return array();
+				} else {
+					return array();
+				}
 			}
 		} else {
 			/*
@@ -561,10 +676,15 @@ 
 	}
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
+			if ($limit) {
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
+			} else {
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
+			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -572,7 +692,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
 			if ($filter_name != '') {
@@ -587,7 +709,9 @@ 
 
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -596,8 +720,11 @@ 
 				foreach ($airlines as $airline) {
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 				}
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
+				if ($limit) {
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -605,11 +732,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
+				if ($limit) {
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -617,7 +749,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -636,7 +770,9 @@ 
 	}
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -645,8 +781,11 @@ 
 				foreach ($airlines as $airline) {
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 				}
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+				if ($limit) {
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -654,11 +793,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+				if ($limit) {
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -666,7 +810,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -691,7 +837,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) {
@@ -703,7 +851,9 @@ 
 	}
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -712,8 +862,11 @@ 
 				foreach ($airlines as $airline) {
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 				}
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+				if ($limit) {
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -721,11 +874,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+				if ($limit) {
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -733,7 +891,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -758,7 +918,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) {
@@ -770,7 +932,9 @@ 
 	}
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -779,20 +943,32 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				if ($limit) {
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				} else {
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				}
 			} else {
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				if ($limit) {
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				} else {
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				}
 			}
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
 			if ($globalDBdriver == 'mysql') {
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+				if ($limit) {
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
+				} else {
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+				}
 			} else {
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+				if ($limit) {
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+				} else {
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+				}
 			}
 			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
 		}
@@ -820,7 +996,9 @@ 
 	
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -857,7 +1035,9 @@ 
 	}
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -902,7 +1082,9 @@ 
 	}
 	public function countAllDates($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -939,7 +1121,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 {
@@ -961,7 +1145,9 @@ 
 	}
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1048,7 +1234,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);
@@ -1069,7 +1257,9 @@ 
 	}
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1077,12 +1267,18 @@ 
 			foreach ($airlines as $airline) {
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
-			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
-			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+			if ($limit) {
+				$query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+			} else {
+				$query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+			}
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
-			if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
-			else $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			if ($limit) {
+				$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			} else {
+				$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			}
 			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		if ($orderby == 'hour') {
@@ -1092,7 +1288,9 @@ 
 				$query .= " ORDER BY CAST(flight_date AS integer) ASC";
 			}
 		}
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
+		if ($orderby == 'count') {
+			$query .= " ORDER BY hour_count DESC";
+		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
@@ -1116,8 +1314,12 @@ 
 	}
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($year == '') $year = date('Y');
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($year == '') {
+			$year = date('Y');
+		}
 		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -1136,8 +1338,12 @@ 
 	}
 	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($year == '') $year = date('Y');
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($year == '') {
+			$year = date('Y');
+		}
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
 		if (empty($all)) {
 		        $filters = array();
@@ -1153,8 +1359,12 @@ 
 	}
 	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($year == '') $year = date('Y');
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($year == '') {
+			$year = date('Y');
+		}
 		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -1173,7 +1383,9 @@ 
 	}
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1191,7 +1403,9 @@ 
 				}
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 				$all = $result[0]['nb'];
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+			} else {
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+			}
 		} else {
 			if ($year == '' && $month == '') {
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1203,7 +1417,9 @@ 
 				}
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 				$all = $result[0]['nb'];
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+			} else {
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -1222,7 +1438,9 @@ 
 	}
 	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
 			$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
 			try {
@@ -1233,7 +1451,9 @@ 
 			}
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 			$all = $result[0]['nb_airline'];
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
+		} else {
+			$all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
+		}
 		if (empty($all)) {
             		$filters = array();
 			$filters = array('year' => $year,'month' => $month);
@@ -1248,7 +1468,9 @@ 
 	}
 	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1303,7 +1525,9 @@ 
 	}
 	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		//if ($year == '') $year = date('Y');
 		if ($year == '' && $month == '') {
 			$query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1332,7 +1556,9 @@ 
 	}
 
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1356,7 +1582,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 {
@@ -1369,7 +1597,9 @@ 
 		return $all;
 	}
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
 		try {
@@ -1380,7 +1610,9 @@ 
 		}
 	}
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		global $globalArchiveMonths, $globalDBdriver;
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
@@ -1436,7 +1668,9 @@ 
 	}
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1469,7 +1703,9 @@ 
 	}
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1500,7 +1736,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 {
@@ -1517,7 +1755,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 {
@@ -1534,7 +1774,9 @@ 
         }
 	public function getStatsOwner($owner_name,$filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
                  try {
                         $sth = $this->db->prepare($query);
@@ -1543,12 +1785,17 @@ 
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
-                else return 0;
+                if (isset($all[0]['cnt'])) {
+                	return $all[0]['cnt'];
+                } else {
+                	return 0;
+                }
         }
 	public function getStatsPilotTotal($filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
     		if ($globalDBdriver == 'mysql') {
             		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
             	} else {
@@ -1565,7 +1812,9 @@ 
         }
 	public function getStatsPilot($pilot,$filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
                  try {
                         $sth = $this->db->prepare($query);
@@ -1574,13 +1823,18 @@ 
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
-                else return 0;
+                if (isset($all[0]['cnt'])) {
+                	return $all[0]['cnt'];
+                } else {
+                	return 0;
+                }
         }
 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt";
                 } else {
@@ -1596,7 +1850,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 {
@@ -1982,10 +2238,14 @@ 
     		$Connection = new Connection();
     		date_default_timezone_set('UTC');
     		$last_update = $this->getLastStatsUpdate('last_update_stats');
-			if ($globalDebug) echo 'Update stats !'."\n";
+			if ($globalDebug) {
+				echo 'Update stats !'."\n";
+			}
 			if (isset($last_update[0]['value'])) {
 				$last_update_day = $last_update[0]['value'];
-			} else $last_update_day = '2012-12-12 12:12:12';
+			} else {
+				$last_update_day = '2012-12-12 12:12:12';
+			}
 			$reset = false;
 			//if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) {
 			if ($globalStatsResetYear) {
@@ -1994,43 +2254,63 @@ 
 			}
 			$Spotter = new Spotter($this->db);
 
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircraft types...'."\n";
+			}
 			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
 			}
-			if ($globalDebug) echo 'Count all airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all registrations...'."\n";
+			if ($globalDebug) {
+				echo 'Count all registrations...'."\n";
+			}
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
 			}
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
+			if ($globalDebug) {
+				echo 'Count all callsigns...'."\n";
+			}
 			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all owners...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners...'."\n";
+			}
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
 			}
-			if ($globalDebug) echo 'Count all pilots...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots...'."\n";
+			}
 			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
 			foreach ($alldata as $number) {
-				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
+				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') {
+					$number['pilot_id'] = $number['pilot_name'];
+				}
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
 			}
 			
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all departure airports...'."\n";
+			}
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected departure airports...'."\n";
+			}
         		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order departure airports...'."\n";
+			if ($globalDebug) {
+				echo 'Order departure airports...'."\n";
+			}
 	        	$alldata = array();
 	        	
     			foreach ($pall as $value) {
@@ -2041,7 +2321,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) {
@@ -2051,11 +2333,17 @@ 
 			foreach ($alldata as $number) {
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset);
 			}
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all arrival airports...'."\n";
+			}
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected arrival airports...'."\n";
+			}
         		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
+			if ($globalDebug) {
+				echo 'Order arrival airports...'."\n";
+			}
 	        	$alldata = array();
     			foreach ($pall as $value) {
 	        		$icao = $value['airport_arrival_icao'];
@@ -2065,7 +2353,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) {
@@ -2076,7 +2366,9 @@ 
 				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
 			}
 			if ($Connection->tableExists('countries')) {
-				if ($globalDebug) echo 'Count all flights by countries...'."\n";
+				if ($globalDebug) {
+					echo 'Count all flights by countries...'."\n";
+				}
 				//$SpotterArchive = new SpotterArchive();
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
 				$Spotter = new Spotter($this->db);
@@ -2087,7 +2379,9 @@ 
 			}
 			
 			if (isset($globalAccidents) && $globalAccidents) {
-				if ($globalDebug) echo 'Count fatalities stats...'."\n";
+				if ($globalDebug) {
+					echo 'Count fatalities stats...'."\n";
+				}
 				$Accident = new Accident();
 				$this->deleteStatsByType('fatalities_byyear');
 				$alldata = $Accident->countFatalitiesByYear();
@@ -2105,48 +2399,68 @@ 
 			// Add by month using getstat if month finish...
 
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all flights by months...'."\n";
+			}
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
 			$filter_last_month = array('since_date' => $last_month);
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllMonths($filter_last_month);
 			$lastyear = false;
 			foreach ($alldata as $number) {
-				if ($number['year_name'] != date('Y')) $lastyear = true;
+				if ($number['year_name'] != date('Y')) {
+					$lastyear = true;
+				}
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all military flights by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
 			foreach ($alldata as $number) {
 				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
 			foreach ($alldata as $number) {
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
 			foreach ($alldata as $number) {
 				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all airlines by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
 			foreach ($alldata as $number) {
 				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircrafts by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
 			foreach ($alldata as $number) {
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all real arrivals by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
 			foreach ($alldata as $number) {
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Airports data...'."\n";
-			if ($globalDebug) echo '...Departure'."\n";
+			if ($globalDebug) {
+				echo 'Airports data...'."\n";
+			}
+			if ($globalDebug) {
+				echo '...Departure'."\n";
+			}
 			$this->deleteStatAirport('daily');
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
@@ -2267,7 +2581,9 @@ 
 			// Count by airlines
 			echo '--- Stats by airlines ---'."\n";
 			if ($Connection->tableExists('countries')) {
-				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
+				if ($globalDebug) {
+					echo 'Count all flights by countries by airlines...'."\n";
+				}
 				$SpotterArchive = new SpotterArchive();
 				//$Spotter = new Spotter($this->db);
 				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
@@ -2276,37 +2592,53 @@ 
 					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
 				}
 			}
-			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircraft types by airlines...'."\n";
+			}
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircraft registrations by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all callsigns by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
 			}
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all departure airports by airlines...'."\n";
+			}
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected departure airports by airlines...'."\n";
+			}
        			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Order detected departure airports by airlines...'."\n";
+			}
 	        	//$alldata = array();
     			foreach ($dall as $value) {
     				$icao = $value['airport_departure_icao'];
@@ -2327,11 +2659,17 @@ 
 			foreach ($alldata as $number) {
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all arrival airports by airlines...'."\n";
+			}
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected arrival airports by airlines...'."\n";
+			}
         		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Order arrival airports by airlines...'."\n";
+			}
 	        	//$alldata = array();
     			foreach ($dall as $value) {
     				$icao = $value['airport_arrival_icao'];
@@ -2350,37 +2688,53 @@ 
     			}
     			$alldata = $pall;
                         foreach ($alldata as $number) {
-				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
+				if ($number['airline_icao'] != '') {
+					echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
+				}
+			}
+			if ($globalDebug) {
+				echo 'Count all flights by months by airlines...'."\n";
 			}
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllMonthsByAirlines($filter_last_month);
 			$lastyear = false;
 			foreach ($alldata as $number) {
-				if ($number['year_name'] != date('Y')) $lastyear = true;
+				if ($number['year_name'] != date('Y')) {
+					$lastyear = true;
+				}
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners by months by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots by months by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
 				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircrafts by months by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all real arrivals by months by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
 			}
-			if ($globalDebug) echo '...Departure'."\n";
+			if ($globalDebug) {
+				echo '...Departure'."\n";
+			}
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
         		$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
     			foreach ($dall as $value) {
@@ -2403,7 +2757,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) {
@@ -2427,13 +2783,19 @@ 
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
 			}
 
-			if ($globalDebug) echo 'Flights data...'."\n";
-			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
+			if ($globalDebug) {
+				echo 'Flights data...'."\n";
+			}
+			if ($globalDebug) {
+				echo '-> countAllDatesLastMonth...'."\n";
+			}
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
 				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
 			}
-			if ($globalDebug) echo '-> countAllDates...'."\n";
+			if ($globalDebug) {
+				echo '-> countAllDates...'."\n";
+			}
 			//$previousdata = $this->countAllDatesByAirlines();
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
 			$values = array();
@@ -2446,7 +2808,9 @@ 
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
 			}
 			
-			if ($globalDebug) echo '-> countAllHours...'."\n";
+			if ($globalDebug) {
+				echo '-> countAllHours...'."\n";
+			}
 			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
 			foreach ($alldata as $number) {
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
@@ -2454,14 +2818,18 @@ 
 			
 
 			// Stats by filters
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
+				$globalStatsFilters = array();
+			}
 			foreach ($globalStatsFilters as $name => $filter) {
 				//$filter_name = $filter['name'];
 				$filter_name = $name;
 				$reset = false;
 				$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
 				if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) {
-					if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
+					if ($globalDebug) {
+						echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
+					}
 					$this->deleteOldStats($filter_name);
 					unset($last_update);
 				}
@@ -2480,7 +2848,9 @@ 
 				
 
 				// 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) {
@@ -2517,7 +2887,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) {
@@ -2538,7 +2910,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) {
@@ -2552,7 +2926,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);

statistics-sub-menu.php

Spacing +19 added lines, -19 removed lines

@@ -23,11 +23,11 @@ 
 					$Spotter = new Spotter();
 					$alliances = $Spotter->getAllAllianceNames();
 					if (!empty($alliances)) {
-						foreach($alliances as $alliance) {
-							if (isset($airline_icao) && str_replace('_',' ',$airline_icao) == $alliance['alliance']) {
-								print '<option value="'.str_replace(' ','_',$alliance['alliance']).'" selected>'.$alliance['alliance'].'</option>';
+						foreach ($alliances as $alliance) {
+							if (isset($airline_icao) && str_replace('_', ' ', $airline_icao) == $alliance['alliance']) {
+								print '<option value="'.str_replace(' ', '_', $alliance['alliance']).'" selected>'.$alliance['alliance'].'</option>';
 							} else {
-								print '<option value="'.str_replace(' ','_',$alliance['alliance']).'">'.$alliance['alliance'].'</option>';
+								print '<option value="'.str_replace(' ', '_', $alliance['alliance']).'">'.$alliance['alliance'].'</option>';
 							}
 						}
 						print '<option disabled>──────────</option>';
@@ -35,7 +35,7 @@ 
 					$Stats = new Stats();
 					if (!isset($filter_name)) $filter_name = '';
 					$airlines = $Stats->getAllAirlineNames($filter_name);
-					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 {
@@ -58,7 +58,7 @@ 
 	if (!isset($type) || $type == 'aircraft') {
 ?>
 		<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">
@@ -69,7 +69,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">
@@ -85,7 +85,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">
@@ -96,7 +96,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">
@@ -105,7 +105,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">
@@ -117,7 +117,7 @@ 
 		    if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) {
 		?>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Fatalities"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -132,7 +132,7 @@ 
 	} elseif ($type == 'marine' || $type == 'tracker') {
 ?>
 		<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">
@@ -154,7 +154,7 @@ 
 	if (!isset($type) || $type == 'aircraft') {
 ?>
 		<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">
@@ -165,7 +165,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">
@@ -181,7 +181,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">
@@ -193,7 +193,7 @@ 
 		</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">
@@ -204,7 +204,7 @@ 
 		-->
 		<!--
 		<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">
@@ -218,7 +218,7 @@ 
 		?>
 		<!--
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Fatalities"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -234,7 +234,7 @@ 
 	} elseif ($type == 'marine' || $type == 'tracker') {
 ?>
 		<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 +110 added lines, -27 removed lines

@@ -4,7 +4,13 @@ 
 	<div class="stats_airline">
 	
 		<form id="changedate" method="post">
-			<input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') echo $year.'-'; ?><?php if (isset($month) && $month != '') echo $month; ?>" />
+			<input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') {
+	echo $year.'-';
+}
+?><?php if (isset($month) && $month != '') {
+	echo $month;
+}
+?>" />
 		</form>
 <?php
 	if (!isset($type) || $type == 'aircraft') {
@@ -33,7 +39,9 @@ 
 						print '<option disabled>──────────</option>';
 					}
 					$Stats = new Stats();
-					if (!isset($filter_name)) $filter_name = '';
+					if (!isset($filter_name)) {
+						$filter_name = '';
+					}
 					$airlines = $Stats->getAllAirlineNames($filter_name);
 					foreach($airlines as $airline) {
 						if (isset($airline_icao) && $airline_icao == $airline['airline_icao']) {
@@ -62,10 +70,22 @@ 
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu">
-			<li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Aircraft"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Registration"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Manufacturer"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Country"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Aircraft"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Registration"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Manufacturer"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Country"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -76,12 +96,21 @@ 
 <?php
 		if (!isset($airline_icao) || $airline_icao == 'all') {
 ?>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Airline"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Airline by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Airline"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Airline by Country"); ?></a></li>
 <?php
 		}
 ?>
-		      <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Callsign"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Callsign"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -89,10 +118,22 @@ 
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Departure Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Arrival Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Departure Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Departure Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Arrival Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -100,8 +141,14 @@ 
 		      <?php echo _("Route"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/statistics/route-airport<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Route by Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/route-waypoint<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Route by Waypoint"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/route-airport<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Route by Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/route-waypoint<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Route by Waypoint"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -109,8 +156,14 @@ 
 		      <?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Date"); ?></a></li>
-			  <li><a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Time"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Date"); ?></a></li>
+			  <li><a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Time"); ?></a></li>
 		    </ul>
 		</li>
 		<?php
@@ -158,9 +211,18 @@ 
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu">
-			<li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Aircraft"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Registration"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Manufacturer"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Aircraft"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Registration"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Manufacturer"); ?></a></li>
 			<!-- <li><a href="<?php print $globalURL; ?>/statistics/country"><?php echo _("Country"); ?></a></li> -->
 		    </ul>
 		</li>
@@ -172,12 +234,21 @@ 
 <?php
 		if (!isset($airline_icao) || $airline_icao == 'all') {
 ?>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline by Country"); ?></a></li>
 <?php
 		}
 ?>
-		      <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Callsign"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Callsign"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -185,10 +256,22 @@ 
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
 		<!--

statistics.php

Indentation +4 added lines, -4 removed lines

@@ -249,7 +249,7 @@ 
 ?>
                 <div class="more">
             	    <?php
-            	    /*
+					/*
             		if ($year != '' && $month != '') {
             	    ?>
             	    <a href="<?php print $globalURL; ?>/marine/statistics/type/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
@@ -260,7 +260,7 @@ 
             	    <?php
             		}
             		*/
-            	    ?>
+					?>
                 </div>
             </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -294,7 +294,7 @@ 
 ?>
                 <div class="more">
             	    <?php
-            	    /*
+					/*
             		if ($year != '' && $month != '') {
             	    ?>
             	    <a href="<?php print $globalURL; ?>/marine/statistics/type/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
@@ -305,7 +305,7 @@ 
             	    <?php
             		}
             		*/
-            	    ?>
+					?>
                 </div>
             </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->

Spacing +137 added lines, -137 removed lines

@@ -19,7 +19,7 @@ 
 }
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($type == 'aircraft' && $airline_icao == '' && isset($globalFilter)) {
 	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
@@ -29,7 +29,7 @@ 
 	if (isset($airline_info[0]['name'])) {
 		$airline_name = $airline_info[0]['name'];
 	} else {
-		$alliances = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',$airline_icao));
+		$alliances = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', $airline_icao));
 		if (!empty($alliances)) {
 			$alliance_name = $airline_icao;
 			$airline_icao = 'alliance_'.$airline_icao;
@@ -42,8 +42,8 @@ 
 	$title = _("Statistics");
 }
 
-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
 
 require_once('header.php');
 
@@ -70,7 +70,7 @@ 
 		date_default_timezone_set('UTC');
 		$lastupdate = strtotime($last_update[0]['value']);
 		if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
-		print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
+		print '<i>Last update: '.date('Y-m-d G:i:s', $lastupdate).'</i>';
 	}
 }
 ?>
@@ -82,31 +82,31 @@ 
 <?php
 if ($type == 'aircraft') {
 ?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Flights"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
-        <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span>
-        <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Flights"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Arrivals seen"); ?></span>
+        <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
 ?>
-    	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Pilots"); ?></span>
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 	if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) {
 ?>
-    	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Owners"); ?></span>
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 ?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span>
-        <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Aircrafts types"); ?></span>
+        <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	if ($airline_icao == '') {
 ?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name, $year, $month)); ?></span> <?php echo _("Airlines"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 ?>
@@ -114,8 +114,8 @@ 
 	if (!(isset($globalVA) && $globalVA) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalphpVMS) && $globalphpVMS) && !(isset($globalVAM) && $globalVAM)) {
 		if ($airline_icao == '' || $airline_icao == 'all') {
 ?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name,$year,$month)); ?></span> <?php echo _("Military"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name, $year, $month)); ?></span> <?php echo _("Military"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 		}
 	}
@@ -123,22 +123,22 @@ 
 <?php
 } elseif ($type == 'marine') {
 ?>
-	<span><span class="badge"><?php print number_format($Marine->countOverallMarine(array(),$year,$month)); ?></span> <?php echo _("Vessels"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
-	<span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes(array(),$year,$month)); ?></span> <?php echo _("Types"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Marine->countOverallMarine(array(), $year, $month)); ?></span> <?php echo _("Vessels"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes(array(), $year, $month)); ?></span> <?php echo _("Types"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 } elseif ($type == 'tracker') {
 ?>
-	<span><span class="badge"><?php print number_format($Tracker->countOverallTracker(array(),$year,$month)); ?></span> <?php echo _("Trackers"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
-	<span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(),$year,$month)); ?></span> <?php echo _("Types"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Tracker->countOverallTracker(array(), $year, $month)); ?></span> <?php echo _("Trackers"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(), $year, $month)); ?></span> <?php echo _("Types"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 }
 ?>
     </p>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
     <div class="specific-stats">
 <?php
 if ($type == 'aircraft') {
@@ -147,13 +147,13 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
 <?php
-	$aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month);
+	$aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name, $year, $month);
 	if (count($aircraft_array) == 0) {
 		print _("No data available");
 	} else {
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
 		$aircraft_data = '';
-		foreach($aircraft_array as $aircraft_item) {
+		foreach ($aircraft_array as $aircraft_item) {
 			if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
 			else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
 		}
@@ -182,16 +182,16 @@ 
 ?>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	if ($airline_icao == '' || $airline_icao == 'all') {
-		$airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month);
+		$airline_array = $Stats->countAllAirlines(true, $filter_name, $year, $month);
 		if (count($airline_array) > 0) {
 			print '<div class="col-md-6">';
 			print '<h2>'._("Top 10 Most Common Airline").'</h2>';
 			print '<div id="chart2" class="chart" width="100%"></div><script>';
 			$airline_data = '';
-			foreach($airline_array as $airline_item) {
+			foreach ($airline_array as $airline_item) {
 				$airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],';
 			}
 			$airline_data = substr($airline_data, 0, -1);
@@ -216,7 +216,7 @@ 
 		}
 ?>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 }
@@ -228,12 +228,12 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Vessel Type"); ?></h2>
 <?php
-	$marine_array = $Marine->countAllMarineTypes(true,0,'',array(),$year,$month);
+	$marine_array = $Marine->countAllMarineTypes(true, 0, '', array(), $year, $month);
 	if (count($marine_array) == 0) print _("No data available");
 	else {
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
 		$marine_data = '';
-		foreach($marine_array as $marine_item) {
+		foreach ($marine_array as $marine_item) {
 			$marine_data .= '["'.$marine_item['marine_type'].'",'.$marine_item['marine_type_count'].'],';
 		}
 		$marine_data = substr($marine_data, 0, -1);
@@ -263,7 +263,7 @@ 
             	    ?>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <!--	</div>-->
 <?php
 }
@@ -273,12 +273,12 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Tracker Type"); ?></h2>
 <?php
-	$tracker_array = $Tracker->countAllTrackerTypes(true,0,'',array(),$year,$month);
+	$tracker_array = $Tracker->countAllTrackerTypes(true, 0, '', array(), $year, $month);
 	if (count($tracker_array) == 0) print _("No data available");
 	else {
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
 		$tracker_data = '';
-		foreach($tracker_array as $tracker_item) {
+		foreach ($tracker_array as $tracker_item) {
 			$tracker_data .= '["'.$tracker_item['tracker_type'].'",'.$tracker_item['tracker_type_count'].'],';
 		}
 		$tracker_data = substr($tracker_data, 0, -1);
@@ -308,7 +308,7 @@ 
             	    ?>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <!--	</div>-->
 <?php
 }
@@ -316,7 +316,7 @@ 
 ?>
         <div class="row column">
 <?php
-	$flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month);
+	$flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name, $year, $month);
 	//if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 	if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
 		if (empty($flightover_array)) {
@@ -327,12 +327,12 @@ 
 ?>
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
 <?php
-		$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month);
+		$pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name, $year, $month);
 		if (count($pilot_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
 			$pilot_data = '';
-			foreach($pilot_array as $pilot_item) {
+			foreach ($pilot_array as $pilot_item) {
 				$pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
 			}
 			$pilot_data = substr($pilot_data, 0, -1);
@@ -353,7 +353,7 @@ 
 ?>
             </div>
 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 	// else {
@@ -362,12 +362,12 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
 <?php
-		$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month);
+		$owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name, $year, $month);
 		if (count($owner_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
 			$owner_data = '';
-			foreach($owner_array as $owner_item) {
+			foreach ($owner_array as $owner_item) {
 				$owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
 			}
 			$owner_data = substr($owner_data, 0, -1);
@@ -386,7 +386,7 @@ 
                 </div>
             </div>
         
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 	if (!empty($flightover_array)) {
@@ -400,7 +400,7 @@ 
 			print '<div id="chart10" class="chart" width="100%"></div><script>';
 			print 'var series = [';
 			$flightover_data = '';
-			foreach($flightover_array as $flightover_item) {
+			foreach ($flightover_array as $flightover_item) {
 				$flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
 			}
 			$flightover_data = substr($flightover_data, 0, -1);
@@ -445,7 +445,7 @@ 
 	}
 ?>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 }
@@ -461,7 +461,7 @@ 
 		print '<div id="chart10" class="chart" width="100%"></div><script>';
 		print 'var series = [';
 		$flightover_data = '';
-		foreach($flightover_array as $flightover_item) {
+		foreach ($flightover_array as $flightover_item) {
 			$flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],';
 		}
 		$flightover_data = substr($flightover_data, 0, -1);
@@ -518,7 +518,7 @@ 
 		print '<div id="chart10" class="chart" width="100%"></div><script>';
 		print 'var series = [';
 		$flightover_data = '';
-		foreach($flightover_array as $flightover_item) {
+		foreach ($flightover_array as $flightover_item) {
 			$flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
 		}
 		$flightover_data = substr($flightover_data, 0, -1);
@@ -568,14 +568,14 @@ 
         <div class="row column">
             <div class="col-md-6">
 <?php
-	$airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month);
+	$airport_airport_array = $Stats->countAllDepartureAirports(true, $airline_icao, $filter_name, $year, $month);
 	if (count($airport_airport_array) > 0) {
 		print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>';
 		print '<div id="chart3" class="chart" width="100%"></div><script>';
 		print "\n";
 		print 'var series = [';
 		$airport_data = '';
-		foreach($airport_airport_array as $airport_item) {
+		foreach ($airport_airport_array as $airport_item) {
 			$airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],';
 		}
 		$airport_data = substr($airport_data, 0, -1);
@@ -625,18 +625,18 @@ 
 	}
 ?>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
 <?php
-	$airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month);
+	$airport_airport_array2 = $Stats->countAllArrivalAirports(true, $airline_icao, $filter_name, $year, $month);
 	if (count($airport_airport_array2) > 0) {
 		print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>';
 		print '<div id="chart4" class="chart" width="100%"></div><script>';
 		print "\n";
 		print 'var series = [';
 		$airport_data = '';
-		foreach($airport_airport_array2 as $airport_item)
+		foreach ($airport_airport_array2 as $airport_item)
 		{
 			$airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],';
 		}
@@ -688,7 +688,7 @@ 
 ?>
             </div>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php 
 }
 if ($type == 'aircraft') {
@@ -700,18 +700,18 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
 <?php
-		$year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
+		$year_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name);
 		if (count($year_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart8",
 			    data: { x: "x",
@@ -724,22 +724,22 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
-		$month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
+		$month_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name);
 		if (count($month_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$month_data = '';
 			$month_cnt = '';
-			foreach($month_array as $month_item) {
+			foreach ($month_array as $month_item) {
 				$month_data .= '"'.$month_item['date_name'].'",';
 				$month_cnt .= $month_item['date_count'].',';
 			}
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
-			$month_cnt = "['flights',".substr($month_cnt,0,-1)."]";
+			$month_cnt = "['flights',".substr($month_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart9",
 			    data: { x: "x",
@@ -752,23 +752,23 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
 <?php
-		$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
+		$date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name);
 		if (empty($date_array)) print _("No data available");
 		else {
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
 			$date_data = '';
 			$date_cnt = '';
-			foreach($date_array as $date_item) {
+			foreach ($date_array as $date_item) {
 				$date_data .= '"'.$date_item['date_name'].'",';
 				$date_cnt .= $date_item['date_count'].',';
 			}
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
-			$date_cnt = "['flights',".substr($date_cnt,0,-1)."]";
+			$date_cnt = "['flights',".substr($date_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart5",
 			    data: { x: "x",
@@ -781,22 +781,22 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
-		$hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
+		$hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name);
 		if (empty($hour_array)) print _("No data available");
 		else {
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
 			$hour_data = '';
 			$hour_cnt = '';
-			foreach($hour_array as $hour_item) {
+			foreach ($hour_array as $hour_item) {
 				$hour_data .= '"'.$hour_item['hour_name'].':00",';
 				$hour_cnt .= $hour_item['hour_count'].',';
 			}
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
-			$hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]";
+			$hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart6",
 			    data: {
@@ -809,7 +809,7 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 	}
@@ -825,18 +825,18 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
 <?php
-		$year_array = $Marine->countAllMonthsLastYear(true,$airline_icao,$filter_name);
+		$year_array = $Marine->countAllMonthsLastYear(true, $airline_icao, $filter_name);
 		if (count($year_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['vessels',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['vessels',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart8",
 			    data: { x: "x",
@@ -850,22 +850,22 @@ 
                 </div>
             </div>
             
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
-		$month_array = $Marine->countAllDatesLastMonth($airline_icao,$filter_name);
+		$month_array = $Marine->countAllDatesLastMonth($airline_icao, $filter_name);
 		if (count($month_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$month_data = '';
 			$month_cnt = '';
-			foreach($month_array as $month_item) {
+			foreach ($month_array as $month_item) {
 				$month_data .= '"'.$month_item['date_name'].'",';
 				$month_cnt .= $month_item['date_count'].',';
 			}
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
-			$month_cnt = "['vessels',".substr($month_cnt,0,-1)."]";
+			$month_cnt = "['vessels',".substr($month_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart9",
 			    data: { x: "x",
@@ -878,23 +878,23 @@ 
                     <a href="<?php print $globalURL; ?>/marine/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
 <?php
-		$date_array = $Marine->countAllDatesLast7Days($airline_icao,$filter_name);
+		$date_array = $Marine->countAllDatesLast7Days($airline_icao, $filter_name);
 		if (empty($date_array)) print _("No data available");
 		else {
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
 			$date_data = '';
 			$date_cnt = '';
-			foreach($date_array as $date_item) {
+			foreach ($date_array as $date_item) {
 				$date_data .= '"'.$date_item['date_name'].'",';
 				$date_cnt .= $date_item['date_count'].',';
 			}
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
-			$date_cnt = "['vessels',".substr($date_cnt,0,-1)."]";
+			$date_cnt = "['vessels',".substr($date_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart5",
 			    data: { x: "x",
@@ -907,22 +907,22 @@ 
                     <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
-		$hour_array = $Marine->countAllHours('hour',true,$airline_icao,$filter_name);
+		$hour_array = $Marine->countAllHours('hour', true, $airline_icao, $filter_name);
 		if (empty($hour_array)) print _("No data available");
 		else {
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
 			$hour_data = '';
 			$hour_cnt = '';
-			foreach($hour_array as $hour_item) {
+			foreach ($hour_array as $hour_item) {
 				$hour_data .= '"'.$hour_item['hour_name'].':00",';
 				$hour_cnt .= $hour_item['hour_count'].',';
 			}
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
-			$hour_cnt = "['vessels',".substr($hour_cnt,0,-1)."]";
+			$hour_cnt = "['vessels',".substr($hour_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart6",
 			    data: {
@@ -935,7 +935,7 @@ 
                     <a href="<?php print $globalURL; ?>/marine/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 	}
@@ -957,12 +957,12 @@ 
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['trackers',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['trackers',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart8",
 			    data: { x: "x",
@@ -976,7 +976,7 @@ 
                 </div>
             </div>
             
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
@@ -986,12 +986,12 @@ 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$month_data = '';
 			$month_cnt = '';
-			foreach($month_array as $month_item) {
+			foreach ($month_array as $month_item) {
 				$month_data .= '"'.$month_item['date_name'].'",';
 				$month_cnt .= $month_item['date_count'].',';
 			}
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
-			$month_cnt = "['trackers',".substr($month_cnt,0,-1)."]";
+			$month_cnt = "['trackers',".substr($month_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart9",
 			    data: { x: "x",
@@ -1004,7 +1004,7 @@ 
                     <a href="<?php print $globalURL; ?>/tracker/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
@@ -1015,12 +1015,12 @@ 
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
 			$date_data = '';
 			$date_cnt = '';
-			foreach($date_array as $date_item) {
+			foreach ($date_array as $date_item) {
 				$date_data .= '"'.$date_item['date_name'].'",';
 				$date_cnt .= $date_item['date_count'].',';
 			}
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
-			$date_cnt = "['trackers',".substr($date_cnt,0,-1)."]";
+			$date_cnt = "['trackers',".substr($date_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart5",
 			    data: { x: "x",
@@ -1033,22 +1033,22 @@ 
                     <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
-		$hour_array = $Tracker->countAllHours('hour',true);
+		$hour_array = $Tracker->countAllHours('hour', true);
 		if (empty($hour_array)) print _("No data available");
 		else {
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
 			$hour_data = '';
 			$hour_cnt = '';
-			foreach($hour_array as $hour_item) {
+			foreach ($hour_array as $hour_item) {
 				$hour_data .= '"'.$hour_item['hour_name'].':00",';
 				$hour_cnt .= $hour_item['hour_count'].',';
 			}
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
-			$hour_cnt = "['trackers',".substr($hour_cnt,0,-1)."]";
+			$hour_cnt = "['trackers',".substr($hour_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart6",
 			    data: {
@@ -1061,7 +1061,7 @@ 
                     <a href="<?php print $globalURL; ?>/tracker/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 	}
@@ -1083,12 +1083,12 @@ 
 			print '<div id="chart32" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year'].'-01-01",';
 				$year_cnt .= $year_item['count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart32",
 			    data: { x: "x",
@@ -1101,7 +1101,7 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
         <div class="row column">
             <div class="col-md-6">
@@ -1113,12 +1113,12 @@ 
 			print '<div id="chart33" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",';
 				$year_cnt .= $year_item['count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart33",
 			    data: { x: "x",
@@ -1131,7 +1131,7 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <br/>
 <?php
 	}
@@ -1145,19 +1145,19 @@ 
 	//$polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
 	if ($year == '' && $month == '') {
 		if ($type == 'aircraft') {
-			$polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d'));
+			$polar = $Stats->getStatsSource('polar', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'marine') {
-			$polar = $Stats->getStatsSource('polar_marine',date('Y'),date('m'),date('d'));
+			$polar = $Stats->getStatsSource('polar_marine', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'tracker') {
-			$polar = $Stats->getStatsSource('polar_tracker',date('Y'),date('m'),date('d'));
+			$polar = $Stats->getStatsSource('polar_tracker', date('Y'), date('m'), date('d'));
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$polar = $Stats->getStatsSource('polar',$year,$month);
+			$polar = $Stats->getStatsSource('polar', $year, $month);
 		} elseif ($type == 'marine') {
-			$polar = $Stats->getStatsSource('polar_marine',$year,$month);
+			$polar = $Stats->getStatsSource('polar_marine', $year, $month);
 		} elseif ($type == 'tracker') {
-			$polar = $Stats->getStatsSource('polar_tracker',$year,$month);
+			$polar = $Stats->getStatsSource('polar_tracker', $year, $month);
 		}
 	}
 	if (!empty($polar)) {
@@ -1166,7 +1166,7 @@ 
 			unset($polar_data);
 			$Spotter = new Spotter();
 			$data = json_decode($eachpolar['source_data']);
-			foreach($data as $value => $key) {
+			foreach ($data as $value => $key) {
 				$direction = $Spotter->parseDirection(($value*22.5));
 				$distance = $key;
 				$unit = 'km';
@@ -1186,7 +1186,7 @@ 
 ?>
             <div class="col-md-6">
                 <h4><?php print $eachpolar['source_name']; ?></h4>
-        	<div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
+        	<div id="polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
         	<script>
         	    (function() {
         	    var margin = {top: 100, right: 100, bottom: 100, left: 100},
@@ -1210,7 +1210,7 @@ 
 		      color: color,
 		      unit: '<?php echo $unit; ?>'
 		    };
-		    RadarChart("#polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions);
+		    RadarChart("#polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions);
 		    })();
 		</script>
             </div>
@@ -1225,19 +1225,19 @@ 
 	//$msg = $Stats->getStatsSource(date('Y-m-d'),'msg');
 	if ($year == '' && $month == '') {
 		if ($type == 'aircraft') {
-			$msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d'));
+			$msg = $Stats->getStatsSource('msg', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'marine') {
-			$msg = $Stats->getStatsSource('msg_marine',date('Y'),date('m'),date('d'));
+			$msg = $Stats->getStatsSource('msg_marine', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'tracker') {
-			$msg = $Stats->getStatsSource('msg_tracker',date('Y'),date('m'),date('d'));
+			$msg = $Stats->getStatsSource('msg_tracker', date('Y'), date('m'), date('d'));
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$msg = $Stats->getStatsSource('msg',$year,$month);
+			$msg = $Stats->getStatsSource('msg', $year, $month);
 		} elseif ($type == 'marine') {
-			$msg = $Stats->getStatsSource('msg_marine',$year,$month);
+			$msg = $Stats->getStatsSource('msg_marine', $year, $month);
 		} elseif ($type == 'tracker') {
-			$msg = $Stats->getStatsSource('msg_tracker',$year,$month);
+			$msg = $Stats->getStatsSource('msg_tracker', $year, $month);
 		}
 	}
 	if (!empty($msg)) {
@@ -1245,13 +1245,13 @@ 
 		foreach ($msg as $eachmsg) {
 			//$eachmsg = $msg[0];
 			$data = $eachmsg['source_data'];
-			if ($data > 500) $max = (round(($data+100)/100))*100;
+			if ($data > 500) $max = (round(($data + 100)/100))*100;
 			else $max = 500;
 ?>
-        	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
+        	<div id="msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
         	<script>
 		      var g = new JustGage({
-			    id: "msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>",
+			    id: "msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>",
 			    value: <?php echo $data; ?>,
 			    min: 0,
 			    max: <?php print $max; ?>,
@@ -1273,19 +1273,19 @@ 
 	//$hist = $Stats->getStatsSource(date('Y-m-d'),'hist');
 	if ($year == '' && $month == '') {
 		if ($type == 'aircraft') {
-			$hist = $Stats->getStatsSource('hist',date('Y'),date('m'),date('d'));
+			$hist = $Stats->getStatsSource('hist', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'marine') {
-			$hist = $Stats->getStatsSource('hist_marine',date('Y'),date('m'),date('d'));
+			$hist = $Stats->getStatsSource('hist_marine', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'tracker') {
-			$hist = $Stats->getStatsSource('hist_tracker',date('Y'),date('m'),date('d'));
+			$hist = $Stats->getStatsSource('hist_tracker', date('Y'), date('m'), date('d'));
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$hist = $Stats->getStatsSource('hist',$year,$month);
+			$hist = $Stats->getStatsSource('hist', $year, $month);
 		} elseif ($type == 'marine') {
-			$hist = $Stats->getStatsSource('hist_marine',$year,$month);
+			$hist = $Stats->getStatsSource('hist_marine', $year, $month);
 		} elseif ($type == 'tracker') {
-			$hist = $Stats->getStatsSource('hist_tracker',$year,$month);
+			$hist = $Stats->getStatsSource('hist_tracker', $year, $month);
 		}
 	}
 	foreach ($hist as $hists) {
@@ -1295,7 +1295,7 @@ 
 		$source = $hists['source_name'];
 		$hist_array = json_decode($hists['source_data']);
 		$unit = 'km';
-		foreach($hist_array as $distance => $nb) {
+		foreach ($hist_array as $distance => $nb) {
 			if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
 				$distance = round($distance*0.539957);
 				$unit = 'nm';
@@ -1315,18 +1315,18 @@ 
 		$nb_data = "['flights',".substr($nb_data, 0, -1)."]";
 ?>
             <div class="col-md-6">
-                <h2><?php echo sprintf(_("Distance for %s"),$source); ?></h2>
+                <h2><?php echo sprintf(_("Distance for %s"), $source); ?></h2>
 <?php
-		print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>';
+		print '<div id="charthist-'.str_replace(' ', '_', strtolower($source)).'" class="chart" width="100%"></div><script>';
 		print 'c3.generate({
-		    bindto: "#charthist-'.str_replace(' ','_',strtolower($source)).'",
+		    bindto: "#charthist-'.str_replace(' ', '_', strtolower($source)).'",
 		    data: { x: "x",
 		    columns: ['.$distance_data.','.$nb_data.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
 		    axis: { x: {label : { text: "Distance in '.$unit.'", position: "outer-right"}}, y: { label: "# of Flights"}},legend: { show: false }});';
 		print '</script>';
 ?>
     	    </div>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 ?>

Braces +142 added lines, -67 removed lines

@@ -18,11 +18,15 @@ 
 	require_once('require/class.Spotter.php');
 }
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($type == 'aircraft' && $airline_icao == '' && isset($globalFilter)) {
-	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+	if (isset($globalFilter['airline'])) {
+		$airline_icao = $globalFilter['airline'][0];
+	}
+	}
 if ($type == 'aircraft' && $airline_icao != '' && $airline_icao != 'all') {
 	$Spotter = new Spotter();
 	$airline_info = $Spotter->getAllAirlineInfo($airline_icao);
@@ -61,7 +65,12 @@ 
 <script type="text/javascript" src="<?php echo $globalURL; ?>/js/datamaps.world.min.js"></script>
 <div class="column">
     <div class="info">
-            <h1><?php if (isset($airline_name)) echo _("Statistics for ").$airline_name; else echo _("Statistics"); ?></h1>
+            <h1><?php if (isset($airline_name)) {
+	echo _("Statistics for ").$airline_name;
+} else {
+	echo _("Statistics");
+}
+?></h1>
 <?php 
 if ($type == 'aircraft') {
 	$last_update = $Stats->getLastStatsUpdate();
@@ -69,7 +78,9 @@ 
 	if (isset($last_update[0]['value'])) {
 		date_default_timezone_set('UTC');
 		$lastupdate = strtotime($last_update[0]['value']);
-		if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
+		if (isset($globalTimezone) && $globalTimezone != '') {
+			date_default_timezone_set($globalTimezone);
+		}
 		print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
 	}
 }
@@ -154,8 +165,11 @@ 
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
 		$aircraft_data = '';
 		foreach($aircraft_array as $aircraft_item) {
-			if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
-			else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
+			if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') {
+				$aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
+			} else {
+				$aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
+			}
 		}
 		$aircraft_data = substr($aircraft_data, 0, -1);
 		print 'var series = ['.$aircraft_data.'];';
@@ -172,11 +186,17 @@ 
 <?php
 	if ($year != '' && $month != '') {
 ?>
-            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
+            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
 <?php
 	} else {
 ?>
-            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
+            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
 <?php
 	}
 ?>
@@ -205,11 +225,15 @@ 
 			print '</script>';
 			if ($year != '' && $month != '') {
 				print '<div class="more"><a href="'.$globalURL.'/statistics/airline';
-				if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
+				if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+					echo '/'.$airline_icao;
+				}
 				print '/'.$year.'/'.$month.'/" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
 			} else {
 				print '<div class="more"><a href="'.$globalURL.'/statistics/airline';
-				if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
+				if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+					echo '/'.$airline_icao;
+				}
 				print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
 			}
 			print '</div>';
@@ -229,8 +253,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Vessel Type"); ?></h2>
 <?php
 	$marine_array = $Marine->countAllMarineTypes(true,0,'',array(),$year,$month);
-	if (count($marine_array) == 0) print _("No data available");
-	else {
+	if (count($marine_array) == 0) {
+		print _("No data available");
+	} else {
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
 		$marine_data = '';
 		foreach($marine_array as $marine_item) {
@@ -274,8 +299,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Tracker Type"); ?></h2>
 <?php
 	$tracker_array = $Tracker->countAllTrackerTypes(true,0,'',array(),$year,$month);
-	if (count($tracker_array) == 0) print _("No data available");
-	else {
+	if (count($tracker_array) == 0) {
+		print _("No data available");
+	} else {
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
 		$tracker_data = '';
 		foreach($tracker_array as $tracker_item) {
@@ -328,8 +354,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
 <?php
 		$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month);
-		if (count($pilot_array) == 0) print _("No data available");
-		else {
+		if (count($pilot_array) == 0) {
+			print _("No data available");
+		} else {
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
 			$pilot_data = '';
 			foreach($pilot_array as $pilot_item) {
@@ -347,7 +374,9 @@ 
 		}
 		print '<div class="more">';
 		print '<a href="'.$globalURL.'/statistics/pilot'; 
-		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
+		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+			echo '/'.$airline_icao;
+		}
 		print'" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a>';
 		print '</div>';
 ?>
@@ -363,8 +392,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
 <?php
 		$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month);
-		if (count($owner_array) == 0) print _("No data available");
-		else {
+		if (count($owner_array) == 0) {
+			print _("No data available");
+		} else {
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
 			$owner_data = '';
 			foreach($owner_array as $owner_item) {
@@ -382,7 +412,10 @@ 
 		}
 ?>
                 <div class="more">
-                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
+                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
         
@@ -395,8 +428,9 @@ 
                 <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2>
 <?php
 	 //$flightover_array = $Stats->countAllFlightOverCountries();
-		if (count($flightover_array) == 0) print _("No data available");
-		else {
+		if (count($flightover_array) == 0) {
+			print _("No data available");
+		} else {
 			print '<div id="chart10" class="chart" width="100%"></div><script>';
 			print 'var series = [';
 			$flightover_data = '';
@@ -438,7 +472,10 @@ 
 		}
 ?>
                 <div class="more">
-                    <a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
+                    <a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
 <?php
@@ -456,8 +493,9 @@ 
 	<div class="col-md-6">
             <h2><?php echo _("Top 20 Most Common Country a Vessel was inside"); ?></h2>
 <?php
-	if (count($flightover_array) == 0) print _("No data available");
-	else {
+	if (count($flightover_array) == 0) {
+		print _("No data available");
+	} else {
 		print '<div id="chart10" class="chart" width="100%"></div><script>';
 		print 'var series = [';
 		$flightover_data = '';
@@ -513,8 +551,9 @@ 
 	<div class="col-md-6">
             <h2><?php echo _("Top 20 Most Common Country a Tracker was inside"); ?></h2>
 <?php
-	if (count($flightover_array) == 0) print _("No data available");
-	else {
+	if (count($flightover_array) == 0) {
+		print _("No data available");
+	} else {
 		print '<div id="chart10" class="chart" width="100%"></div><script>';
 		print 'var series = [';
 		$flightover_data = '';
@@ -620,7 +659,9 @@ 
 		});";
 		print '</script>';
 		print '<div class="more"><a href="'.$globalURL.'/statistics/airport-departure'; 
-		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
+		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+			echo '/'.$airline_icao;
+		}
 		print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
 	}
 ?>
@@ -682,7 +723,9 @@ 
 		});";
 		print '</script>';
 		print '<div class="more"><a href="'.$globalURL.'/statistics/airport-arrival';
-		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
+		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+			echo '/'.$airline_icao;
+		}
 		print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
 	}
 ?>
@@ -701,8 +744,9 @@ 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
 <?php
 		$year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
-		if (count($year_array) == 0) print _("No data available");
-		else {
+		if (count($year_array) == 0) {
+			print _("No data available");
+		} else {
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
@@ -721,7 +765,10 @@ 
 		}
 ?>
                 <div class="more">
-                    <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
+                    <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -729,8 +776,9 @@ 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
 		$month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
-		if (count($month_array) == 0) print _("No data available");
-		else {
+		if (count($month_array) == 0) {
+			print _("No data available");
+		} else {
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$month_data = '';
 			$month_cnt = '';
@@ -749,7 +797,10 @@ 
 		}
 ?>
                 <div class="more">
-                    <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
+                    <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -758,8 +809,9 @@ 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
 <?php
 		$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
-		if (empty($date_array)) print _("No data available");
-		else {
+		if (empty($date_array)) {
+			print _("No data available");
+		} else {
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
 			$date_data = '';
 			$date_cnt = '';
@@ -778,7 +830,10 @@ 
 		}
 ?>
                 <div class="more">
-                    <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
+                    <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -786,8 +841,9 @@ 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
 		$hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
-		if (empty($hour_array)) print _("No data available");
-		else {
+		if (empty($hour_array)) {
+			print _("No data available");
+		} else {
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
 			$hour_data = '';
 			$hour_cnt = '';
@@ -806,7 +862,10 @@ 
 		}
 ?>
                 <div class="more">
-                    <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
+                    <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -826,8 +885,9 @@ 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
 <?php
 		$year_array = $Marine->countAllMonthsLastYear(true,$airline_icao,$filter_name);
-		if (count($year_array) == 0) print _("No data available");
-		else {
+		if (count($year_array) == 0) {
+			print _("No data available");
+		} else {
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
@@ -855,8 +915,9 @@ 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
 		$month_array = $Marine->countAllDatesLastMonth($airline_icao,$filter_name);
-		if (count($month_array) == 0) print _("No data available");
-		else {
+		if (count($month_array) == 0) {
+			print _("No data available");
+		} else {
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$month_data = '';
 			$month_cnt = '';
@@ -884,8 +945,9 @@ 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
 <?php
 		$date_array = $Marine->countAllDatesLast7Days($airline_icao,$filter_name);
-		if (empty($date_array)) print _("No data available");
-		else {
+		if (empty($date_array)) {
+			print _("No data available");
+		} else {
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
 			$date_data = '';
 			$date_cnt = '';
@@ -912,8 +974,9 @@ 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
 		$hour_array = $Marine->countAllHours('hour',true,$airline_icao,$filter_name);
-		if (empty($hour_array)) print _("No data available");
-		else {
+		if (empty($hour_array)) {
+			print _("No data available");
+		} else {
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
 			$hour_data = '';
 			$hour_cnt = '';
@@ -952,8 +1015,9 @@ 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
 <?php
 		$year_array = $Tracker->countAllMonthsLastYear(true);
-		if (count($year_array) == 0) print _("No data available");
-		else {
+		if (count($year_array) == 0) {
+			print _("No data available");
+		} else {
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
@@ -981,8 +1045,9 @@ 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
 		$month_array = $Tracker->countAllDatesLastMonth();
-		if (count($month_array) == 0) print _("No data available");
-		else {
+		if (count($month_array) == 0) {
+			print _("No data available");
+		} else {
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$month_data = '';
 			$month_cnt = '';
@@ -1010,8 +1075,9 @@ 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
 <?php
 		$date_array = $Tracker->countAllDatesLast7Days();
-		if (empty($date_array)) print _("No data available");
-		else {
+		if (empty($date_array)) {
+			print _("No data available");
+		} else {
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
 			$date_data = '';
 			$date_cnt = '';
@@ -1038,8 +1104,9 @@ 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
 		$hour_array = $Tracker->countAllHours('hour',true);
-		if (empty($hour_array)) print _("No data available");
-		else {
+		if (empty($hour_array)) {
+			print _("No data available");
+		} else {
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
 			$hour_data = '';
 			$hour_cnt = '';
@@ -1078,8 +1145,9 @@ 
                 <h2><?php echo _("Fatalities by Years"); ?></h2>
 <?php
 		$year_array = $Stats->countFatalitiesByYear();
-		if (count($year_array) == 0) print _("No data available");
-		else {
+		if (count($year_array) == 0) {
+			print _("No data available");
+		} else {
 			print '<div id="chart32" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
@@ -1108,8 +1176,9 @@ 
                 <h2><?php echo _("Fatalities last 12 Months"); ?></h2>
 <?php
 		$year_array = $Stats->countFatalitiesLast12Months();
-		if (count($year_array) == 0) print _("No data available");
-		else {
+		if (count($year_array) == 0) {
+			print _("No data available");
+		} else {
 			print '<div id="chart33" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
@@ -1180,8 +1249,11 @@ 
 					$distance = $distance;
 					$unit = 'km';
 				}
-				if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
-				else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+				if (!isset($polar_data)) {
+					$polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+				} else {
+					$polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+				}
 			}
 ?>
             <div class="col-md-6">
@@ -1245,9 +1317,12 @@ 
 		foreach ($msg as $eachmsg) {
 			//$eachmsg = $msg[0];
 			$data = $eachmsg['source_data'];
-			if ($data > 500) $max = (round(($data+100)/100))*100;
-			else $max = 500;
-?>
+			if ($data > 500) {
+				$max = (round(($data+100)/100))*100;
+			} else {
+				$max = 500;
+			}
+			?>
         	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
         	<script>
 		      var g = new JustGage({