View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( d3bd74...23eace )
by Yannick
06:28
created
Status
Category
Toggle Patches
statistics-owner.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -8,7 +8,7 @@
 
 block discarded – undo
8 8 
 if (!isset($filter_name)) $filter_name = '';
9 9 
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
10 10 
 if ($airline_icao == '' && isset($globalFilter)) {
11 
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
11 
+	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
12 12 
 }
13 13 
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
14 14 
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
Please login to merge, or discard this patch.
require/class.Stats.php 1 patch
Indentation   +820 added lines, -820 removed lines patch added patch discarded remove patch 
@@ -16,33 +16,33 @@  discard block
 
 block discarded – undo
16 16 
 		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
17 17 
 		$Connection = new Connection($dbc);
18 18 
 		$this->db = $Connection->db();
19 
-        }
19 
+		}
20 20
21 21 
 	public function addLastStatsUpdate($type,$stats_date) {
22 
-                $query = "DELETE FROM config WHERE name = :type;
22 
+				$query = "DELETE FROM config WHERE name = :type;
23 23 
             		INSERT INTO config (name,value) VALUES (:type,:stats_date);";
24 
-                $query_values = array('type' => $type,':stats_date' => $stats_date);
25 
-                 try {
26 
-                        $sth = $this->db->prepare($query);
27 
-                        $sth->execute($query_values);
28 
-                } catch(PDOException $e) {
29 
-                        return "error : ".$e->getMessage();
30 
-                }
31 
-        }
24 
+				$query_values = array('type' => $type,':stats_date' => $stats_date);
25 
+				 try {
26 
+						$sth = $this->db->prepare($query);
27 
+						$sth->execute($query_values);
28 
+				} catch(PDOException $e) {
29 
+						return "error : ".$e->getMessage();
30 
+				}
31 
+		}
32 32
33 33 
 	public function getLastStatsUpdate($type = 'last_update_stats') {
34 
-                $query = "SELECT value FROM config WHERE name = :type";
35 
-                 try {
36 
-                        $sth = $this->db->prepare($query);
37 
-                        $sth->execute(array(':type' => $type));
38 
-                } catch(PDOException $e) {
39 
-                        echo "error : ".$e->getMessage();
40 
-                }
41 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
42 
-                return $all;
43 
-        }
44 
-        public function deleteStats($filter_name = '') {
45 
-        	/*
34 
+				$query = "SELECT value FROM config WHERE name = :type";
35 
+				 try {
36 
+						$sth = $this->db->prepare($query);
37 
+						$sth->execute(array(':type' => $type));
38 
+				} catch(PDOException $e) {
39 
+						echo "error : ".$e->getMessage();
40 
+				}
41 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
42 
+				return $all;
43 
+		}
44 
+		public function deleteStats($filter_name = '') {
45 
+			/*
46 46 
         	$query = "DELETE FROM config WHERE name = 'last_update_stats'";
47 47 
                  try {
48 48 
                         $sth = $this->db->prepare($query);
 
@@ -51,109 +51,109 @@  discard block
 
 block discarded – undo
51 51 
                         return "error : ".$e->getMessage();
52 52 
                 }
53 53 
                 */
54 
-        	$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;";
55 
-                 try {
56 
-                        $sth = $this->db->prepare($query);
57 
-                        $sth->execute(array(':filter_name' => $filter_name));
58 
-                } catch(PDOException $e) {
59 
-                        return "error : ".$e->getMessage();
60 
-                }
61 
-        }
62 
-        public function deleteOldStats($filter_name = '') {
63 
-        	if ($filter_name == '') {
64 
-        		$query = "DELETE FROM config WHERE name = 'last_update_stats'";
65 
-        	} else {
66 
-        		$query = "DELETE FROM config WHERE name = 'last_update_stats_".$filter_name."'";
67 
-        	}
68 
-                 try {
69 
-                        $sth = $this->db->prepare($query);
70 
-                        $sth->execute();
71 
-                } catch(PDOException $e) {
72 
-                        return "error : ".$e->getMessage();
73 
-                }
54 
+			$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;";
55 
+				 try {
56 
+						$sth = $this->db->prepare($query);
57 
+						$sth->execute(array(':filter_name' => $filter_name));
58 
+				} catch(PDOException $e) {
59 
+						return "error : ".$e->getMessage();
60 
+				}
61 
+		}
62 
+		public function deleteOldStats($filter_name = '') {
63 
+			if ($filter_name == '') {
64 
+				$query = "DELETE FROM config WHERE name = 'last_update_stats'";
65 
+			} else {
66 
+				$query = "DELETE FROM config WHERE name = 'last_update_stats_".$filter_name."'";
67 
+			}
68 
+				 try {
69 
+						$sth = $this->db->prepare($query);
70 
+						$sth->execute();
71 
+				} catch(PDOException $e) {
72 
+						return "error : ".$e->getMessage();
73 
+				}
74 74
75 
-        	$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;";
76 
-                 try {
77 
-                        $sth = $this->db->prepare($query);
78 
-                        $sth->execute(array(':filter_name' => $filter_name));
79 
-                } catch(PDOException $e) {
80 
-                        return "error : ".$e->getMessage();
81 
-                }
82 
-        }
75 
+			$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;";
76 
+				 try {
77 
+						$sth = $this->db->prepare($query);
78 
+						$sth->execute(array(':filter_name' => $filter_name));
79 
+				} catch(PDOException $e) {
80 
+						return "error : ".$e->getMessage();
81 
+				}
82 
+		}
83 83 
 	public function getAllAirlineNames($filter_name = '') {
84 84 
 		if ($filter_name == '') $filter_name = $this->filter_name;
85 
-                $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
86 
-                 try {
87 
-                        $sth = $this->db->prepare($query);
88 
-                        $sth->execute(array(':filter_name' => $filter_name));
89 
-                } catch(PDOException $e) {
90 
-                        echo "error : ".$e->getMessage();
91 
-                }
92 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
93 
-                return $all;
94 
-        }
85 
+				$query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
86 
+				 try {
87 
+						$sth = $this->db->prepare($query);
88 
+						$sth->execute(array(':filter_name' => $filter_name));
89 
+				} catch(PDOException $e) {
90 
+						echo "error : ".$e->getMessage();
91 
+				}
92 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
93 
+				return $all;
94 
+		}
95 95 
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
96 96 
 		if ($filter_name == '') $filter_name = $this->filter_name;
97 
-                $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
98 
-                 try {
99 
-                        $sth = $this->db->prepare($query);
100 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
101 
-                } catch(PDOException $e) {
102 
-                        echo "error : ".$e->getMessage();
103 
-                }
104 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
105 
-                return $all;
106 
-        }
97 
+				$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
98 
+				 try {
99 
+						$sth = $this->db->prepare($query);
100 
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
101 
+				} catch(PDOException $e) {
102 
+						echo "error : ".$e->getMessage();
103 
+				}
104 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
105 
+				return $all;
106 
+		}
107 107 
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
108 108 
 		if ($filter_name == '') $filter_name = $this->filter_name;
109 
-                $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";
110 
-                 try {
111 
-                        $sth = $this->db->prepare($query);
112 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
113 
-                } catch(PDOException $e) {
114 
-                        echo "error : ".$e->getMessage();
115 
-                }
116 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
117 
-                return $all;
118 
-        }
109 
+				$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";
110 
+				 try {
111 
+						$sth = $this->db->prepare($query);
112 
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
113 
+				} catch(PDOException $e) {
114 
+						echo "error : ".$e->getMessage();
115 
+				}
116 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
117 
+				return $all;
118 
+		}
119 119 
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
120 120 
 		if ($filter_name == '') $filter_name = $this->filter_name;
121 
-                $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";
122 
-                 try {
123 
-                        $sth = $this->db->prepare($query);
124 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
125 
-                } catch(PDOException $e) {
126 
-                        echo "error : ".$e->getMessage();
127 
-                }
128 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
129 
-                return $all;
130 
-        }
121 
+				$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";
122 
+				 try {
123 
+						$sth = $this->db->prepare($query);
124 
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
125 
+				} catch(PDOException $e) {
126 
+						echo "error : ".$e->getMessage();
127 
+				}
128 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
129 
+				return $all;
130 
+		}
131 131
132 132 
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
133 133 
 		if ($filter_name == '') $filter_name = $this->filter_name;
134 
-                $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
135 
-                 try {
136 
-                        $sth = $this->db->prepare($query);
137 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
138 
-                } catch(PDOException $e) {
139 
-                        echo "error : ".$e->getMessage();
140 
-                }
141 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
142 
-                return $all;
143 
-        }
134 
+				$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
135 
+				 try {
136 
+						$sth = $this->db->prepare($query);
137 
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
138 
+				} catch(PDOException $e) {
139 
+						echo "error : ".$e->getMessage();
140 
+				}
141 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
142 
+				return $all;
143 
+		}
144 144
145 145 
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
146 146 
 		if ($filter_name == '') $filter_name = $this->filter_name;
147 
-                $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
148 
-                 try {
149 
-                        $sth = $this->db->prepare($query);
150 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
151 
-                } catch(PDOException $e) {
152 
-                        echo "error : ".$e->getMessage();
153 
-                }
154 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
155 
-                return $all;
156 
-        }
147 
+				$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
148 
+				 try {
149 
+						$sth = $this->db->prepare($query);
150 
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
151 
+				} catch(PDOException $e) {
152 
+						echo "error : ".$e->getMessage();
153 
+				}
154 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
155 
+				return $all;
156 
+		}
157 157
158 158
159 159 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
 
@@ -170,16 +170,16 @@  discard block
 
 block discarded – undo
170 170 
 			}
171 171 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
172 172 
 		} else $all = array();
173 
-                if (empty($all)) {
174 
-            	    $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
175 
-            	    if ($filter_name != '') {
176 
-            		    $filters = array_merge($filters,$globalStatsFilters[$filter_name]);
177 
-            	    }
178 
-            	    $Spotter = new Spotter($this->db);
179 
-            	    //$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
180 
-            	    $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
181 
-                }
182 
-                return $all;
173 
+				if (empty($all)) {
174 
+					$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
175 
+					if ($filter_name != '') {
176 
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
177 
+					}
178 
+					$Spotter = new Spotter($this->db);
179 
+					//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
180 
+					$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
181 
+				}
182 
+				return $all;
183 183 
 	}
184 184 
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
185 185 
 		global $globalStatsFilters;
 
@@ -195,17 +195,17 @@  discard block
 
 block discarded – undo
195 195 
 			}
196 196 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
197 197 
 		} else $all = array();
198 
-                if (empty($all)) {
199 
-            		$Spotter = new Spotter($this->db);
200 
-            		$filters = array();
201 
-            		$filters = array('year' => $year,'month' => $month);
202 
-            		if ($filter_name != '') {
203 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
204 
-			}
205 
-            		//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
206 
-            		$all = $Spotter->countAllAirlineCountries($limit,$filters);
207 
-                }
208 
-                return $all;
198 
+				if (empty($all)) {
199 
+					$Spotter = new Spotter($this->db);
200 
+					$filters = array();
201 
+					$filters = array('year' => $year,'month' => $month);
202 
+					if ($filter_name != '') {
203 
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
204 
+			}
205 
+					//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
206 
+					$all = $Spotter->countAllAirlineCountries($limit,$filters);
207 
+				}
208 
+				return $all;
209 209 
 	}
210 210 
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
211 211 
 		global $globalStatsFilters;
 
@@ -247,39 +247,39 @@  discard block
 
 block discarded – undo
247 247 
 			}
248 248 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
249 249 
 		} else $all = array();
250 
-                if (empty($all)) {
250 
+				if (empty($all)) {
251 251 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
252 252 
 			if ($filter_name != '') {
253 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
253 
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
254 254 
 			}
255 255 
 			$Spotter = new Spotter($this->db);
256 256 
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
257 257 
 			$all = $Spotter->countAllArrivalCountries($limit,$filters);
258 
-                }
259 
-                return $all;
258 
+				}
259 
+				return $all;
260 260 
 	}
261 261 
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
262 262 
 		global $globalStatsFilters;
263 263 
 		if ($filter_name == '') $filter_name = $this->filter_name;
264 264 
 		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";
265 265 
 		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";
266 
-                 try {
267 
-                        $sth = $this->db->prepare($query);
268 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
269 
-                } catch(PDOException $e) {
270 
-                        echo "error : ".$e->getMessage();
271 
-                }
272 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
273 
-                if (empty($all)) {
266 
+				 try {
267 
+						$sth = $this->db->prepare($query);
268 
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
269 
+				} catch(PDOException $e) {
270 
+						echo "error : ".$e->getMessage();
271 
+				}
272 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
273 
+				if (empty($all)) {
274 274 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
275 275 
 			if ($filter_name != '') {
276 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
276 
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
277 277 
 			}
278 278 
 			$Spotter = new Spotter($this->db);
279 279 
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
280 280 
 			$all = $Spotter->countAllDepartureCountries($filters);
281 
-                }
282 
-                return $all;
281 
+				}
282 
+				return $all;
283 283 
 	}
284 284
285 285 
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
 
@@ -305,17 +305,17 @@  discard block
 
 block discarded – undo
305 305 
 			}
306 306 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
307 307 
 		} else $all = array();
308 
-                if (empty($all)) {
309 
-	                $Spotter = new Spotter($this->db);
310 
-            		$filters = array();
308 
+				if (empty($all)) {
309 
+					$Spotter = new Spotter($this->db);
310 
+					$filters = array();
311 311 
 			$filters = array('year' => $year,'month' => $month);
312 
-            		if ($filter_name != '') {
313 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
312 
+					if ($filter_name != '') {
313 
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
314 314 
 			}
315 315 
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
316 
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
317 
-                }
318 
-                return $all;
316 
+					$all = $Spotter->countAllAirlines($limit,0,'',$filters);
317 
+				}
318 
+				return $all;
319 319 
 	}
320 320 
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
321 321 
 		global $globalStatsFilters;
 
@@ -331,16 +331,16 @@  discard block
 
 block discarded – undo
331 331 
 			}
332 332 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
333 333 
 		} else $all = array();
334 
-                if (empty($all)) {
334 
+				if (empty($all)) {
335 335 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
336 336 
 			if ($filter_name != '') {
337 337 
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
338 338 
 			}
339 
-	                $Spotter = new Spotter($this->db);
340 
-    		        //$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
341 
-    		        $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
342 
-                }
343 
-                return $all;
339 
+					$Spotter = new Spotter($this->db);
340 
+					//$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
341 
+					$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
342 
+				}
343 
+				return $all;
344 344 
 	}
345 345 
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
346 346 
 		global $globalStatsFilters;
 
@@ -381,7 +381,7 @@  discard block
 
 block discarded – undo
381 381 
 					echo "error : ".$e->getMessage();
382 382 
 				}
383 383 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
384 
-                /*
384 
+				/*
385 385 
                 if (empty($all)) {
386 386 
 	                $Spotter = new Spotter($this->db);
387 387 
     		        $all = $Spotter->countAllFlightOverCountries($limit);
 
@@ -433,16 +433,16 @@  discard block
 
 block discarded – undo
433 433 
 			}
434 434 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
435 435 
 		} else $all = array();
436 
-                if (empty($all)) {
436 
+				if (empty($all)) {
437 437 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
438 438 
 			if ($filter_name != '') {
439 439 
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
440 440 
 			}
441 
-            		$Spotter = new Spotter($this->db);
442 
-            		//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
443 
-            		$all = $Spotter->countAllOwners($limit,0,'',$filters);
444 
-                }
445 
-                return $all;
441 
+					$Spotter = new Spotter($this->db);
442 
+					//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
443 
+					$all = $Spotter->countAllOwners($limit,0,'',$filters);
444 
+				}
445 
+				return $all;
446 446 
 	}
447 447 
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
448 448 
 		global $globalStatsFilters;
 
@@ -458,35 +458,35 @@  discard block
 
 block discarded – undo
458 458 
 			}
459 459 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
460 460 
 		} else $all = array();
461 
-                if (empty($all)) {
461 
+				if (empty($all)) {
462 462 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
463 
-            		if ($filter_name != '') {
464 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
463 
+					if ($filter_name != '') {
464 
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
465 465 
 			}
466 
-            		$Spotter = new Spotter($this->db);
466 
+					$Spotter = new Spotter($this->db);
467 467 
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
468 468 
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
469 
-            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
470 
-        		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
471 
-        		$all = array();
472 
-        		foreach ($pall as $value) {
473 
-        			$icao = $value['airport_departure_icao'];
474 
-        			$all[$icao] = $value;
475 
-        		}
469 
+					$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
470 
+				$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
471 
+				$all = array();
472 
+				foreach ($pall as $value) {
473 
+					$icao = $value['airport_departure_icao'];
474 
+					$all[$icao] = $value;
475 
+				}
476 476
477 
-        		foreach ($dall as $value) {
478 
-        			$icao = $value['airport_departure_icao'];
479 
-        			if (isset($all[$icao])) {
480 
-        				$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
481 
-        			} else $all[$icao] = $value;
482 
-        		}
483 
-        		$count = array();
484 
-        		foreach ($all as $key => $row) {
485 
-        			$count[$key] = $row['airport_departure_icao_count'];
486 
-        		}
487 
-        		array_multisort($count,SORT_DESC,$all);
488 
-                }
489 
-                return $all;
477 
+				foreach ($dall as $value) {
478 
+					$icao = $value['airport_departure_icao'];
479 
+					if (isset($all[$icao])) {
480 
+						$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
481 
+					} else $all[$icao] = $value;
482 
+				}
483 
+				$count = array();
484 
+				foreach ($all as $key => $row) {
485 
+					$count[$key] = $row['airport_departure_icao_count'];
486 
+				}
487 
+				array_multisort($count,SORT_DESC,$all);
488 
+				}
489 
+				return $all;
490 490 
 	}
491 491 
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
492 492 
 		global $globalStatsFilters;
 
@@ -512,26 +512,26 @@  discard block
 
 block discarded – undo
512 512 
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
513 513 
 			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
514 514 
 			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
515 
-        		$all = array();
516 
-        		foreach ($pall as $value) {
517 
-        			$icao = $value['airport_arrival_icao'];
518 
-        			$all[$icao] = $value;
519 
-        		}
515 
+				$all = array();
516 
+				foreach ($pall as $value) {
517 
+					$icao = $value['airport_arrival_icao'];
518 
+					$all[$icao] = $value;
519 
+				}
520 520
521 
-        		foreach ($dall as $value) {
522 
-        			$icao = $value['airport_arrival_icao'];
523 
-        			if (isset($all[$icao])) {
524 
-        				$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
525 
-        			} else $all[$icao] = $value;
526 
-        		}
527 
-        		$count = array();
528 
-        		foreach ($all as $key => $row) {
529 
-        			$count[$key] = $row['airport_arrival_icao_count'];
530 
-        		}
531 
-        		array_multisort($count,SORT_DESC,$all);
532 
-                }
521 
+				foreach ($dall as $value) {
522 
+					$icao = $value['airport_arrival_icao'];
523 
+					if (isset($all[$icao])) {
524 
+						$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
525 
+					} else $all[$icao] = $value;
526 
+				}
527 
+				$count = array();
528 
+				foreach ($all as $key => $row) {
529 
+					$count[$key] = $row['airport_arrival_icao_count'];
530 
+				}
531 
+				array_multisort($count,SORT_DESC,$all);
532 
+				}
533 533
534 
-                return $all;
534 
+				return $all;
535 535 
 	}
536 536 
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
537 537 
 		global $globalDBdriver, $globalStatsFilters;
 
@@ -544,23 +544,23 @@  discard block
 
 block discarded – undo
544 544 
 			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";
545 545 
 		}
546 546 
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
547 
-                 try {
548 
-                        $sth = $this->db->prepare($query);
549 
-                        $sth->execute($query_data);
550 
-                } catch(PDOException $e) {
551 
-                        echo "error : ".$e->getMessage();
552 
-                }
553 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
554 
-                if (empty($all)) {
547 
+				 try {
548 
+						$sth = $this->db->prepare($query);
549 
+						$sth->execute($query_data);
550 
+				} catch(PDOException $e) {
551 
+						echo "error : ".$e->getMessage();
552 
+				}
553 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
554 
+				if (empty($all)) {
555 555 
 			$filters = array('airlines' => array($stats_airline));
556 556 
 			if ($filter_name != '') {
557 557 
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
558 558 
 			}
559 
-            		$Spotter = new Spotter($this->db);
560 
-            		$all = $Spotter->countAllMonthsLastYear($filters);
561 
-                }
559 
+					$Spotter = new Spotter($this->db);
560 
+					$all = $Spotter->countAllMonthsLastYear($filters);
561 
+				}
562 562
563 
-                return $all;
563 
+				return $all;
564 564 
 	}
565 565
566 566 
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
 
@@ -568,22 +568,22 @@  discard block
 
 block discarded – undo
568 568 
 		if ($filter_name == '') $filter_name = $this->filter_name;
569 569 
 		$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";
570 570 
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
571 
-                 try {
572 
-                        $sth = $this->db->prepare($query);
573 
-                        $sth->execute($query_data);
574 
-                } catch(PDOException $e) {
575 
-                        echo "error : ".$e->getMessage();
576 
-                }
577 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
578 
-                if (empty($all)) {
571 
+				 try {
572 
+						$sth = $this->db->prepare($query);
573 
+						$sth->execute($query_data);
574 
+				} catch(PDOException $e) {
575 
+						echo "error : ".$e->getMessage();
576 
+				}
577 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
578 
+				if (empty($all)) {
579 579 
 			$filters = array('airlines' => array($stats_airline));
580 580 
 			if ($filter_name != '') {
581 581 
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
582 582 
 			}
583 
-            		$Spotter = new Spotter($this->db);
584 
-            		$all = $Spotter->countAllDatesLastMonth($filters);
585 
-                }
586 
-                return $all;
583 
+					$Spotter = new Spotter($this->db);
584 
+					$all = $Spotter->countAllDatesLastMonth($filters);
585 
+				}
586 
+				return $all;
587 587 
 	}
588 588 
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
589 589 
 		global $globalDBdriver, $globalStatsFilters;
 
@@ -594,66 +594,66 @@  discard block
 
 block discarded – undo
594 594 
 			$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";
595 595 
 		}
596 596 
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
597 
-                 try {
598 
-                        $sth = $this->db->prepare($query);
599 
-                        $sth->execute($query_data);
600 
-                } catch(PDOException $e) {
601 
-                        echo "error : ".$e->getMessage();
602 
-                }
603 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
604 
-                if (empty($all)) {
597 
+				 try {
598 
+						$sth = $this->db->prepare($query);
599 
+						$sth->execute($query_data);
600 
+				} catch(PDOException $e) {
601 
+						echo "error : ".$e->getMessage();
602 
+				}
603 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
604 
+				if (empty($all)) {
605 605 
 			$filters = array('airlines' => array($stats_airline));
606 606 
 			if ($filter_name != '') {
607 607 
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
608 608 
 			}
609 
-            		$Spotter = new Spotter($this->db);
610 
-            		$all = $Spotter->countAllDatesLast7Days($filters);
611 
-                }
612 
-                return $all;
609 
+					$Spotter = new Spotter($this->db);
610 
+					$all = $Spotter->countAllDatesLast7Days($filters);
611 
+				}
612 
+				return $all;
613 613 
 	}
614 614 
 	public function countAllDates($stats_airline = '',$filter_name = '') {
615 615 
 		global $globalStatsFilters;
616 616 
 		if ($filter_name == '') $filter_name = $this->filter_name;
617 617 
 		$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";
618 618 
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
619 
-                 try {
620 
-                        $sth = $this->db->prepare($query);
621 
-                        $sth->execute($query_data);
622 
-                } catch(PDOException $e) {
623 
-                        echo "error : ".$e->getMessage();
624 
-                }
625 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
626 
-                if (empty($all)) {
619 
+				 try {
620 
+						$sth = $this->db->prepare($query);
621 
+						$sth->execute($query_data);
622 
+				} catch(PDOException $e) {
623 
+						echo "error : ".$e->getMessage();
624 
+				}
625 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
626 
+				if (empty($all)) {
627 627 
 			$filters = array('airlines' => array($stats_airline));
628 628 
 			if ($filter_name != '') {
629 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
629 
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
630 630 
 			}
631 
-            		$Spotter = new Spotter($this->db);
632 
-            		$all = $Spotter->countAllDates($filters);
633 
-                }
634 
-                return $all;
631 
+					$Spotter = new Spotter($this->db);
632 
+					$all = $Spotter->countAllDates($filters);
633 
+				}
634 
+				return $all;
635 635 
 	}
636 636 
 	public function countAllDatesByAirlines($filter_name = '') {
637 637 
 		global $globalStatsFilters;
638 638 
 		if ($filter_name == '') $filter_name = $this->filter_name;
639 639 
 		$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";
640 640 
 		$query_data = array('filter_name' => $filter_name);
641 
-                 try {
642 
-                        $sth = $this->db->prepare($query);
643 
-                        $sth->execute($query_data);
644 
-                } catch(PDOException $e) {
645 
-                        echo "error : ".$e->getMessage();
646 
-                }
647 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
648 
-                if (empty($all)) {
649 
-            		$filters = array();
650 
-            		if ($filter_name != '') {
651 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
641 
+				 try {
642 
+						$sth = $this->db->prepare($query);
643 
+						$sth->execute($query_data);
644 
+				} catch(PDOException $e) {
645 
+						echo "error : ".$e->getMessage();
646 
+				}
647 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
648 
+				if (empty($all)) {
649 
+					$filters = array();
650 
+					if ($filter_name != '') {
651 
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
652 652 
 			}
653 
-            		$Spotter = new Spotter($this->db);
654 
-            		$all = $Spotter->countAllDatesByAirlines($filters);
655 
-                }
656 
-                return $all;
653 
+					$Spotter = new Spotter($this->db);
654 
+					$all = $Spotter->countAllDatesByAirlines($filters);
655 
+				}
656 
+				return $all;
657 657 
 	}
658 658 
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
659 659 
 		global $globalStatsFilters, $globalDBdriver;
 
@@ -663,24 +663,24 @@  discard block
 
 block discarded – undo
663 663 
 		} else {
664 664 
 			$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
665 665 
 		}
666 
-                 try {
667 
-                        $sth = $this->db->prepare($query);
668 
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
669 
-                } catch(PDOException $e) {
670 
-                        echo "error : ".$e->getMessage();
671 
-                }
672 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
666 
+				 try {
667 
+						$sth = $this->db->prepare($query);
668 
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
669 
+				} catch(PDOException $e) {
670 
+						echo "error : ".$e->getMessage();
671 
+				}
672 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
673 673
674 
-                if (empty($all)) {
674 
+				if (empty($all)) {
675 675 
 			$filters = array('airlines' => array($stats_airline));
676 676 
 			if ($filter_name != '') {
677 677 
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
678 678 
 			}
679 
-            		$Spotter = new Spotter($this->db);
680 
-            		$all = $Spotter->countAllMonths($filters);
681 
-                }
679 
+					$Spotter = new Spotter($this->db);
680 
+					$all = $Spotter->countAllMonths($filters);
681 
+				}
682 682
683 
-                return $all;
683 
+				return $all;
684 684 
 	}
685 685 
 	public function countFatalitiesLast12Months() {
686 686 
 		global $globalStatsFilters, $globalDBdriver;
 
@@ -689,19 +689,19 @@  discard block
 
 block discarded – undo
689 689 
 		} else {
690 690 
 			$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";
691 691 
 		}
692 
-                 try {
693 
-                        $sth = $this->db->prepare($query);
694 
-                        $sth->execute();
695 
-                } catch(PDOException $e) {
696 
-                        echo "error : ".$e->getMessage();
697 
-                }
698 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
692 
+				 try {
693 
+						$sth = $this->db->prepare($query);
694 
+						$sth->execute();
695 
+				} catch(PDOException $e) {
696 
+						echo "error : ".$e->getMessage();
697 
+				}
698 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
699 699
700 
-                if (empty($all)) {
701 
-            		$Accident = new Accident($this->db);
702 
-            		$all = $Accident->countFatalitiesLast12Months();
703 
-                }
704 
-                return $all;
700 
+				if (empty($all)) {
701 
+					$Accident = new Accident($this->db);
702 
+					$all = $Accident->countFatalitiesLast12Months();
703 
+				}
704 
+				return $all;
705 705 
 	}
706 706 
 	public function countFatalitiesByYear() {
707 707 
 		global $globalStatsFilters, $globalDBdriver;
 
@@ -710,40 +710,40 @@  discard block
 
 block discarded – undo
710 710 
 		} else {
711 711 
 			$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year, cnt as count FROM stats WHERE stats_type = 'fatalities_byyear' ORDER BY stats_date";
712 712 
 		}
713 
-                 try {
714 
-                        $sth = $this->db->prepare($query);
715 
-                        $sth->execute();
716 
-                } catch(PDOException $e) {
717 
-                        echo "error : ".$e->getMessage();
718 
-                }
719 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
713 
+				 try {
714 
+						$sth = $this->db->prepare($query);
715 
+						$sth->execute();
716 
+				} catch(PDOException $e) {
717 
+						echo "error : ".$e->getMessage();
718 
+				}
719 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
720 720
721 
-                if (empty($all)) {
722 
-            		$Accident = new Accident($this->db);
723 
-            		$all = $Accident->countFatalitiesByYear();
724 
-                }
725 
-                return $all;
721 
+				if (empty($all)) {
722 
+					$Accident = new Accident($this->db);
723 
+					$all = $Accident->countFatalitiesByYear();
724 
+				}
725 
+				return $all;
726 726 
 	}
727 727 
 	public function countAllMilitaryMonths($filter_name = '') {
728 728 
 		global $globalStatsFilters;
729 729 
 		if ($filter_name == '') $filter_name = $this->filter_name;
730 
-	    	$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";
731 
-                 try {
732 
-                        $sth = $this->db->prepare($query);
733 
-                        $sth->execute(array(':filter_name' => $filter_name));
734 
-                } catch(PDOException $e) {
735 
-                        echo "error : ".$e->getMessage();
736 
-                }
737 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
738 
-                if (empty($all)) {
739 
-            		$filters = array();
740 
-            		if ($filter_name != '') {
741 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
730 
+			$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";
731 
+				 try {
732 
+						$sth = $this->db->prepare($query);
733 
+						$sth->execute(array(':filter_name' => $filter_name));
734 
+				} catch(PDOException $e) {
735 
+						echo "error : ".$e->getMessage();
736 
+				}
737 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
738 
+				if (empty($all)) {
739 
+					$filters = array();
740 
+					if ($filter_name != '') {
741 
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
742 742 
 			}
743 
-            		$Spotter = new Spotter($this->db);
744 
-            		$all = $Spotter->countAllMilitaryMonths($filters);
745 
-                }
746 
-                return $all;
743 
+					$Spotter = new Spotter($this->db);
744 
+					$all = $Spotter->countAllMilitaryMonths($filters);
745 
+				}
746 
+				return $all;
747 747 
 	}
748 748 
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
749 749 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
 
@@ -759,22 +759,22 @@  discard block
 
 block discarded – undo
759 759 
 			}
760 760 
 		}
761 761 
 		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
762 
-                 try {
763 
-                        $sth = $this->db->prepare($query);
764 
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
765 
-                } catch(PDOException $e) {
766 
-                        echo "error : ".$e->getMessage();
767 
-                }
768 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
769 
-                if (empty($all)) {
762 
+				 try {
763 
+						$sth = $this->db->prepare($query);
764 
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
765 
+				} catch(PDOException $e) {
766 
+						echo "error : ".$e->getMessage();
767 
+				}
768 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
769 
+				if (empty($all)) {
770 770 
 			$filters = array('airlines' => array($stats_airline));
771 771 
 			if ($filter_name != '') {
772 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
772 
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
773 773 
 			}
774 
-            		$Spotter = new Spotter($this->db);
775 
-            		$all = $Spotter->countAllHours($orderby,$filters);
776 
-                }
777 
-                return $all;
774 
+					$Spotter = new Spotter($this->db);
775 
+					$all = $Spotter->countAllHours($orderby,$filters);
776 
+				}
777 
+				return $all;
778 778 
 	}
779 779
780 780 
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
 
@@ -799,10 +799,10 @@  discard block
 
 block discarded – undo
799 799 
 		if ($year == '') $year = date('Y');
800 800 
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
801 801 
 		if (empty($all)) {
802 
-		        $filters = array();
802 
+				$filters = array();
803 803 
 			$filters = array('year' => $year,'month' => $month);
804 
-            		if ($filter_name != '') {
805 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
804 
+					if ($filter_name != '') {
805 
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
806 806 
 			}
807 807 
 			$Spotter = new Spotter($this->db);
808 808 
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
 
@@ -866,10 +866,10 @@  discard block
 
 block discarded – undo
866 866 
 			$all = $result[0]['nb_airline'];
867 867 
 		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
868 868 
 		if (empty($all)) {
869 
-            		$filters = array();
869 
+					$filters = array();
870 870 
 			$filters = array('year' => $year,'month' => $month);
871 
-            		if ($filter_name != '') {
872 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
871 
+					if ($filter_name != '') {
872 
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
873 873 
 			}
874 874 
 			$Spotter = new Spotter($this->db);
875 875 
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
 
@@ -939,44 +939,44 @@  discard block
 
 block discarded – undo
939 939 
 		if ($filter_name == '') $filter_name = $this->filter_name;
940 940 
 		$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";
941 941 
 		$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
942 
-                 try {
943 
-                        $sth = $this->db->prepare($query);
944 
-                        $sth->execute($query_values);
945 
-                } catch(PDOException $e) {
946 
-                        echo "error : ".$e->getMessage();
947 
-                }
948 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
949 
-                return $all;
942 
+				 try {
943 
+						$sth = $this->db->prepare($query);
944 
+						$sth->execute($query_values);
945 
+				} catch(PDOException $e) {
946 
+						echo "error : ".$e->getMessage();
947 
+				}
948 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
949 
+				return $all;
950 950 
 	}
951 951 
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
952 952 
 		if ($filter_name == '') $filter_name = $this->filter_name;
953 
-                $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
954 
-                $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
955 
-                 try {
956 
-                        $sth = $this->db->prepare($query);
957 
-                        $sth->execute($query_values);
958 
-                } catch(PDOException $e) {
959 
-                        echo "error : ".$e->getMessage();
960 
-                }
961 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
962 
-                return $all;
963 
-        }
953 
+				$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
954 
+				$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
955 
+				 try {
956 
+						$sth = $this->db->prepare($query);
957 
+						$sth->execute($query_values);
958 
+				} catch(PDOException $e) {
959 
+						echo "error : ".$e->getMessage();
960 
+				}
961 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
962 
+				return $all;
963 
+		}
964 964 
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
965 965 
 		if ($filter_name == '') $filter_name = $this->filter_name;
966 
-                $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
967 
-                $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
968 
-                 try {
969 
-                        $sth = $this->db->prepare($query);
970 
-                        $sth->execute($query_values);
971 
-                } catch(PDOException $e) {
972 
-                        echo "error : ".$e->getMessage();
973 
-                }
974 
-        }
966 
+				$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
967 
+				$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
968 
+				 try {
969 
+						$sth = $this->db->prepare($query);
970 
+						$sth->execute($query_values);
971 
+				} catch(PDOException $e) {
972 
+						echo "error : ".$e->getMessage();
973 
+				}
974 
+		}
975 975 
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
976 976 
 		if ($filter_name == '') $filter_name = $this->filter_name;
977 
-    		global $globalArchiveMonths, $globalDBdriver;
978 
-    		if ($globalDBdriver == 'mysql') {
979 
-    			if ($month == '') {
977 
+			global $globalArchiveMonths, $globalDBdriver;
978 
+			if ($globalDBdriver == 'mysql') {
979 
+				if ($month == '') {
980 980 
 				$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";
981 981 
 				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
982 982 
 			} else {
 
@@ -991,165 +991,165 @@  discard block
 
 block discarded – undo
991 991 
 				$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";
992 992 
 				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
993 993 
 			}
994 
-                }
995 
-                 try {
996 
-                        $sth = $this->db->prepare($query);
997 
-                        $sth->execute($query_values);
998 
-                } catch(PDOException $e) {
999 
-                        echo "error : ".$e->getMessage();
1000 
-                }
1001 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1002 
-                return $all[0]['total'];
1003 
-        }
994 
+				}
995 
+				 try {
996 
+						$sth = $this->db->prepare($query);
997 
+						$sth->execute($query_values);
998 
+				} catch(PDOException $e) {
999 
+						echo "error : ".$e->getMessage();
1000 
+				}
1001 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1002 
+				return $all[0]['total'];
1003 
+		}
1004 1004 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1005 
-    		global $globalArchiveMonths, $globalDBdriver;
1005 
+			global $globalArchiveMonths, $globalDBdriver;
1006 1006 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1007 
-    		if ($globalDBdriver == 'mysql') {
1007 
+			if ($globalDBdriver == 'mysql') {
1008 1008 
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
1009 1009 
 		} else {
1010 1010 
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1011 
-                }
1012 
-                $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1013 
-                 try {
1014 
-                        $sth = $this->db->prepare($query);
1015 
-                        $sth->execute($query_values);
1016 
-                } catch(PDOException $e) {
1017 
-                        echo "error : ".$e->getMessage();
1018 
-                }
1019 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1020 
-                return $all[0]['total'];
1021 
-        }
1011 
+				}
1012 
+				$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1013 
+				 try {
1014 
+						$sth = $this->db->prepare($query);
1015 
+						$sth->execute($query_values);
1016 
+				} catch(PDOException $e) {
1017 
+						echo "error : ".$e->getMessage();
1018 
+				}
1019 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1020 
+				return $all[0]['total'];
1021 
+		}
1022 1022 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1023 
-    		global $globalArchiveMonths, $globalDBdriver;
1023 
+			global $globalArchiveMonths, $globalDBdriver;
1024 1024 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1025 
-    		if ($globalDBdriver == 'mysql') {
1025 
+			if ($globalDBdriver == 'mysql') {
1026 1026 
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1027 
-                } else {
1027 
+				} else {
1028 1028 
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1029 
-                }
1030 
-                 try {
1031 
-                        $sth = $this->db->prepare($query);
1032 
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1033 
-                } catch(PDOException $e) {
1034 
-                        echo "error : ".$e->getMessage();
1035 
-                }
1036 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1037 
-                return $all[0]['total'];
1038 
-        }
1029 
+				}
1030 
+				 try {
1031 
+						$sth = $this->db->prepare($query);
1032 
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1033 
+				} catch(PDOException $e) {
1034 
+						echo "error : ".$e->getMessage();
1035 
+				}
1036 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1037 
+				return $all[0]['total'];
1038 
+		}
1039 1039 
 	public function getStatsAirlineTotal($filter_name = '') {
1040 
-    		global $globalArchiveMonths, $globalDBdriver;
1040 
+			global $globalArchiveMonths, $globalDBdriver;
1041 1041 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1042 
-    		if ($globalDBdriver == 'mysql') {
1042 
+			if ($globalDBdriver == 'mysql') {
1043 1043 
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1044 
-                } else {
1044 
+				} else {
1045 1045 
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1046 
-                }
1047 
-                 try {
1048 
-                        $sth = $this->db->prepare($query);
1049 
-                        $sth->execute(array(':filter_name' => $filter_name));
1050 
-                } catch(PDOException $e) {
1051 
-                        echo "error : ".$e->getMessage();
1052 
-                }
1053 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1054 
-                return $all[0]['total'];
1055 
-        }
1046 
+				}
1047 
+				 try {
1048 
+						$sth = $this->db->prepare($query);
1049 
+						$sth->execute(array(':filter_name' => $filter_name));
1050 
+				} catch(PDOException $e) {
1051 
+						echo "error : ".$e->getMessage();
1052 
+				}
1053 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1054 
+				return $all[0]['total'];
1055 
+		}
1056 1056 
 	public function getStatsOwnerTotal($filter_name = '') {
1057 
-    		global $globalArchiveMonths, $globalDBdriver;
1057 
+			global $globalArchiveMonths, $globalDBdriver;
1058 1058 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1059 
-    		if ($globalDBdriver == 'mysql') {
1059 
+			if ($globalDBdriver == 'mysql') {
1060 1060 
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1061 1061 
 		} else {
1062 1062 
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1063 
-                }
1064 
-                 try {
1065 
-                        $sth = $this->db->prepare($query);
1066 
-                        $sth->execute(array(':filter_name' => $filter_name));
1067 
-                } catch(PDOException $e) {
1068 
-                        echo "error : ".$e->getMessage();
1069 
-                }
1070 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1071 
-                return $all[0]['total'];
1072 
-        }
1063 
+				}
1064 
+				 try {
1065 
+						$sth = $this->db->prepare($query);
1066 
+						$sth->execute(array(':filter_name' => $filter_name));
1067 
+				} catch(PDOException $e) {
1068 
+						echo "error : ".$e->getMessage();
1069 
+				}
1070 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1071 
+				return $all[0]['total'];
1072 
+		}
1073 1073 
 	public function getStatsOwner($owner_name,$filter_name = '') {
1074 
-    		global $globalArchiveMonths, $globalDBdriver;
1074 
+			global $globalArchiveMonths, $globalDBdriver;
1075 1075 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1076 1076 
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1077 
-                 try {
1078 
-                        $sth = $this->db->prepare($query);
1079 
-                        $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1080 
-                } catch(PDOException $e) {
1081 
-                        echo "error : ".$e->getMessage();
1082 
-                }
1083 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1084 
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1085 
-                else return 0;
1086 
-        }
1077 
+				 try {
1078 
+						$sth = $this->db->prepare($query);
1079 
+						$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1080 
+				} catch(PDOException $e) {
1081 
+						echo "error : ".$e->getMessage();
1082 
+				}
1083 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1084 
+				if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1085 
+				else return 0;
1086 
+		}
1087 1087 
 	public function getStatsPilotTotal($filter_name = '') {
1088 
-    		global $globalArchiveMonths, $globalDBdriver;
1088 
+			global $globalArchiveMonths, $globalDBdriver;
1089 1089 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1090 
-    		if ($globalDBdriver == 'mysql') {
1091 
-            		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1092 
-            	} else {
1093 
-            		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1094 
-            	}
1095 
-                 try {
1096 
-                        $sth = $this->db->prepare($query);
1097 
-                        $sth->execute(array(':filter_name' => $filter_name));
1098 
-                } catch(PDOException $e) {
1099 
-                        echo "error : ".$e->getMessage();
1100 
-                }
1101 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1102 
-                return $all[0]['total'];
1103 
-        }
1090 
+			if ($globalDBdriver == 'mysql') {
1091 
+					$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1092 
+				} else {
1093 
+					$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1094 
+				}
1095 
+				 try {
1096 
+						$sth = $this->db->prepare($query);
1097 
+						$sth->execute(array(':filter_name' => $filter_name));
1098 
+				} catch(PDOException $e) {
1099 
+						echo "error : ".$e->getMessage();
1100 
+				}
1101 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1102 
+				return $all[0]['total'];
1103 
+		}
1104 1104 
 	public function getStatsPilot($pilot,$filter_name = '') {
1105 
-    		global $globalArchiveMonths, $globalDBdriver;
1105 
+			global $globalArchiveMonths, $globalDBdriver;
1106 1106 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1107 1107 
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1108 
-                 try {
1109 
-                        $sth = $this->db->prepare($query);
1110 
-                        $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1111 
-                } catch(PDOException $e) {
1112 
-                        echo "error : ".$e->getMessage();
1113 
-                }
1114 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1115 
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1116 
-                else return 0;
1117 
-        }
1108 
+				 try {
1109 
+						$sth = $this->db->prepare($query);
1110 
+						$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1111 
+				} catch(PDOException $e) {
1112 
+						echo "error : ".$e->getMessage();
1113 
+				}
1114 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1115 
+				if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1116 
+				else return 0;
1117 
+		}
1118 1118
1119 1119 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1120 1120 
 		global $globalDBdriver;
1121 1121 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1122 1122 
 		if ($globalDBdriver == 'mysql') {
1123 1123 
 			$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";
1124 
-                } else {
1124 
+				} else {
1125 1125 
 			$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);";
1126 1126 
 		}
1127 
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1128 
-                 try {
1129 
-                        $sth = $this->db->prepare($query);
1130 
-                        $sth->execute($query_values);
1131 
-                } catch(PDOException $e) {
1132 
-                        return "error : ".$e->getMessage();
1133 
-                }
1134 
-        }
1127 
+				$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1128 
+				 try {
1129 
+						$sth = $this->db->prepare($query);
1130 
+						$sth->execute($query_values);
1131 
+				} catch(PDOException $e) {
1132 
+						return "error : ".$e->getMessage();
1133 
+				}
1134 
+		}
1135 1135 
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1136 1136 
 		global $globalDBdriver;
1137 1137 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1138 1138 
 		if ($globalDBdriver == 'mysql') {
1139 1139 
 			$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";
1140 1140 
 		} else {
1141 
-            		//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1141 
+					//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1142 1142 
 			$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);";
1143 
-                }
1144 
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1145 
-                 try {
1146 
-                        $sth = $this->db->prepare($query);
1147 
-                        $sth->execute($query_values);
1148 
-                } catch(PDOException $e) {
1149 
-                        return "error : ".$e->getMessage();
1150 
-                }
1151 
-        }
1152 
-        /*
1143 
+				}
1144 
+				$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1145 
+				 try {
1146 
+						$sth = $this->db->prepare($query);
1147 
+						$sth->execute($query_values);
1148 
+				} catch(PDOException $e) {
1149 
+						return "error : ".$e->getMessage();
1150 
+				}
1151 
+		}
1152 
+		/*
1153 1153 
 	public function getStatsSource($date,$stats_type = '') {
1154 1154 
 		if ($stats_type == '') {
1155 1155 
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name";
 
@@ -1218,25 +1218,25 @@  discard block
 
 block discarded – undo
1218 1218 
 			$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";
1219 1219 
 		} else {
1220 1220 
 			$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);";
1221 
-                }
1222 
-                $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
1223 
-                 try {
1224 
-                        $sth = $this->db->prepare($query);
1225 
-                        $sth->execute($query_values);
1226 
-                } catch(PDOException $e) {
1227 
-                        return "error : ".$e->getMessage();
1228 
-                }
1229 
-        }
1230 
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1231 
-                $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1232 
-                $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1233 
-                 try {
1234 
-                        $sth = $this->db->prepare($query);
1235 
-                        $sth->execute($query_values);
1236 
-                } catch(PDOException $e) {
1237 
-                        return "error : ".$e->getMessage();
1238 
-                }
1239 
-        }
1221 
+				}
1222 
+				$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
1223 
+				 try {
1224 
+						$sth = $this->db->prepare($query);
1225 
+						$sth->execute($query_values);
1226 
+				} catch(PDOException $e) {
1227 
+						return "error : ".$e->getMessage();
1228 
+				}
1229 
+		}
1230 
+	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1231 
+				$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1232 
+				$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1233 
+				 try {
1234 
+						$sth = $this->db->prepare($query);
1235 
+						$sth->execute($query_values);
1236 
+				} catch(PDOException $e) {
1237 
+						return "error : ".$e->getMessage();
1238 
+				}
1239 
+		}
1240 1240 
 	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
1241 1241 
 		global $globalDBdriver;
1242 1242 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1252,14 +1252,14 @@  discard block
 
 block discarded – undo
1252 1252 
 				$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);";
1253 1253 
 			}
1254 1254 
 		}
1255 
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1256 
-                 try {
1257 
-                        $sth = $this->db->prepare($query);
1258 
-                        $sth->execute($query_values);
1259 
-                } catch(PDOException $e) {
1260 
-                        return "error : ".$e->getMessage();
1261 
-                }
1262 
-        }
1255 
+				$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1256 
+				 try {
1257 
+						$sth = $this->db->prepare($query);
1258 
+						$sth->execute($query_values);
1259 
+				} catch(PDOException $e) {
1260 
+						return "error : ".$e->getMessage();
1261 
+				}
1262 
+		}
1263 1263 
 	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
1264 1264 
 		global $globalDBdriver;
1265 1265 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1275,14 +1275,14 @@  discard block
 
 block discarded – undo
1275 1275 
 				$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);";
1276 1276 
 			}
1277 1277 
 		}
1278 
-                $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
1279 
-                 try {
1280 
-                        $sth = $this->db->prepare($query);
1281 
-                        $sth->execute($query_values);
1282 
-                } catch(PDOException $e) {
1283 
-                        return "error : ".$e->getMessage();
1284 
-                }
1285 
-        }
1278 
+				$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
1279 
+				 try {
1280 
+						$sth = $this->db->prepare($query);
1281 
+						$sth->execute($query_values);
1282 
+				} catch(PDOException $e) {
1283 
+						return "error : ".$e->getMessage();
1284 
+				}
1285 
+		}
1286 1286 
 	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
1287 1287 
 		global $globalDBdriver;
1288 1288 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1298,14 +1298,14 @@  discard block
 
 block discarded – undo
1298 1298 
 				$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);";
1299 1299 
 			}
1300 1300 
 		}
1301 
-                $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
1302 
-                 try {
1303 
-                        $sth = $this->db->prepare($query);
1304 
-                        $sth->execute($query_values);
1305 
-                } catch(PDOException $e) {
1306 
-                        return "error : ".$e->getMessage();
1307 
-                }
1308 
-        }
1301 
+				$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
1302 
+				 try {
1303 
+						$sth = $this->db->prepare($query);
1304 
+						$sth->execute($query_values);
1305 
+				} catch(PDOException $e) {
1306 
+						return "error : ".$e->getMessage();
1307 
+				}
1308 
+		}
1309 1309 
 	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1310 1310 
 		global $globalDBdriver;
1311 1311 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1321,14 +1321,14 @@  discard block
 
 block discarded – undo
1321 1321 
 				$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);";
1322 1322 
 			}
1323 1323 
 		}
1324 
-                $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);
1325 
-                 try {
1326 
-                        $sth = $this->db->prepare($query);
1327 
-                        $sth->execute($query_values);
1328 
-                } catch(PDOException $e) {
1329 
-                        return "error : ".$e->getMessage();
1330 
-                }
1331 
-        }
1324 
+				$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);
1325 
+				 try {
1326 
+						$sth = $this->db->prepare($query);
1327 
+						$sth->execute($query_values);
1328 
+				} catch(PDOException $e) {
1329 
+						return "error : ".$e->getMessage();
1330 
+				}
1331 
+		}
1332 1332 
 	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
1333 1333 
 		global $globalDBdriver;
1334 1334 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1344,14 +1344,14 @@  discard block
 
 block discarded – undo
1344 1344 
 				$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);";
1345 1345 
 			}
1346 1346 
 		}
1347 
-                $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
1348 
-                 try {
1349 
-                        $sth = $this->db->prepare($query);
1350 
-                        $sth->execute($query_values);
1351 
-                } catch(PDOException $e) {
1352 
-                        return "error : ".$e->getMessage();
1353 
-                }
1354 
-        }
1347 
+				$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
1348 
+				 try {
1349 
+						$sth = $this->db->prepare($query);
1350 
+						$sth->execute($query_values);
1351 
+				} catch(PDOException $e) {
1352 
+						return "error : ".$e->getMessage();
1353 
+				}
1354 
+		}
1355 1355 
 	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
1356 1356 
 		global $globalDBdriver;
1357 1357 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1367,14 +1367,14 @@  discard block
 
 block discarded – undo
1367 1367 
 				$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);";
1368 1368 
 			}
1369 1369 
 		}
1370 
-                $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1371 
-                 try {
1372 
-                        $sth = $this->db->prepare($query);
1373 
-                        $sth->execute($query_values);
1374 
-                } catch(PDOException $e) {
1375 
-                        return "error : ".$e->getMessage();
1376 
-                }
1377 
-        }
1370 
+				$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1371 
+				 try {
1372 
+						$sth = $this->db->prepare($query);
1373 
+						$sth->execute($query_values);
1374 
+				} catch(PDOException $e) {
1375 
+						return "error : ".$e->getMessage();
1376 
+				}
1377 
+		}
1378 1378 
 	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
1379 1379 
 		global $globalDBdriver;
1380 1380 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1390,14 +1390,14 @@  discard block
 
 block discarded – undo
1390 1390 
 				$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);";
1391 1391 
 			}
1392 1392 
 		}
1393 
-                $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);
1394 
-                 try {
1395 
-                        $sth = $this->db->prepare($query);
1396 
-                        $sth->execute($query_values);
1397 
-                } catch(PDOException $e) {
1398 
-                        return "error : ".$e->getMessage();
1399 
-                }
1400 
-        }
1393 
+				$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);
1394 
+				 try {
1395 
+						$sth = $this->db->prepare($query);
1396 
+						$sth->execute($query_values);
1397 
+				} catch(PDOException $e) {
1398 
+						return "error : ".$e->getMessage();
1399 
+				}
1400 
+		}
1401 1401 
 	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
1402 1402 
 		global $globalDBdriver;
1403 1403 
 		if ($airport_icao != '') {
 
@@ -1421,8 +1421,8 @@  discard block
 
 block discarded – undo
1421 1421 
 			} catch(PDOException $e) {
1422 1422 
 				return "error : ".$e->getMessage();
1423 1423 
 			}
1424 
-                }
1425 
-        }
1424 
+				}
1425 
+		}
1426 1426 
 	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
1427 1427 
 		global $globalDBdriver;
1428 1428 
 		if ($airport_icao != '') {
 
@@ -1438,8 +1438,8 @@  discard block
 
 block discarded – undo
1438 1438 
 			} catch(PDOException $e) {
1439 1439 
 				return "error : ".$e->getMessage();
1440 1440 
 			}
1441 
-                }
1442 
-        }
1441 
+				}
1442 
+		}
1443 1443 
 	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
1444 1444 
 		global $globalDBdriver;
1445 1445 
 		if ($airport_icao != '') {
 
@@ -1456,15 +1456,15 @@  discard block
 
 block discarded – undo
1456 1456 
 					$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);";
1457 1457 
 				}
1458 1458 
 			}
1459 
-	                $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);
1459 
+					$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);
1460 1460 
 			 try {
1461 
-                    		$sth = $this->db->prepare($query);
1462 
-	                        $sth->execute($query_values);
1463 
-    		        } catch(PDOException $e) {
1464 
-            		        return "error : ".$e->getMessage();
1465 
-	                }
1466 
-	        }
1467 
-        }
1461 
+							$sth = $this->db->prepare($query);
1462 
+							$sth->execute($query_values);
1463 
+					} catch(PDOException $e) {
1464 
+							return "error : ".$e->getMessage();
1465 
+					}
1466 
+			}
1467 
+		}
1468 1468 
 	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
1469 1469 
 		global $globalDBdriver;
1470 1470 
 		if ($airport_icao != '') {
 
@@ -1480,46 +1480,46 @@  discard block
 
 block discarded – undo
1480 1480 
 			} catch(PDOException $e) {
1481 1481 
 				return "error : ".$e->getMessage();
1482 1482 
 			}
1483 
-                }
1484 
-        }
1483 
+				}
1484 
+		}
1485 1485
1486 1486 
 	public function deleteStat($id) {
1487 
-                $query = "DELETE FROM stats WHERE stats_id = :id";
1488 
-                $query_values = array(':id' => $id);
1489 
-                 try {
1490 
-                        $sth = $this->db->prepare($query);
1491 
-                        $sth->execute($query_values);
1492 
-                } catch(PDOException $e) {
1493 
-                        return "error : ".$e->getMessage();
1494 
-                }
1495 
-        }
1487 
+				$query = "DELETE FROM stats WHERE stats_id = :id";
1488 
+				$query_values = array(':id' => $id);
1489 
+				 try {
1490 
+						$sth = $this->db->prepare($query);
1491 
+						$sth->execute($query_values);
1492 
+				} catch(PDOException $e) {
1493 
+						return "error : ".$e->getMessage();
1494 
+				}
1495 
+		}
1496 1496 
 	public function deleteStatFlight($type) {
1497 
-                $query = "DELETE FROM stats_flight WHERE stats_type = :type";
1498 
-                $query_values = array(':type' => $type);
1499 
-                 try {
1500 
-                        $sth = $this->db->prepare($query);
1501 
-                        $sth->execute($query_values);
1502 
-                } catch(PDOException $e) {
1503 
-                        return "error : ".$e->getMessage();
1504 
-                }
1505 
-        }
1497 
+				$query = "DELETE FROM stats_flight WHERE stats_type = :type";
1498 
+				$query_values = array(':type' => $type);
1499 
+				 try {
1500 
+						$sth = $this->db->prepare($query);
1501 
+						$sth->execute($query_values);
1502 
+				} catch(PDOException $e) {
1503 
+						return "error : ".$e->getMessage();
1504 
+				}
1505 
+		}
1506 1506 
 	public function deleteStatAirport($type) {
1507 
-                $query = "DELETE FROM stats_airport WHERE stats_type = :type";
1508 
-                $query_values = array(':type' => $type);
1509 
-                 try {
1510 
-                        $sth = $this->db->prepare($query);
1511 
-                        $sth->execute($query_values);
1512 
-                } catch(PDOException $e) {
1513 
-                        return "error : ".$e->getMessage();
1514 
-                }
1515 
-        }
1507 
+				$query = "DELETE FROM stats_airport WHERE stats_type = :type";
1508 
+				$query_values = array(':type' => $type);
1509 
+				 try {
1510 
+						$sth = $this->db->prepare($query);
1511 
+						$sth->execute($query_values);
1512 
+				} catch(PDOException $e) {
1513 
+						return "error : ".$e->getMessage();
1514 
+				}
1515 
+		}
1516 1516
1517 
-        public function addOldStats() {
1518 
-    		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear;
1519 
-    		$Common = new Common();
1520 
-    		$Connection = new Connection();
1521 
-    		date_default_timezone_set('UTC');
1522 
-    		$last_update = $this->getLastStatsUpdate('last_update_stats');
1517 
+		public function addOldStats() {
1518 
+			global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear;
1519 
+			$Common = new Common();
1520 
+			$Connection = new Connection();
1521 
+			date_default_timezone_set('UTC');
1522 
+			$last_update = $this->getLastStatsUpdate('last_update_stats');
1523 1523 
 			if ($globalDebug) echo 'Update stats !'."\n";
1524 1524 
 			if (isset($last_update[0]['value'])) {
1525 1525 
 				$last_update_day = $last_update[0]['value'];
 
@@ -1566,24 +1566,24 @@  discard block
 
 block discarded – undo
1566 1566 
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
1567 1567 
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
1568 1568 
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
1569 
-        		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
1569 
+				$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
1570 1570 
 			if ($globalDebug) echo 'Order departure airports...'."\n";
1571 
-	        	$alldata = array();
1571 
+				$alldata = array();
1572 1572
1573 
-    			foreach ($pall as $value) {
1574 
-	        		$icao = $value['airport_departure_icao'];
1575 
-    				$alldata[$icao] = $value;
1576 
-	        	}
1577 
-	        	foreach ($dall as $value) {
1578 
-    				$icao = $value['airport_departure_icao'];
1579 
-        			if (isset($alldata[$icao])) {
1580 
-    					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1581 
-        			} else $alldata[$icao] = $value;
1582 
-			}
1583 
-    			$count = array();
1584 
-    			foreach ($alldata as $key => $row) {
1585 
-    				$count[$key] = $row['airport_departure_icao_count'];
1586 
-        		}
1573 
+				foreach ($pall as $value) {
1574 
+					$icao = $value['airport_departure_icao'];
1575 
+					$alldata[$icao] = $value;
1576 
+				}
1577 
+				foreach ($dall as $value) {
1578 
+					$icao = $value['airport_departure_icao'];
1579 
+					if (isset($alldata[$icao])) {
1580 
+						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1581 
+					} else $alldata[$icao] = $value;
1582 
+			}
1583 
+				$count = array();
1584 
+				foreach ($alldata as $key => $row) {
1585 
+					$count[$key] = $row['airport_departure_icao_count'];
1586 
+				}
1587 1587 
 			array_multisort($count,SORT_DESC,$alldata);
1588 1588 
 			foreach ($alldata as $number) {
1589 1589 
 				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);
 
@@ -1591,25 +1591,25 @@  discard block
 
 block discarded – undo
1591 1591 
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
1592 1592 
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
1593 1593 
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
1594 
-        		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
1594 
+				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
1595 1595 
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
1596 
-	        	$alldata = array();
1597 
-    			foreach ($pall as $value) {
1598 
-	        		$icao = $value['airport_arrival_icao'];
1599 
-    				$alldata[$icao] = $value;
1600 
-	        	}
1601 
-	        	foreach ($dall as $value) {
1602 
-    				$icao = $value['airport_arrival_icao'];
1603 
-        			if (isset($alldata[$icao])) {
1604 
-        				$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1605 
-	        		} else $alldata[$icao] = $value;
1606 
-    			}
1607 
-        		$count = array();
1608 
-        		foreach ($alldata as $key => $row) {
1609 
-        			$count[$key] = $row['airport_arrival_icao_count'];
1610 
-	        	}
1611 
-    			array_multisort($count,SORT_DESC,$alldata);
1612 
-                        foreach ($alldata as $number) {
1596 
+				$alldata = array();
1597 
+				foreach ($pall as $value) {
1598 
+					$icao = $value['airport_arrival_icao'];
1599 
+					$alldata[$icao] = $value;
1600 
+				}
1601 
+				foreach ($dall as $value) {
1602 
+					$icao = $value['airport_arrival_icao'];
1603 
+					if (isset($alldata[$icao])) {
1604 
+						$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1605 
+					} else $alldata[$icao] = $value;
1606 
+				}
1607 
+				$count = array();
1608 
+				foreach ($alldata as $key => $row) {
1609 
+					$count[$key] = $row['airport_arrival_icao_count'];
1610 
+				}
1611 
+				array_multisort($count,SORT_DESC,$alldata);
1612 
+						foreach ($alldata as $number) {
1613 1613 
 				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);
1614 1614 
 			}
1615 1615 
 			if ($Connection->tableExists('countries')) {
 
@@ -1682,8 +1682,8 @@  discard block
 
 block discarded – undo
1682 1682 
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
1683 1683 
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
1684 1684 
 			$pall = $Spotter->getLast7DaysAirportsDeparture();
1685 
-        		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
1686 
-        		/*
1685 
+				$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
1686 
+				/*
1687 1687 
 	        	$alldata = array();
1688 1688 
     			foreach ($pall as $value) {
1689 1689 
 	        		$icao = $value['departure_airport_icao'];
 
@@ -1702,29 +1702,29 @@  discard block
 
 block discarded – undo
1702 1702 
 	        	}
1703 1703 
     			array_multisort($count,SORT_DESC,$alldata);
1704 1704 
     			*/
1705 
-    			foreach ($dall as $value) {
1706 
-    				$icao = $value['departure_airport_icao'];
1707 
-    				$ddate = $value['date'];
1708 
-    				$find = false;
1709 
-    				foreach ($pall as $pvalue) {
1710 
-    					if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
1711 
-    						$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
1712 
-    						$find = true;
1713 
-    						break;
1714 
-    					}
1715 
-    				}
1716 
-    				if ($find === false) {
1717 
-    					$pall[] = $value;
1718 
-    				}
1719 
-    			}
1720 
-    			$alldata = $pall;
1705 
+				foreach ($dall as $value) {
1706 
+					$icao = $value['departure_airport_icao'];
1707 
+					$ddate = $value['date'];
1708 
+					$find = false;
1709 
+					foreach ($pall as $pvalue) {
1710 
+						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
1711 
+							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
1712 
+							$find = true;
1713 
+							break;
1714 
+						}
1715 
+					}
1716 
+					if ($find === false) {
1717 
+						$pall[] = $value;
1718 
+					}
1719 
+				}
1720 
+				$alldata = $pall;
1721 1721 
 			foreach ($alldata as $number) {
1722 1722 
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
1723 1723 
 			}
1724 1724 
 			echo '...Arrival'."\n";
1725 1725 
 			$pall = $Spotter->getLast7DaysAirportsArrival();
1726 
-        		$dall = $Spotter->getLast7DaysDetectedAirportsArrival();
1727 
-        		/*
1726 
+				$dall = $Spotter->getLast7DaysDetectedAirportsArrival();
1727 
+				/*
1728 1728 
 	        	$alldata = array();
1729 1729 
     			foreach ($pall as $value) {
1730 1730 
 	        		$icao = $value['arrival_airport_icao'];
 
@@ -1744,22 +1744,22 @@  discard block
 
 block discarded – undo
1744 1744 
     			*/
1745 1745
1746 1746
1747 
-    			foreach ($dall as $value) {
1748 
-    				$icao = $value['arrival_airport_icao'];
1749 
-    				$ddate = $value['date'];
1750 
-    				$find = false;
1751 
-    				foreach ($pall as $pvalue) {
1752 
-    					if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
1753 
-    						$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
1754 
-    						$find = true;
1755 
-    						break;
1756 
-    					}
1757 
-    				}
1758 
-    				if ($find === false) {
1759 
-    					$pall[] = $value;
1760 
-    				}
1761 
-    			}
1762 
-    			$alldata = $pall;
1747 
+				foreach ($dall as $value) {
1748 
+					$icao = $value['arrival_airport_icao'];
1749 
+					$ddate = $value['date'];
1750 
+					$find = false;
1751 
+					foreach ($pall as $pvalue) {
1752 
+						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
1753 
+							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
1754 
+							$find = true;
1755 
+							break;
1756 
+						}
1757 
+					}
1758 
+					if ($find === false) {
1759 
+						$pall[] = $value;
1760 
+					}
1761 
+				}
1762 
+				$alldata = $pall;
1763 1763 
 			foreach ($alldata as $number) {
1764 1764 
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
1765 1765 
 			}
 
@@ -1834,51 +1834,51 @@  discard block
 
 block discarded – undo
1834 1834 
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
1835 1835 
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
1836 1836 
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
1837 
-       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
1837 
+	   			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
1838 1838 
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
1839 
-	        	//$alldata = array();
1840 
-    			foreach ($dall as $value) {
1841 
-    				$icao = $value['airport_departure_icao'];
1842 
-    				$dicao = $value['airline_icao'];
1843 
-    				$find = false;
1844 
-    				foreach ($pall as $pvalue) {
1845 
-    					if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
1846 
-    						$pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1847 
-    						$find = true;
1848 
-    						break;
1849 
-    					}
1850 
-    				}
1851 
-    				if ($find === false) {
1852 
-    					$pall[] = $value;
1853 
-    				}
1854 
-    			}
1855 
-    			$alldata = $pall;
1839 
+				//$alldata = array();
1840 
+				foreach ($dall as $value) {
1841 
+					$icao = $value['airport_departure_icao'];
1842 
+					$dicao = $value['airline_icao'];
1843 
+					$find = false;
1844 
+					foreach ($pall as $pvalue) {
1845 
+						if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
1846 
+							$pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1847 
+							$find = true;
1848 
+							break;
1849 
+						}
1850 
+					}
1851 
+					if ($find === false) {
1852 
+						$pall[] = $value;
1853 
+					}
1854 
+				}
1855 
+				$alldata = $pall;
1856 1856 
 			foreach ($alldata as $number) {
1857 1857 
 				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);
1858 1858 
 			}
1859 1859 
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
1860 1860 
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
1861 1861 
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
1862 
-        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
1862 
+				$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
1863 1863 
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
1864 
-	        	//$alldata = array();
1865 
-    			foreach ($dall as $value) {
1866 
-    				$icao = $value['airport_arrival_icao'];
1867 
-    				$dicao = $value['airline_icao'];
1868 
-    				$find = false;
1869 
-    				foreach ($pall as $pvalue) {
1870 
-    					if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
1871 
-    						$pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1872 
-    						$find = true;
1873 
-    						break;
1874 
-    					}
1875 
-    				}
1876 
-    				if ($find === false) {
1877 
-    					$pall[] = $value;
1878 
-    				}
1879 
-    			}
1880 
-    			$alldata = $pall;
1881 
-                        foreach ($alldata as $number) {
1864 
+				//$alldata = array();
1865 
+				foreach ($dall as $value) {
1866 
+					$icao = $value['airport_arrival_icao'];
1867 
+					$dicao = $value['airline_icao'];
1868 
+					$find = false;
1869 
+					foreach ($pall as $pvalue) {
1870 
+						if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
1871 
+							$pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1872 
+							$find = true;
1873 
+							break;
1874 
+						}
1875 
+					}
1876 
+					if ($find === false) {
1877 
+						$pall[] = $value;
1878 
+					}
1879 
+				}
1880 
+				$alldata = $pall;
1881 
+						foreach ($alldata as $number) {
1882 1882 
 				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);
1883 1883 
 			}
1884 1884 
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
 
@@ -1911,47 +1911,47 @@  discard block
 
 block discarded – undo
1911 1911 
 			}
1912 1912 
 			if ($globalDebug) echo '...Departure'."\n";
1913 1913 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
1914 
-        		$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
1915 
-    			foreach ($dall as $value) {
1916 
-    				$icao = $value['departure_airport_icao'];
1917 
-    				$airline = $value['airline_icao'];
1918 
-    				$ddate = $value['date'];
1919 
-    				$find = false;
1920 
-    				foreach ($pall as $pvalue) {
1921 
-    					if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) {
1922 
-    						$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
1923 
-    						$find = true;
1924 
-    						break;
1925 
-    					}
1926 
-    				}
1927 
-    				if ($find === false) {
1928 
-    					$pall[] = $value;
1929 
-    				}
1930 
-    			}
1931 
-    			$alldata = $pall;
1914 
+				$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
1915 
+				foreach ($dall as $value) {
1916 
+					$icao = $value['departure_airport_icao'];
1917 
+					$airline = $value['airline_icao'];
1918 
+					$ddate = $value['date'];
1919 
+					$find = false;
1920 
+					foreach ($pall as $pvalue) {
1921 
+						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) {
1922 
+							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
1923 
+							$find = true;
1924 
+							break;
1925 
+						}
1926 
+					}
1927 
+					if ($find === false) {
1928 
+						$pall[] = $value;
1929 
+					}
1930 
+				}
1931 
+				$alldata = $pall;
1932 1932 
 			foreach ($alldata as $number) {
1933 1933 
 				$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']);
1934 1934 
 			}
1935 1935 
 			if ($globalDebug) echo '...Arrival'."\n";
1936 1936 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
1937 
-        		$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
1938 
-    			foreach ($dall as $value) {
1939 
-    				$icao = $value['arrival_airport_icao'];
1940 
-    				$airline = $value['airline_icao'];
1941 
-    				$ddate = $value['date'];
1942 
-    				$find = false;
1943 
-    				foreach ($pall as $pvalue) {
1944 
-    					if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) {
1945 
-    						$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
1946 
-    						$find = true;
1947 
-    						break;
1948 
-    					}
1949 
-    				}
1950 
-    				if ($find === false) {
1951 
-    					$pall[] = $value;
1952 
-    				}
1953 
-    			}
1954 
-    			$alldata = $pall;
1937 
+				$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
1938 
+				foreach ($dall as $value) {
1939 
+					$icao = $value['arrival_airport_icao'];
1940 
+					$airline = $value['airline_icao'];
1941 
+					$ddate = $value['date'];
1942 
+					$find = false;
1943 
+					foreach ($pall as $pvalue) {
1944 
+						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) {
1945 
+							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
1946 
+							$find = true;
1947 
+							break;
1948 
+						}
1949 
+					}
1950 
+					if ($find === false) {
1951 
+						$pall[] = $value;
1952 
+					}
1953 
+				}
1954 
+				$alldata = $pall;
1955 1955 
 			foreach ($alldata as $number) {
1956 1956 
 				$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']);
1957 1957 
 			}
 
@@ -2036,44 +2036,44 @@  discard block
 
 block discarded – undo
2036 2036 
 					$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
2037 2037 
 				}
2038 2038 
 				$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
2039 
-	       			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2040 
-		        	$alldata = array();
2041 
-	    			foreach ($pall as $value) {
2042 
-		        		$icao = $value['airport_departure_icao'];
2043 
-    					$alldata[$icao] = $value;
2044 
-	    			}
2045 
-		        	foreach ($dall as $value) {
2046 
-	    				$icao = $value['airport_departure_icao'];
2047 
-        				if (isset($alldata[$icao])) {
2048 
-    						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2049 
-        				} else $alldata[$icao] = $value;
2050 
-				}
2051 
-	    			$count = array();
2052 
-    				foreach ($alldata as $key => $row) {
2053 
-    					$count[$key] = $row['airport_departure_icao_count'];
2054 
-    				}
2039 
+		   			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2040 
+					$alldata = array();
2041 
+					foreach ($pall as $value) {
2042 
+						$icao = $value['airport_departure_icao'];
2043 
+						$alldata[$icao] = $value;
2044 
+					}
2045 
+					foreach ($dall as $value) {
2046 
+						$icao = $value['airport_departure_icao'];
2047 
+						if (isset($alldata[$icao])) {
2048 
+							$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2049 
+						} else $alldata[$icao] = $value;
2050 
+				}
2051 
+					$count = array();
2052 
+					foreach ($alldata as $key => $row) {
2053 
+						$count[$key] = $row['airport_departure_icao_count'];
2054 
+					}
2055 2055 
 				array_multisort($count,SORT_DESC,$alldata);
2056 2056 
 				foreach ($alldata as $number) {
2057 
-    					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);
2057 
+						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);
2058 2058 
 				}
2059 2059 
 				$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
2060 
-    				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2060 
+					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2061 2061 
 				$alldata = array();
2062 
-    				foreach ($pall as $value) {
2063 
-		        		$icao = $value['airport_arrival_icao'];
2064 
-    					$alldata[$icao] = $value;
2065 
-	    			}
2066 
-		        	foreach ($dall as $value) {
2067 
-	    				$icao = $value['airport_arrival_icao'];
2068 
-        				if (isset($alldata[$icao])) {
2069 
-        					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2070 
-		        		} else $alldata[$icao] = $value;
2071 
-	    			}
2072 
-        			$count = array();
2073 
-        			foreach ($alldata as $key => $row) {
2074 
-    					$count[$key] = $row['airport_arrival_icao_count'];
2075 
-		        	}
2076 
-        			array_multisort($count,SORT_DESC,$alldata);
2062 
+					foreach ($pall as $value) {
2063 
+						$icao = $value['airport_arrival_icao'];
2064 
+						$alldata[$icao] = $value;
2065 
+					}
2066 
+					foreach ($dall as $value) {
2067 
+						$icao = $value['airport_arrival_icao'];
2068 
+						if (isset($alldata[$icao])) {
2069 
+							$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2070 
+						} else $alldata[$icao] = $value;
2071 
+					}
2072 
+					$count = array();
2073 
+					foreach ($alldata as $key => $row) {
2074 
+						$count[$key] = $row['airport_arrival_icao_count'];
2075 
+					}
2076 
+					array_multisort($count,SORT_DESC,$alldata);
2077 2077 
 				foreach ($alldata as $number) {
2078 2078 
 					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);
2079 2079 
 				}
 
@@ -2106,45 +2106,45 @@  discard block
 
 block discarded – undo
2106 2106 
 				}
2107 2107 
 				echo '...Departure'."\n";
2108 2108 
 				$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
2109 
-        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
2109 
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
2110 2110 
 				foreach ($dall as $value) {
2111 
-    					$icao = $value['departure_airport_icao'];
2112 
-    					$ddate = $value['date'];
2113 
-    					$find = false;
2114 
-    					foreach ($pall as $pvalue) {
2115 
-    						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
2116 
-    							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
2117 
-	    						$find = true;
2118 
-    							break;
2119 
-    						}
2120 
-    					}
2121 
-    					if ($find === false) {
2122 
-    						$pall[] = $value;
2123 
-	    				}
2124 
-    				}
2125 
-	    			$alldata = $pall;
2111 
+						$icao = $value['departure_airport_icao'];
2112 
+						$ddate = $value['date'];
2113 
+						$find = false;
2114 
+						foreach ($pall as $pvalue) {
2115 
+							if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
2116 
+								$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
2117 
+								$find = true;
2118 
+								break;
2119 
+							}
2120 
+						}
2121 
+						if ($find === false) {
2122 
+							$pall[] = $value;
2123 
+						}
2124 
+					}
2125 
+					$alldata = $pall;
2126 2126 
 				foreach ($alldata as $number) {
2127 2127 
 					$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);
2128 2128 
 				}
2129 2129 
 				echo '...Arrival'."\n";
2130 2130 
 				$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
2131 
-    				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
2131 
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
2132 2132 
 				foreach ($dall as $value) {
2133 2133 
 					$icao = $value['arrival_airport_icao'];
2134 2134 
 					$ddate = $value['date'];
2135 
-    					$find = false;
2135 
+						$find = false;
2136 2136 
 					foreach ($pall as $pvalue) {
2137 
-    						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
2138 
-    							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
2139 
-    							$find = true;
2140 
-    							break;
2141 
-	    					}
2142 
-    					}
2143 
-    					if ($find === false) {
2144 
-    						$pall[] = $value;
2145 
-	    				}
2146 
-    				}
2147 
-    				$alldata = $pall;
2137 
+							if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
2138 
+								$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
2139 
+								$find = true;
2140 
+								break;
2141 
+							}
2142 
+						}
2143 
+						if ($find === false) {
2144 
+							$pall[] = $value;
2145 
+						}
2146 
+					}
2147 
+					$alldata = $pall;
2148 2148 
 				foreach ($alldata as $number) {
2149 2149 
 					$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);
2150 2150 
 				}
Please login to merge, or discard this patch.
statistics-registration.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -8,7 +8,7 @@
 
 block discarded – undo
8 8 
 if (!isset($filter_name)) $filter_name = '';
9 9 
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
10 10 
 if ($airline_icao == '' && isset($globalFilter)) {
11 
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
11 
+	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
12 12 
 }
13 13 
 setcookie('stats_airline_icao',$airline_icao,time()+60*60*24,'/');
14 14 
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
Please login to merge, or discard this patch.
require/class.Connection.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch 
@@ -7,35 +7,35 @@  discard block
 
 block discarded – undo
7 7 
 	public $latest_schema = 37;
8 8
9 9 
 	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
10 
-	    global $globalDBdriver, $globalNoDB;
11 
-	    if (isset($globalNoDB) && $globalNoDB === TRUE) {
10 
+		global $globalDBdriver, $globalNoDB;
11 
+		if (isset($globalNoDB) && $globalNoDB === TRUE) {
12 12 
 		$this->db = null;
13 
-	    } else {
13 
+		} else {
14 14 
 		if ($dbc === null) {
15 
-		    if ($this->db === null && $dbname === null) {
15 
+			if ($this->db === null && $dbname === null) {
16 16 
 			if ($user === null && $pass === null) {
17 
-			    $this->createDBConnection();
17 
+				$this->createDBConnection();
18 18 
 			} else {
19 
-			    $this->createDBConnection(null,$user,$pass);
19 
+				$this->createDBConnection(null,$user,$pass);
20 20 
 			}
21 
-		    } else {
21 
+			} else {
22 22 
 			$this->createDBConnection($dbname);
23 
-		    }
23 
+			}
24 24 
 		} elseif ($dbname === null || $dbname === 'default') {
25 
-	    	    $this->db = $dbc;
26 
-	    	    if ($this->connectionExists() === false) {
25 
+				$this->db = $dbc;
26 
+				if ($this->connectionExists() === false) {
27 27 
 			/*
28 28 
 			echo 'Restart Connection !!!'."\n";
29 29 
 			$e = new \Exception;
30 30 
 			var_dump($e->getTraceAsString());
31 31 
 			*/
32 32 
 			$this->createDBConnection();
33 
-		    }
33 
+			}
34 34 
 		} else {
35 
-		    //$this->connectionExists();
36 
-		    $this->dbs[$dbname] = $dbc;
35 
+			//$this->connectionExists();
36 
+			$this->dbs[$dbname] = $dbc;
37 
+		}
37 38 
 		}
38 
-	    }
39 39 
 	}
40 40
41 41 
 	public function db() {
 
@@ -55,11 +55,11 @@  discard block
 
 block discarded – undo
55 55 
 	}
56 56
57 57 
 	/**
58 
-	* Creates the database connection
59 
-	*
60 
-	* @return Boolean of the database connection
61 
-	*
62 
-	*/
58 
+	 * Creates the database connection
59 
+	 *
60 
+	 * @return Boolean of the database connection
61 
+	 *
62 
+	 */
63 63
64 64 
 	public function createDBConnection($DBname = null, $user = null, $pass = null)
65 65 
 	{
 
@@ -156,7 +156,7 @@  discard block
 
 block discarded – undo
156 156 
 			return false;
157 157 
 		}
158 158 
 		if($results->rowCount()>0) {
159 
-		    return true;
159 
+			return true;
160 160 
 		}
161 161 
 		else return false;
162 162 
 	}
 
@@ -173,14 +173,14 @@  discard block
 
 block discarded – undo
173 173 
 				$sum = $sum->fetchColumn(0);
174 174 
 			} else $sum = 0;
175 175 
 			if (intval($sum) !== 2) {
176 
-			     return false;
176 
+				 return false;
177 177 
 			}
178 178
179 179 
 		} catch(PDOException $e) {
180 180 
 			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
181 
-            			throw $e;
182 
-	                }
183 
-	                //echo 'error ! '.$e->getMessage();
181 
+						throw $e;
182 
+					}
183 
+					//echo 'error ! '.$e->getMessage();
184 184 
 			return false;
185 185 
 		}
186 186 
 		return true; 
@@ -284,8 +284,8 @@  discard block
 
 block discarded – undo
284 284 
 		$version = 0;
285 285 
 		if ($this->tableExists('aircraft')) {
286 286 
 			if (!$this->tableExists('config')) {
287 
-	    			$version = '1';
288 
-	    			return $version;
287 
+					$version = '1';
288 
+					return $version;
289 289 
 			} else {
290 290 
 				$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
291 291 
 				try {
 
@@ -306,10 +306,10 @@  discard block
 
 block discarded – undo
306 306 
 	* @return Boolean if latest version or not
307 307 
 	*/
308 308 
 	public function latest() {
309 
-	    global $globalNoDB;
310 
-	    if (isset($globalNoDB) && $globalNoDB === TRUE) return true;
311 
-	    if ($this->check_schema_version() == $this->latest_schema) return true;
312 
-	    else return false;
309 
+		global $globalNoDB;
310 
+		if (isset($globalNoDB) && $globalNoDB === TRUE) return true;
311 
+		if ($this->check_schema_version() == $this->latest_schema) return true;
312 
+		else return false;
313 313 
 	}
314 314
315 315 
 }
Please login to merge, or discard this patch.
aircraft-statistics-arrival-airport-country.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -4,8 +4,8 @@
 
 block discarded – undo
4 4 
 require_once('require/class.Stats.php');
5 5 
 require_once('require/class.Language.php');
6 6 
 if (!isset($_GET['aircraft_type'])) {
7 
-        header('Location: '.$globalURL.'/aircraft');
8 
-        die();
7 
+		header('Location: '.$globalURL.'/aircraft');
8 
+		die();
9 9 
 }
10 10
11 11 
 $aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
Please login to merge, or discard this patch.
require/class.SpotterImport.php 1 patch
Indentation   +402 added lines, -402 removed lines patch added patch discarded remove patch 
@@ -8,20 +8,20 @@  discard block
 
 block discarded – undo
8 8 
 require_once(dirname(__FILE__).'/class.Stats.php');
9 9 
 require_once(dirname(__FILE__).'/class.Source.php');
10 10 
 if (isset($globalServerAPRS) && $globalServerAPRS) {
11 
-    require_once(dirname(__FILE__).'/class.APRS.php');
11 
+	require_once(dirname(__FILE__).'/class.APRS.php');
12 12 
 }
13 13
14 14 
 class SpotterImport {
15 
-    private $all_flights = array();
16 
-    private $last_delete_hourly = 0;
17 
-    private $last_delete = 0;
18 
-    private $stats = array();
19 
-    private $tmd = 0;
20 
-    private $source_location = array();
21 
-    public $db = null;
22 
-    public $nb = 0;
23 
-
24 
-    public function __construct($dbc = null) {
15 
+	private $all_flights = array();
16 
+	private $last_delete_hourly = 0;
17 
+	private $last_delete = 0;
18 
+	private $stats = array();
19 
+	private $tmd = 0;
20 
+	private $source_location = array();
21 
+	public $db = null;
22 
+	public $nb = 0;
23 
+
24 
+	public function __construct($dbc = null) {
25 25 
 	global $globalBeta, $globalServerAPRS, $APRSSpotter, $globalNoDB;
26 26 
 	if (!(isset($globalNoDB) && $globalNoDB)) {
27 27 
 		$Connection = new Connection($dbc);
 
@@ -33,14 +33,14 @@  discard block
 
 block discarded – undo
33 33 
 		$currentdate = date('Y-m-d');
34 34 
 		$sourcestat = $Stats->getStatsSource($currentdate);
35 35 
 		if (!empty($sourcestat)) {
36 
-		    foreach($sourcestat as $srcst) {
37 
-		    	$type = $srcst['stats_type'];
36 
+			foreach($sourcestat as $srcst) {
37 
+				$type = $srcst['stats_type'];
38 38 
 			if ($type == 'polar' || $type == 'hist') {
39 
-			    $source = $srcst['source_name'];
40 
-			    $data = $srcst['source_data'];
41 
-			    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
42 
-	    		}
43 
-		    }
39 
+				$source = $srcst['source_name'];
40 
+				$data = $srcst['source_data'];
41 
+				$this->stats[$currentdate][$source][$type] = json_decode($data,true);
42 
+				}
43 
+			}
44 44 
 		}
45 45 
 	}
46 46 
 	if (isset($globalServerAPRS) && $globalServerAPRS) {
 
@@ -48,9 +48,9 @@  discard block
 
 block discarded – undo
48 48 
 		//$APRSSpotter->connect();
49 49 
 	}
50 50
51 
-    }
51 
+	}
52 52
53 
-    public function get_Schedule($id,$ident) {
53 
+	public function get_Schedule($id,$ident) {
54 54 
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
55 55 
 	// Get schedule here, so it's done only one time
56 56 
 	
@@ -70,42 +70,42 @@  discard block
 
 block discarded – undo
70 70 
 	$operator = $Spotter->getOperator($ident);
71 71 
 	$scheduleexist = false;
72 72 
 	if ($Schedule->checkSchedule($operator) == 0) {
73 
-	    $operator = $Translation->checkTranslation($ident);
74 
-	    if ($Schedule->checkSchedule($operator) == 0) {
73 
+		$operator = $Translation->checkTranslation($ident);
74 
+		if ($Schedule->checkSchedule($operator) == 0) {
75 75 
 		$schedule = $Schedule->fetchSchedule($operator);
76 76 
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
77 
-		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
78 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
79 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
80 
-		    // Should also check if route schedule = route from DB
81 
-		    if ($schedule['DepartureAirportIATA'] != '') {
77 
+			if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
78 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
79 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
80 
+			// Should also check if route schedule = route from DB
81 
+			if ($schedule['DepartureAirportIATA'] != '') {
82 82 
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
83 
-			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
84 
-			    if (trim($airport_icao) != '') {
83 
+				$airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
84 
+				if (trim($airport_icao) != '') {
85 85 
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
86 86 
 				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
87 
-			    }
87 
+				}
88 
+			}
88 89 
 			}
89 
-		    }
90 
-		    if ($schedule['ArrivalAirportIATA'] != '') {
90 
+			if ($schedule['ArrivalAirportIATA'] != '') {
91 91 
 			if ($this->all_flights[$id]['arrival_airport'] != $Spotter->getAirportIcao($schedule['ArrivalAirportIATA'])) {
92 
-			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
93 
-			    if (trim($airport_icao) != '') {
92 
+				$airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
93 
+				if (trim($airport_icao) != '') {
94 94 
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
95 95 
 				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
96 
-			    }
96 
+				}
97 97 
 			}
98 
-		    }
99 
-		    $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
98 
+			}
99 
+			$Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
100 100 
 		}
101 
-	    } else $scheduleexist = true;
101 
+		} else $scheduleexist = true;
102 102 
 	} else $scheduleexist = true;
103 103 
 	// close connection, at least one way will work ?
104 
-       if ($scheduleexist) {
104 
+	   if ($scheduleexist) {
105 105 
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
106 
-    		$sch = $Schedule->getSchedule($operator);
106 
+			$sch = $Schedule->getSchedule($operator);
107 107 
 		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time']));
108 
-       }
108 
+	   }
109 109 
 	$Spotter->db = null;
110 110 
 	$Schedule->db = null;
111 111 
 	$Translation->db = null;
 
@@ -120,96 +120,96 @@  discard block
 
 block discarded – undo
120 120 
 	}
121 121 
 	  */
122 122 
 	}
123 
-    }
123 
+	}
124 124
125 
-    public function checkAll() {
125 
+	public function checkAll() {
126 126 
 	global $globalDebug, $globalNoImport;
127 127 
 	if ($globalDebug) echo "Update last seen flights data...\n";
128 128 
 	if (!isset($globalNoImport) || $globalNoImport === FALSE) {
129 
-	    foreach ($this->all_flights as $key => $flight) {
129 
+		foreach ($this->all_flights as $key => $flight) {
130 130 
 		if (isset($this->all_flights[$key]['id'])) {
131 
-		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
132 
-    		    $Spotter = new Spotter($this->db);
133 
-        	    $real_arrival = $this->arrival($key);
134 
-        	    if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
135 
-        	}
136 
-	    }
131 
+			//echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
132 
+				$Spotter = new Spotter($this->db);
133 
+				$real_arrival = $this->arrival($key);
134 
+				if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
135 
+			}
136 
+		}
137 
+	}
137 138 
 	}
138 
-    }
139 139
140 
-    public function arrival($key) {
140 
+	public function arrival($key) {
141 141 
 	global $globalClosestMinDist, $globalDebug;
142 142 
 	if ($globalDebug) echo 'Update arrival...'."\n";
143 143 
 	$Spotter = new Spotter($this->db);
144 
-        $airport_icao = '';
145 
-        $airport_time = '';
146 
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
144 
+		$airport_icao = '';
145 
+		$airport_time = '';
146 
+		if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
147 147 
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
148 
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
149 
-    	    if (isset($closestAirports[0])) {
150 
-        	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
151 
-        	    $airport_icao = $closestAirports[0]['icao'];
152 
-        	    $airport_time = $this->all_flights[$key]['datetime'];
153 
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
154 
-        	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
155 
-        	    foreach ($closestAirports as $airport) {
156 
-        		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
157 
-        		    $airport_icao = $airport['icao'];
158 
-        		    $airport_time = $this->all_flights[$key]['datetime'];
159 
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
160 
-        		    break;
161 
-        		}
162 
-        	    }
163 
-        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
164 
-        		$airport_icao = $closestAirports[0]['icao'];
165 
-        		$airport_time = $this->all_flights[$key]['datetime'];
166 
-        	} else {
167 
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
168 
-        	}
169 
-    	    } else {
170 
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
171 
-    	    }
172 
-
173 
-        } else {
174 
-        	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
175 
-        }
176 
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
177 
-    }
178 
-
179 
-
180 
-
181 
-    public function del() {
148 
+		$closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
149 
+			if (isset($closestAirports[0])) {
150 
+			if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
151 
+				$airport_icao = $closestAirports[0]['icao'];
152 
+				$airport_time = $this->all_flights[$key]['datetime'];
153 
+				if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
154 
+			} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
155 
+				foreach ($closestAirports as $airport) {
156 
+				if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
157 
+					$airport_icao = $airport['icao'];
158 
+					$airport_time = $this->all_flights[$key]['datetime'];
159 
+					if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
160 
+					break;
161 
+				}
162 
+				}
163 
+			} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
164 
+				$airport_icao = $closestAirports[0]['icao'];
165 
+				$airport_time = $this->all_flights[$key]['datetime'];
166 
+			} else {
167 
+				if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
168 
+			}
169 
+			} else {
170 
+				if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
171 
+			}
172 
+
173 
+		} else {
174 
+			if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
175 
+		}
176 
+		return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
177 
+	}
178 
+
179 
+
180 
+
181 
+	public function del() {
182 182 
 	global $globalDebug, $globalNoImport, $globalNoDB;
183 183 
 	// Delete old infos
184 184 
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
185 185 
 	foreach ($this->all_flights as $key => $flight) {
186 
-    	    if (isset($flight['lastupdate'])) {
187 
-        	if ($flight['lastupdate'] < (time()-3000)) {
188 
-            	    if (isset($this->all_flights[$key]['id'])) {
189 
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
186 
+			if (isset($flight['lastupdate'])) {
187 
+			if ($flight['lastupdate'] < (time()-3000)) {
188 
+					if (isset($this->all_flights[$key]['id'])) {
189 
+					if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
190 190 
 			/*
191 191 
 			$SpotterLive = new SpotterLive();
192 192 
             		$SpotterLive->deleteLiveSpotterDataById($this->all_flights[$key]['id']);
193 193 
 			$SpotterLive->db = null;
194 194 
 			*/
195 195 
 			if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
196 
-            		    $real_arrival = $this->arrival($key);
197 
-            		    $Spotter = new Spotter($this->db);
198 
-            	    	    if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
196 
+						$real_arrival = $this->arrival($key);
197 
+						$Spotter = new Spotter($this->db);
198 
+							if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
199 199 
 				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
200 200 
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
201 
-			    }
201 
+				}
202 202 
 			// Put in archive
203 203 
 //				$Spotter->db = null;
204 204 
 			}
205 
-            	    }
206 
-            	    unset($this->all_flights[$key]);
207 
-    	        }
208 
-	    }
209 
-        }
210 
-    }
205 
+					}
206 
+					unset($this->all_flights[$key]);
207 
+				}
208 
+		}
209 
+		}
210 
+	}
211 211
212 
-    public function add($line) {
212 
+	public function add($line) {
213 213 
 	global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB;
214 214 
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
215 215 
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
 
@@ -234,18 +234,18 @@  discard block
 
 block discarded – undo
234 234
235 235 
 	// SBS format is CSV format
236 236 
 	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
237 
-	    //print_r($line);
238 
-  	    if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
237 
+		//print_r($line);
238 
+  		if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
239 239
240 240 
 		// Increment message number
241 241 
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
242 
-		    $current_date = date('Y-m-d');
243 
-		    $source = $line['source_name'];
244 
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
245 
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
246 
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
247 
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
248 
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
242 
+			$current_date = date('Y-m-d');
243 
+			$source = $line['source_name'];
244 
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
245 
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
246 
+				$this->stats[$current_date][$source]['msg']['date'] = time();
247 
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
248 
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
249 249 
 		}
250 250
251 251 
 		/*
 
@@ -261,49 +261,49 @@  discard block
 
 block discarded – undo
261 261 
 		//$this->db = $dbc;
262 262
263 263 
 		//$hex = trim($line['hex']);
264 
-	        if (!isset($line['id'])) $id = trim($line['hex']);
265 
-	        else $id = trim($line['id']);
264 
+			if (!isset($line['id'])) $id = trim($line['hex']);
265 
+			else $id = trim($line['id']);
266 266
267 267 
 		if (!isset($this->all_flights[$id])) {
268 
-		    $this->all_flights[$id] = array();
269 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
270 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
271 
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
272 
-		    if (!isset($line['id'])) {
268 
+			$this->all_flights[$id] = array();
269 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
270 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
271 
+			if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
272 
+			if (!isset($line['id'])) {
273 273 
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
274 274 
 //			if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi')));
275 275 
 //			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
276 276 
 			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
277 
-		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
278 
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
279 
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
277 
+				//else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
278 
+			 } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
279 
+			if ($globalAllFlights !== FALSE) $dataFound = true;
280 280 
 		}
281 281 
 		if (isset($line['source_type']) && $line['source_type'] != '') {
282 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
282 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
283 283 
 		}
284 284
285 285 
 		//print_r($this->all_flights);
286 286 
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
287 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
288 
-		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
287 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
288 
+			//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
289 289 
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
290 
-		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
291 
-		    if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') {
290 
+			//} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
291 
+			if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') {
292 292 
 			$timeelapsed = microtime(true);
293 293 
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
294 
-			    $Spotter = new Spotter($this->db);
295 
-			    if (isset($this->all_flights[$id]['source_type'])) {
294 
+				$Spotter = new Spotter($this->db);
295 
+				if (isset($this->all_flights[$id]['source_type'])) {
296 296 
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']);
297 
-			    } else {
297 
+				} else {
298 298 
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
299 
-			    }
300 
-			    $Spotter->db = null;
301 
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
302 
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
299 
+				}
300 
+				$Spotter->db = null;
301 
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
302 
+				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
303 303 
 			}
304 
-		    }
305 
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
306 
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
304 
+			}
305 
+			if ($globalAllFlights !== FALSE) $dataFound = true;
306 
+			if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
307 307 
 		}
308 308 
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
309 309 
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $line['aircraft_icao']));
 
@@ -329,9 +329,9 @@  discard block
 
 block discarded – undo
329 329 
 		}
330 330 
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
331 331 
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60) {
332 
-		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
332 
+			if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
333 333 
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
334 
-		    } else {
334 
+			} else {
335 335 
 				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
336 336 
 				elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
337 337 
 				/*
 
@@ -340,43 +340,43 @@  discard block
 
 block discarded – undo
340 340 
 				print_r($line);
341 341 
 				*/
342 342 
 				return '';
343 
-		    }
343 
+			}
344 344 
 		} else {
345 345 
 			date_default_timezone_set('UTC');
346 346 
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
347 347 
 		}
348 348
349 349 
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
350 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
350 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
351 351 
 		}
352 352 
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
353 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
353 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
354 354 
 		}
355 355 
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
356 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id']));
356 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id']));
357 357 
 		}
358 358 
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
359 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name']));
359 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name']));
360 360 
 		}
361 361
362 362 
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
363 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
364 
-		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
363 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
364 
+			if ($this->all_flights[$id]['addedSpotter'] == 1) {
365 365 
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
366 
-			    $timeelapsed = microtime(true);
367 
-            		    $Spotter = new Spotter($this->db);
368 
-            		    $fromsource = NULL;
369 
-            		    if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
370 
-            		    elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
371 
-			    elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
372 
-			    elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
373 
-			    elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
374 
-            		    $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
375 
-			    if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
376 
-			    $Spotter->db = null;
377 
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
378 
-			}
379 
-		    }
366 
+				$timeelapsed = microtime(true);
367 
+						$Spotter = new Spotter($this->db);
368 
+						$fromsource = NULL;
369 
+						if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
370 
+						elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
371 
+				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
372 
+				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
373 
+				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
374 
+						$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
375 
+				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
376 
+				$Spotter->db = null;
377 
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
378 
+			}
379 
+			}
380 380
381 381 
 /*
382 382 
 		    if (!isset($line['id'])) {
 
@@ -386,104 +386,104 @@  discard block
 
 block discarded – undo
386 386 
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
387 387 
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
388 388 
   */
389 
-		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
389 
+			if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
390 390
391 
-		    //$putinarchive = true;
392 
-		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
391 
+			//$putinarchive = true;
392 
+			if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
393 393 
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
394 
-		    }
395 
-		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
394 
+			}
395 
+			if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
396 396 
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
397 
-		    }
398 
-		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
399 
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
400 
-		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
397 
+			}
398 
+			if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
399 
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
400 
+			} elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
401 401 
 			$timeelapsed = microtime(true);
402 402 
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
403 403 
 				$Spotter = new Spotter($this->db);
404 404 
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
405 405 
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
406 
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
406 
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
407 407 
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
408 
-                        }
409 
-		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
408 
+						}
409 
+			} elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
410 410 
 			$timeelapsed = microtime(true);
411 411 
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
412 
-			    $Spotter = new Spotter($this->db);
413 
-			    $route = $Spotter->getRouteInfo(trim($line['ident']));
414 
-			    if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
412 
+				$Spotter = new Spotter($this->db);
413 
+				$route = $Spotter->getRouteInfo(trim($line['ident']));
414 
+				if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
415 415 
 				$Translation = new Translation($this->db);
416 416 
 				$ident = $Translation->checkTranslation(trim($line['ident']));
417 417 
 				$route = $Spotter->getRouteInfo($ident);
418 418 
 				$Translation->db = null;
419 
-			    }
420 
-			    $Spotter->db = null;
421 
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
422 
-                    	}
419 
+				}
420 
+				$Spotter->db = null;
421 
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
422 
+						}
423 423 
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
424 
-			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
425 
-			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
424 
+				//if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
425 
+				if ($route['fromairport_icao'] != $route['toairport_icao']) {
426 426 
 				//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop']));
427 
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
428 
-		    	    }
427 
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
428 
+					}
429 429 
 			}
430 430 
 			if (!isset($globalFork)) $globalFork = TRUE;
431 431 
 			if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
432 432 
 				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
433 433 
 			}
434 
-		    }
434 
+			}
435 435 
 		}
436 436
437 437 
 		if (isset($line['speed']) && $line['speed'] != '') {
438 438 
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
439 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
440 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
441 
-		    //$dataFound = true;
439 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
440 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
441 
+			//$dataFound = true;
442 442 
 		} else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
443 
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
444 
-		    if ($distance > 1000 && $distance < 10000) {
445 
-		    // use datetime
443 
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
444 
+			if ($distance > 1000 && $distance < 10000) {
445 
+			// use datetime
446 446 
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
447 447 
 			$speed = $speed*3.6;
448 448 
 			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
449 449 
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
450 
-		    }
450 
+			}
451 451 
 		}
452 452
453 453
454 454
455 
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
456 
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
457 
-	    	    else unset($timediff);
458 
-	    	    if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
455 
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
456 
+				if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
457 
+				else unset($timediff);
458 
+				if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
459 459 
 			if (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude'])) {
460 
-			    if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
460 
+				if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
461 461 
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
462 462 
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
463 463 
 				$this->all_flights[$id]['putinarchive'] = true;
464 464 
 				$this->tmd = 0;
465 465 
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
466 
-				    if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
467 
-				    $timeelapsed = microtime(true);
468 
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
466 
+					if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
467 
+					$timeelapsed = microtime(true);
468 
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
469 469 
 					$Spotter = new Spotter($this->db);
470 470 
 					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
471 471 
 					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
472 472 
 					$Spotter->db = null;
473 473 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
474 474 
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
475 
-				    }
475 
+					}
476 
+				}
476 477 
 				}
477 
-			    }
478 478 
 			}
479 479
480 480 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
481 
-			    //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
481 
+				//if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
482 482 
 				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
483 483 
 				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
484 
-				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
485 
-				    $dataFound = true;
486 
-				    $this->all_flights[$id]['time_last_coord'] = time();
484 
+					$this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
485 
+					$dataFound = true;
486 
+					$this->all_flights[$id]['time_last_coord'] = time();
487 487 
 				}
488 488 
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
489 489 
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
 
@@ -494,20 +494,20 @@  discard block
 
 block discarded – undo
494 494 
 				    //$putinarchive = true;
495 495 
 				}
496 496 
 				*/
497 
-			    /*
497 
+				/*
498 498 
 			    } elseif (isset($this->all_flights[$id]['latitude'])) {
499 499 
 				if ($globalDebug) echo '!!! Strange latitude value - diff : '.abs($this->all_flights[$id]['latitude']-$line['latitude']).'- previous lat : '.$this->all_flights[$id]['latitude'].'- new lat : '.$line['latitude']."\n";
500 500 
 			    }
501 501 
 			    */
502 502 
 			}
503 503 
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
504 
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
505 
-			    //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
504 
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
505 
+				//if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
506 506 
 				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
507 507 
 				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
508 
-				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
509 
-				    $dataFound = true;
510 
-				    $this->all_flights[$id]['time_last_coord'] = time();
508 
+					$this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
509 
+					$dataFound = true;
510 
+					$this->all_flights[$id]['time_last_coord'] = time();
511 511 
 				}
512 512 
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
513 513 
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
 
@@ -525,95 +525,95 @@  discard block
 
 block discarded – undo
525 525 
 			    */
526 526 
 			}
527 527
528 
-		    } else if ($globalDebug && $timediff > 30) {
528 
+			} else if ($globalDebug && $timediff > 30) {
529 529 
 			$this->tmd = $this->tmd + 1;
530 530 
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
531 531 
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
532 532 
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
533 533 
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
534 
-		    }
534 
+			}
535 535 
 		}
536 536 
 		if (isset($line['last_update']) && $line['last_update'] != '') {
537 
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
538 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
537 
+			if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
538 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
539 539 
 		}
540 540 
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
541 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
542 
-		    //$dataFound = true;
541 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
542 
+			//$dataFound = true;
543 543 
 		}
544 544 
 		if (isset($line['format_source']) && $line['format_source'] != '') {
545 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
545 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
546 546 
 		}
547 547 
 		if (isset($line['source_name']) && $line['source_name'] != '') {
548 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
548 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
549 549 
 		}
550 550 
 		if (isset($line['emergency']) && $line['emergency'] != '') {
551 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
552 
-		    //$dataFound = true;
551 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
552 
+			//$dataFound = true;
553 553 
 		}
554 554 
 		if (isset($line['ground']) && $line['ground'] != '') {
555 
-		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
555 
+			if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
556 556 
 			// Here we force archive of flight because after ground it's a new one (or should be)
557 557 
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
558 558 
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
559 559 
 			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi')));
560 
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
560 
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
561 561 
 			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
562 
-		    }
563 
-		    if ($line['ground'] != 1) $line['ground'] = 0;
564 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
565 
-		    //$dataFound = true;
562 
+			}
563 
+			if ($line['ground'] != 1) $line['ground'] = 0;
564 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
565 
+			//$dataFound = true;
566 566 
 		}
567 567 
 		if (isset($line['squawk']) && $line['squawk'] != '') {
568 
-		    if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
569 
-			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
570 
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
571 
-			    $highlight = '';
572 
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
573 
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
574 
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
575 
-			    if ($highlight != '') {
568 
+			if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
569 
+				if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
570 
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
571 
+				$highlight = '';
572 
+				if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
573 
+				if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
574 
+				if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
575 
+				if ($highlight != '') {
576 576 
 				$timeelapsed = microtime(true);
577 577 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
578 
-				    $Spotter = new Spotter($this->db);
579 
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
580 
-				    $Spotter->db = null;
581 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
578 
+					$Spotter = new Spotter($this->db);
579 
+					$Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
580 
+					$Spotter->db = null;
581 
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
582 582 
 				}
583 583 
 				//$putinarchive = true;
584 584 
 				//$highlight = '';
585 
-			    }
585 
+				}
586 586
587 
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
588 
-		    //$dataFound = true;
587 
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
588 
+			//$dataFound = true;
589 589 
 		}
590 590
591 591 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
592 
-		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
592 
+			//if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
593 593 
 			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true;
594 594 
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
595 595 
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
596 596 
 			//$dataFound = true;
597 
-		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
597 
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
598 598 
   		}
599 599
600 600 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
601 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
601 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
602 602 
 		}
603 603
604 604 
 		if (isset($line['heading']) && $line['heading'] != '') {
605 
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
606 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
607 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
608 
-		    //$dataFound = true;
605 
+			if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
606 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
607 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
608 
+			//$dataFound = true;
609 609 
   		} elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) {
610 
-  		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
611 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
612 
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
613 
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
610 
+  			$heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
611 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
612 
+			if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
613 
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
614 614 
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
615 
-  		    // If not enough messages and ACARS set heading to 0
616 
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
615 
+  			// If not enough messages and ACARS set heading to 0
616 
+  			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
617 617 
   		}
618 618 
 		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
619 619 
 		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
 
@@ -624,125 +624,125 @@  discard block
 
 block discarded – undo
624 624 
 		//if ($dataFound == true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['ident'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
625 625 
 		//if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
626 626 
 		if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
627 
-		    $this->all_flights[$id]['lastupdate'] = time();
628 
-		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
629 
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == ''  || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
630 
-			    //print_r($this->all_flights);
631 
-			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
632 
-			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
633 
-			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
627 
+			$this->all_flights[$id]['lastupdate'] = time();
628 
+			if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
629 
+				if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == ''  || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
630 
+				//print_r($this->all_flights);
631 
+				//echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
632 
+				//$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
633 
+				if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
634 634 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
635 
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
636 
-				    $timeelapsed = microtime(true);
637 
-				    $SpotterLive = new SpotterLive($this->db);
638 
-				    if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) {
635 
+					if ($globalDebug) echo "Check if aircraft is already in DB...";
636 
+					$timeelapsed = microtime(true);
637 
+					$SpotterLive = new SpotterLive($this->db);
638 
+					if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) {
639 639 
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
640 640 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
641 
-				    } elseif (isset($line['id'])) {
641 
+					} elseif (isset($line['id'])) {
642 642 
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
643 643 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
644 
-				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
644 
+					} elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
645 645 
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
646 646 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
647 
-				    } else $recent_ident = '';
648 
-				    $SpotterLive->db=null;
649 
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
650 
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
647 
+					} else $recent_ident = '';
648 
+					$SpotterLive->db=null;
649 
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
650 
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
651 651 
 				} else $recent_ident = '';
652 
-			    } else {
652 
+				} else {
653 653 
 				$recent_ident = '';
654 654 
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
655 
-			    }
656 
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
657 
-			    if($recent_ident == "")
658 
-			    {
655 
+				}
656 
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
657 
+				if($recent_ident == "")
658 
+				{
659 659 
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
660 660 
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
661 661 
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
662 662 
 				//adds the spotter data for the archive
663 663 
 				$ignoreImport = false;
664 664 
 				foreach($globalAirportIgnore as $airportIgnore) {
665 
-				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
665 
+					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
666 666 
 					$ignoreImport = true;
667 
-				    }
667 
+					}
668 668 
 				}
669 669 
 				if (count($globalAirportAccept) > 0) {
670 
-				    $ignoreImport = true;
671 
-				    foreach($globalAirportIgnore as $airportIgnore) {
670 
+					$ignoreImport = true;
671 
+					foreach($globalAirportIgnore as $airportIgnore) {
672 672 
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
673 
-					    $ignoreImport = false;
673 
+						$ignoreImport = false;
674 
+					}
674 675 
 					}
675 
-				    }
676 676 
 				}
677 677 
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
678 
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
678 
+					foreach($globalAirlineIgnore as $airlineIgnore) {
679 679 
 					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
680 
-					    $ignoreImport = true;
680 
+						$ignoreImport = true;
681 
+					}
681 682 
 					}
682 
-				    }
683 683 
 				}
684 684 
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
685 
-				    $ignoreImport = true;
686 
-				    foreach($globalAirlineAccept as $airlineAccept) {
685 
+					$ignoreImport = true;
686 
+					foreach($globalAirlineAccept as $airlineAccept) {
687 687 
 					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
688 
-					    $ignoreImport = false;
688 
+						$ignoreImport = false;
689 
+					}
689 690 
 					}
690 
-				    }
691 691 
 				}
692 692 
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
693 
-				    $ignoreImport = true;
694 
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
693 
+					$ignoreImport = true;
694 
+					foreach($globalPilotIdAccept as $pilotIdAccept) {
695 695 
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
696 
-					    $ignoreImport = false;
696 
+						$ignoreImport = false;
697 
+					}
697 698 
 					}
698 
-				    }
699 699 
 				}
700 700
701 701 
 				if (!$ignoreImport) {
702 
-				    $highlight = '';
703 
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
704 
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
705 
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
706 
-				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
707 
-				    $timeelapsed = microtime(true);
708 
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
702 
+					$highlight = '';
703 
+					if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
704 
+					if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
705 
+					if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
706 
+					if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
707 
+					$timeelapsed = microtime(true);
708 
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
709 709 
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
710 
-					    $Spotter = new Spotter($this->db);
711 
-					    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']);
712 
-					    $Spotter->db = null;
713 
-					    if ($globalDebug && isset($result)) echo $result."\n";
710 
+						$Spotter = new Spotter($this->db);
711 
+						$result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']);
712 
+						$Spotter->db = null;
713 
+						if ($globalDebug && isset($result)) echo $result."\n";
714 
+					}
714 715 
 					}
715 
-				    }
716 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
717 
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
716 
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
717 
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
718 718
719 
-				    // Add source stat in DB
720 
-				    $Stats = new Stats($this->db);
721 
-				    if (!empty($this->stats)) {
719 
+					// Add source stat in DB
720 
+					$Stats = new Stats($this->db);
721 
+					if (!empty($this->stats)) {
722 722 
 					if ($globalDebug) echo 'Add source stats : ';
723 
-				        foreach($this->stats as $date => $data) {
724 
-					    foreach($data as $source => $sourced) {
725 
-					        //print_r($sourced);
726 
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
727 
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
728 
-				    		if (isset($sourced['msg'])) {
729 
-				    		    if (time() - $sourced['msg']['date'] > 10) {
730 
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
731 
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
732 
-			    			        unset($this->stats[$date][$source]['msg']);
733 
-			    			    }
734 
-			    			}
735 
-			    		    }
736 
-			    		    if ($date != date('Y-m-d')) {
737 
-			    			unset($this->stats[$date]);
738 
-			    		    }
739 
-				    	}
740 
-				    	if ($globalDebug) echo 'Done'."\n";
741 
-
742 
-				    }
743 
-				    $Stats->db = null;
744 
-				    }
745 
-				    $this->del();
723 
+						foreach($this->stats as $date => $data) {
724 
+						foreach($data as $source => $sourced) {
725 
+							//print_r($sourced);
726 
+								if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
727 
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
728 
+							if (isset($sourced['msg'])) {
729 
+								if (time() - $sourced['msg']['date'] > 10) {
730 
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
731 
+									echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
732 
+									unset($this->stats[$date][$source]['msg']);
733 
+								}
734 
+							}
735 
+							}
736 
+							if ($date != date('Y-m-d')) {
737 
+							unset($this->stats[$date]);
738 
+							}
739 
+						}
740 
+						if ($globalDebug) echo 'Done'."\n";
741 
+
742 
+					}
743 
+					$Stats->db = null;
744 
+					}
745 
+					$this->del();
746 746 
 				} elseif ($globalDebug) echo 'Ignore data'."\n";
747 747 
 				//$ignoreImport = false;
748 748 
 				$this->all_flights[$id]['addedSpotter'] = 1;
 
@@ -760,41 +760,41 @@  discard block
 
 block discarded – undo
760 760 
 			*/
761 761 
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
762 762 
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
763 
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
764 
-				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
765 
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
763 
+					if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
764 
+					//SpotterLive->deleteLiveSpotterDataNotUpdated();
765 
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
766 766 
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
767 
-					    $SpotterLive = new SpotterLive($this->db);
768 
-					    $SpotterLive->deleteLiveSpotterData();
769 
-					    $SpotterLive->db=null;
767 
+						$SpotterLive = new SpotterLive($this->db);
768 
+						$SpotterLive->deleteLiveSpotterData();
769 
+						$SpotterLive->db=null;
770 
+					}
770 771 
 					}
771 
-				    }
772 
-				    if ($globalDebug) echo " Done\n";
773 
-				    $this->last_delete = time();
772 
+					if ($globalDebug) echo " Done\n";
773 
+					$this->last_delete = time();
774 774 
 				}
775 
-			    } else {
775 
+				} else {
776 776 
 				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa'  || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson')) {
777 
-				    $this->all_flights[$id]['id'] = $recent_ident;
778 
-				    $this->all_flights[$id]['addedSpotter'] = 1;
777 
+					$this->all_flights[$id]['id'] = $recent_ident;
778 
+					$this->all_flights[$id]['addedSpotter'] = 1;
779 779 
 				}
780 780 
 				if (isset($globalDaemon) && !$globalDaemon) {
781 
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
781 
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
782 782 
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
783 
-					    $Spotter = new Spotter($this->db);
784 
-					    $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']);
785 
-					    $Spotter->db = null;
783 
+						$Spotter = new Spotter($this->db);
784 
+						$Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']);
785 
+						$Spotter->db = null;
786 
+					}
786 787 
 					}
787 
-				    }
788 788 
 				}
789 789
790 
-			    }
790 
+				}
791 
+			}
791 792 
 			}
792 
-		    }
793 
-		    //adds the spotter LIVE data
794 
-		    //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
795 
-		    //echo "\nAdd in Live !! \n";
796 
-		    //echo "{$line[8]} {$line[7]} - MODES:{$line[4]}  CALLSIGN:{$line[10]}   ALT:{$line[11]}   VEL:{$line[12]}   HDG:{$line[13]}   LAT:{$line[14]}   LON:{$line[15]}   VR:{$line[16]}   SQUAWK:{$line[17]}\n";
797 
-		    if ($globalDebug) {
793 
+			//adds the spotter LIVE data
794 
+			//SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
795 
+			//echo "\nAdd in Live !! \n";
796 
+			//echo "{$line[8]} {$line[7]} - MODES:{$line[4]}  CALLSIGN:{$line[10]}   ALT:{$line[11]}   VEL:{$line[12]}   HDG:{$line[13]}   LAT:{$line[14]}   LON:{$line[15]}   VR:{$line[16]}   SQUAWK:{$line[17]}\n";
797 
+			if ($globalDebug) {
798 798 
 			if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
799 799 
 				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n";
800 800 
 				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n";
 
@@ -802,60 +802,60 @@  discard block
 
 block discarded – undo
802 802 
 				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n";
803 803 
 				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n";
804 804 
 			}
805 
-		    }
806 
-		    $ignoreImport = false;
807 
-		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
808 
-		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
805 
+			}
806 
+			$ignoreImport = false;
807 
+			if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
808 
+			if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
809 809
810 
-		    foreach($globalAirportIgnore as $airportIgnore) {
811 
-		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
812 
-			    $ignoreImport = true;
810 
+			foreach($globalAirportIgnore as $airportIgnore) {
811 
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
812 
+				$ignoreImport = true;
813 813 
 			}
814 
-		    }
815 
-		    if (count($globalAirportAccept) > 0) {
816 
-		        $ignoreImport = true;
817 
-		        foreach($globalAirportIgnore as $airportIgnore) {
818 
-			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
814 
+			}
815 
+			if (count($globalAirportAccept) > 0) {
816 
+				$ignoreImport = true;
817 
+				foreach($globalAirportIgnore as $airportIgnore) {
818 
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
819 819 
 				$ignoreImport = false;
820 
-			    }
820 
+				}
821 
+			}
821 822 
 			}
822 
-		    }
823 
-		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
823 
+			if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
824 824 
 			foreach($globalAirlineIgnore as $airlineIgnore) {
825 
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
825 
+				if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
826 826 
 				$ignoreImport = true;
827 
-			    }
827 
+				}
828 828 
 			}
829 
-		    }
830 
-		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
829 
+			}
830 
+			if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
831 831 
 			$ignoreImport = true;
832 832 
 			foreach($globalAirlineAccept as $airlineAccept) {
833 
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
833 
+				if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
834 834 
 				$ignoreImport = false;
835 
-			    }
835 
+				}
836 
+			}
836 837 
 			}
837 
-		    }
838 
-		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
838 
+			if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
839 839 
 			$ignoreImport = true;
840 840 
 			foreach($globalPilotIdAccept as $pilotIdAccept) {
841 
-			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
842 
-			        $ignoreImport = false;
843 
-			    }
841 
+				if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
842 
+					$ignoreImport = false;
843 
+				}
844 
+			}
844 845 
 			}
845 
-		    }
846 846
847 
-		    if (!$ignoreImport) {
847 
+			if (!$ignoreImport) {
848 848 
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
849 849 
 				if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
850 850 
 				$timeelapsed = microtime(true);
851 851 
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
852 
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
852 
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
853 853 
 					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
854 854 
 					$SpotterLive = new SpotterLive($this->db);
855 855 
 					$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
856 856 
 					$SpotterLive->db = null;
857 857 
 					if ($globalDebug) echo $result."\n";
858 
-				    }
858 
+					}
859 859 
 				}
860 860 
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
861 861 
 					$APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
 
@@ -867,7 +867,7 @@  discard block
 
 block discarded – undo
867 867 
 				//if ($line['format_source'] != 'aprs') {
868 868 
 				//if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) {
869 869 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
870 
-				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
870 
+					if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
871 871 
 					$source = $this->all_flights[$id]['source_name'];
872 872 
 					if ($source == '') $source = $this->all_flights[$id]['format_source'];
873 873 
 					if (!isset($this->source_location[$source])) {
 
@@ -893,7 +893,7 @@  discard block
 
 block discarded – undo
893 893 
 					if ($stats_heading == 16) $stats_heading = 0;
894 894 
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
895 895 
 						for ($i=0;$i<=15;$i++) {
896 
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
896 
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
897 897 
 						}
898 898 
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
899 899 
 					} else {
 
@@ -906,17 +906,17 @@  discard block
 
 block discarded – undo
906 906 
 					//var_dump($this->stats);
907 907 
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
908 908 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
909 
-						    end($this->stats[$current_date][$source]['hist']);
910 
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
909 
+							end($this->stats[$current_date][$source]['hist']);
910 
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
911 911 
 						} else $mini = 0;
912 912 
 						for ($i=$mini;$i<=$distance;$i+=10) {
913 
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
913 
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
914 914 
 						}
915 915 
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
916 916 
 					} else {
917 917 
 						$this->stats[$current_date][$source]['hist'][$distance] += 1;
918 918 
 					}
919 
-				    }
919 
+					}
920 920 
 				}
921 921
922 922 
 				$this->all_flights[$id]['lastupdate'] = time();
 
@@ -926,7 +926,7 @@  discard block
 
 block discarded – undo
926 926 
 			//$this->del();
927 927
928 928 
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
929 
-			    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
929 
+				if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
930 930 
 				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
931 931 
 				$SpotterLive = new SpotterLive($this->db);
932 932 
 				$SpotterLive->deleteLiveSpotterDataNotUpdated();
 
@@ -934,19 +934,19 @@  discard block
 
 block discarded – undo
934 934 
 				//SpotterLive->deleteLiveSpotterData();
935 935 
 				if ($globalDebug) echo " Done\n";
936 936 
 				$this->last_delete_hourly = time();
937 
-			    } else {
937 
+				} else {
938 938 
 				$this->del();
939 939 
 				$this->last_delete_hourly = time();
940 
-			    }
940 
+				}
941 941 
 			}
942 942
943 
-		    }
944 
-		    //$ignoreImport = false;
943 
+			}
944 
+			//$ignoreImport = false;
945 945 
 		}
946 946 
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
947 947 
 		if ($send) return $this->all_flights[$id];
948 
-	    }
948 
+		}
949 
+	}
949 950 
 	}
950 
-    }
951 951 
 }
952 952 
 ?>
Please login to merge, or discard this patch.
airline-statistics-arrival-airport-country.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -4,8 +4,8 @@
 
 block discarded – undo
4 4 
 require_once('require/class.Stats.php');
5 5 
 require_once('require/class.Language.php');
6 6 
 if (!isset($_GET['airline'])) {
7 
-        header('Location: '.$globalURL.'/airline');
8 
-        die();
7 
+		header('Location: '.$globalURL.'/airline');
8 
+		die();
9 9 
 }
10 10 
 $airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
11 11 
 $Spotter = new Spotter();
Please login to merge, or discard this patch.
airport-statistics-airline-country.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -4,8 +4,8 @@
 
 block discarded – undo
4 4 
 require_once('require/class.Stats.php');
5 5 
 require_once('require/class.Language.php');
6 6 
 if (!isset($_GET['airport'])) {
7 
-        header('Location: '.$globalURL.'/airport');
8 
-        die();
7 
+		header('Location: '.$globalURL.'/airport');
8 
+		die();
9 9 
 }
10 10 
 $airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
11 11 
 $Spotter = new Spotter();
Please login to merge, or discard this patch.
airport-statistics-departure-airport-country.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -4,8 +4,8 @@
 
 block discarded – undo
4 4 
 require_once('require/class.Stats.php');
5 5 
 require_once('require/class.Language.php');
6 6 
 if (!isset($_GET['airport'])) {
7 
-        header('Location: '.$globalURL.'/airport');
8 
-        die();
7 
+		header('Location: '.$globalURL.'/airport');
8 
+		die();
9 9 
 }
10 10 
 $airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
11 11 
 $Spotter = new Spotter();
Please login to merge, or discard this patch.